diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts
index f02f84d66..4e919d0f9 100644
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@@ -46,8 +46,8 @@ import { randomUUID } from 'node:crypto';
 @Injectable()
 export class OrderService {
   public constructor(
-    private readonly accountService: AccountService,
     private readonly accountBalanceService: AccountBalanceService,
+    private readonly accountService: AccountService,
     private readonly dataGatheringService: DataGatheringService,
     private readonly dataProviderService: DataProviderService,
     private readonly eventEmitter: EventEmitter2,
@@ -381,6 +381,7 @@ export class OrderService {
             holdings: [],
             id: account.currency,
             isActive: true,
+            name: account.currency,
             sectors: [],
             symbol: account.currency,
             updatedAt: new Date(balanceItem.date)
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts
index 2ebe33f25..ea2939275 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts
@@ -1,6 +1,5 @@
 import {
   activityDummyData,
-  loadExportFile,
   symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
@@ -11,17 +10,14 @@ import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.s
 import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';
 import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';
 import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';
 import { parseDate } from '@ghostfolio/common/helper';
-import {
-  Activity,
-  ExportResponse,
-  HistoricalDataItem
-} from '@ghostfolio/common/interfaces';
+import { Activity, HistoricalDataItem } from '@ghostfolio/common/interfaces';
 import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';
 
-import { join } from 'node:path';
+import { randomUUID } from 'node:crypto';
 
 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
   return {
@@ -31,6 +27,17 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
   };
 });
 
+jest.mock(
+  '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service',
+  () => {
+    return {
+      ExchangeRateDataService: jest.fn().mockImplementation(() => {
+        return ExchangeRateDataServiceMock;
+      })
+    };
+  }
+);
+
 jest.mock(
   '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service',
   () => {
@@ -51,8 +58,6 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
-  let exportResponse: ExportResponse;
-
   let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
@@ -60,12 +65,6 @@ describe('PortfolioCalculator', () => {
   let portfolioSnapshotService: PortfolioSnapshotService;
   let redisCacheService: RedisCacheService;
 
-  beforeAll(() => {
-    exportResponse = loadExportFile(
-      join(__dirname, '../../../../../../../test/import/ok/sample.json')
-    );
-  });
-
   beforeEach(() => {
     configurationService = new ConfigurationService();
 
@@ -93,15 +92,9 @@ describe('PortfolioCalculator', () => {
 
   describe('Cash Performance', () => {
     it('should calculate performance for cash assets in CHF default currency', async () => {
-      // Mock Date
       jest.useFakeTimers().setSystemTime(parseDate('2025-01-01').getTime());
 
-      // Override activities with synthetic cash orders
-      // Scenario from User:
-      // 2023-12-31T00:00:00.000Z: 1000
-      // 2024-12-31T00:00:00.000Z: 2000
-
-      const accountId = exportResponse.accounts[0].id; // Use exportResponse to simulate tying to real account
+      const accountId = randomUUID();
 
       const syntheticActivities: Activity[] = [
         {
@@ -118,7 +111,7 @@ describe('PortfolioCalculator', () => {
             assetSubClass: 'CASH',
             currency: 'USD',
             dataSource: 'MANUAL',
-            name: 'US Dollar',
+            name: 'USD',
             symbol: 'USD'
           },
           unitPriceInAssetProfileCurrency: 1
@@ -137,47 +130,36 @@ describe('PortfolioCalculator', () => {
             assetSubClass: 'CASH',
             currency: 'USD',
             dataSource: 'MANUAL',
-            name: 'US Dollar',
+            name: 'USD',
             symbol: 'USD'
           },
           unitPriceInAssetProfileCurrency: 1
         }
       ];
 
-      jest
-        .spyOn(exchangeRateDataService, 'getExchangeRatesByCurrency')
-        .mockResolvedValue({
-          USDCHF: {
-            '2023-12-31': 0.85,
-            '2024-01-01': 0.86,
-            '2024-12-31': 0.9,
-            '2025-01-01': 0.91
-          }
-        });
-
       jest.spyOn(currentRateService, 'getValues').mockResolvedValue({
         dataProviderInfos: [],
-        values: [],
-        errors: []
+        errors: [],
+        values: []
       });
 
       const portfolioCalculator = portfolioCalculatorFactory.createCalculator({
         activities: syntheticActivities,
         calculationType: PerformanceCalculationType.ROAI,
-        currency: 'CHF', // User default currency overridden to CHF
+        currency: 'CHF',
         userId: userDummyData.id
       });
 
       const portfolioSnapshot = await portfolioCalculator.computeSnapshot();
 
       const historicalData20231231 = portfolioSnapshot.historicalData.find(
-        (d) => d.date === '2023-12-31'
+        ({ date }) => date === '2023-12-31'
       );
       const historicalData20240101 = portfolioSnapshot.historicalData.find(
-        (d) => d.date === '2024-01-01'
+        ({ date }) => date === '2024-01-01'
       );
       const historicalData20241231 = portfolioSnapshot.historicalData.find(
-        (d) => d.date === '2024-12-31'
+        ({ date }) => date === '2024-12-31'
       );
 
       /**
diff --git a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.mock.ts b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.mock.ts
index 076375523..857c1b5a5 100644
--- a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.mock.ts
+++ b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.mock.ts
@@ -14,7 +14,11 @@ export const ExchangeRateDataServiceMock = {
           '2017-12-31': 0.9787,
           '2018-01-01': 0.97373,
           '2023-01-03': 0.9238,
-          '2023-07-10': 0.8854
+          '2023-07-10': 0.8854,
+          '2023-12-31': 0.85,
+          '2024-01-01': 0.86,
+          '2024-12-31': 0.9,
+          '2025-01-01': 0.91
         }
       });
     } else if (targetCurrency === 'EUR') {