diff --git a/.travis.yml b/.travis.yml
index 3c7dad881..d85e34ff7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,3 +7,4 @@ before_script:
   - yarn
 script:
   - yarn format:check
+  - yarn test
diff --git a/apps/api/src/models/portfolio.spec.ts b/apps/api/src/models/portfolio.spec.ts
index 674579e72..b466f691d 100644
--- a/apps/api/src/models/portfolio.spec.ts
+++ b/apps/api/src/models/portfolio.spec.ts
@@ -25,7 +25,7 @@ jest.mock('../services/data-provider.service', () => {
             BTCUSD: {
               currency: Currency.USD,
               dataSource: DataSource.YAHOO,
-              exchange: 'Other',
+              exchange: UNKNOWN_KEY,
               marketPrice: 57973.008,
               marketState: MarketState.open,
               name: 'Bitcoin USD',
@@ -34,7 +34,7 @@ jest.mock('../services/data-provider.service', () => {
             ETHUSD: {
               currency: Currency.USD,
               dataSource: DataSource.YAHOO,
-              exchange: 'Other',
+              exchange: UNKNOWN_KEY,
               marketPrice: 3915.337,
               marketState: MarketState.open,
               name: 'Ethereum USD',
@@ -62,7 +62,7 @@ jest.mock('../services/exchange-rate-data.service', () => {
     ExchangeRateDataService: jest.fn().mockImplementation(() => {
       return {
         initialize: () => Promise.resolve(),
-        toCurrency: () => Promise.resolve(1)
+        toCurrency: (value: number) => value
       };
     })
   };
@@ -85,11 +85,16 @@ describe('Portfolio', () => {
       providers: [DataProviderService, ExchangeRateDataService, RulesService]
     }).compile();
 
-    dataProviderService = app.get<DataProviderService>(DataProviderService);
-    exchangeRateDataService = app.get<ExchangeRateDataService>(
-      ExchangeRateDataService
+    dataProviderService = new DataProviderService(
+      null,
+      null,
+      null,
+      null,
+      null,
+      null
     );
-    rulesService = app.get<RulesService>(RulesService);
+    exchangeRateDataService = new ExchangeRateDataService(null);
+    rulesService = new RulesService();
 
     await exchangeRateDataService.initialize();
 
diff --git a/package.json b/package.json
index 3e0aa56ea..075d54308 100644
--- a/package.json
+++ b/package.json
@@ -37,10 +37,11 @@
     "start:client": "ng serve client --hmr -o",
     "start:prod": "node apps/api/main",
     "start:server": "nx serve api",
-    "test": "ng test",
+    "test": "nx test",
     "ts-node": "ts-node --compiler-options '{\"module\":\"CommonJS\"}'",
     "update": "nx migrate latest",
     "watch:server": "nx build api --watch",
+    "watch:test": "nx test --watch",
     "workspace-generator": "nx workspace-generator"
   },
   "dependencies": {