diff --git a/freqtrade/tests/test_acl_pair.py b/freqtrade/tests/test_acl_pair.py
index b5f52774d..174f1fde9 100644
--- a/freqtrade/tests/test_acl_pair.py
+++ b/freqtrade/tests/test_acl_pair.py
@@ -12,77 +12,87 @@ def whitelist_conf():
 
     config['stake_currency'] = 'BTC'
     config['exchange']['pair_whitelist'] = [
-        'BTC_ETH',
-        'BTC_TKN',
-        'BTC_TRST',
-        'BTC_SWT',
-        'BTC_BCC'
+        'ETH/BTC',
+        'TKN/BTC',
+        'TRST/BTC',
+        'SWT/BTC',
+        'BCC/BTC'
     ]
 
     config['exchange']['pair_blacklist'] = [
-        'BTC_BLK'
+        'BLK/BTC'
     ]
 
     return config
 
 
 def get_market_summaries():
-    return [{
-        'MarketName': 'BTC-TKN',
-        'High': 0.00000919,
-        'Low': 0.00000820,
-        'Volume': 74339.61396015,
-        'Last': 0.00000820,
-        'BaseVolume': 1664,
-        'TimeStamp': '2014-07-09T07:19:30.15',
-        'Bid': 0.00000820,
-        'Ask': 0.00000831,
-        'OpenBuyOrders': 15,
-        'OpenSellOrders': 15,
-        'PrevDay': 0.00000821,
-        'Created': '2014-03-20T06:00:00',
-        'DisplayMarketName': ''
-    }, {
-        'MarketName': 'BTC-ETH',
-        'High': 0.00000072,
-        'Low': 0.00000001,
-        'Volume': 166340678.42280999,
-        'Last': 0.00000005,
-        'BaseVolume': 42,
-        'TimeStamp': '2014-07-09T07:21:40.51',
-        'Bid': 0.00000004,
-        'Ask': 0.00000005,
-        'OpenBuyOrders': 18,
-        'OpenSellOrders': 18,
-        'PrevDay': 0.00000002,
-        'Created': '2014-05-30T07:57:49.637',
-        'DisplayMarketName': ''
-    }, {
-        'MarketName': 'BTC-BLK',
-        'High': 0.00000072,
-        'Low': 0.00000001,
-        'Volume': 166340678.42280999,
-        'Last': 0.00000005,
-        'BaseVolume': 3,
-        'TimeStamp': '2014-07-09T07:21:40.51',
-        'Bid': 0.00000004,
-        'Ask': 0.00000005,
-        'OpenBuyOrders': 18,
-        'OpenSellOrders': 18,
-        'PrevDay': 0.00000002,
-        'Created': '2014-05-30T07:57:49.637',
-        'DisplayMarketName': ''
-    }]
+    return {
+        'TKN/BTC': {
+            'symbol': 'TKN/BTC',
+            'info': {
+                'High': 0.00000919,
+                'Low': 0.00000820,
+                'Volume': 74339.61396015,
+                'Last': 0.00000820,
+                'BaseVolume': 1664,
+                'TimeStamp': '2014-07-09T07:19:30.15',
+                'Bid': 0.00000820,
+                'Ask': 0.00000831,
+                'OpenBuyOrders': 15,
+                'OpenSellOrders': 15,
+                'PrevDay': 0.00000821,
+                'Created': '2014-03-20T06:00:00',
+                'DisplayMarketName': ''
+            }
+        },
+        'ETH/BTC': {
+            'symbol': 'ETH/BTC',
+            'info': {
+                'High': 0.00000072,
+                'Low': 0.00000001,
+                'Volume': 166340678.42280999,
+                'Last': 0.00000005,
+                'BaseVolume': 42,
+                'TimeStamp': '2014-07-09T07:21:40.51',
+                'Bid': 0.00000004,
+                'Ask': 0.00000005,
+                'OpenBuyOrders': 18,
+                'OpenSellOrders': 18,
+                'PrevDay': 0.00000002,
+                'Created': '2014-05-30T07:57:49.637',
+                'DisplayMarketName': ''
+            }
+        },
+        'BLK/BTC': {
+            'symbol': 'BLK/BTC',
+            'info': {
+                'High': 0.00000072,
+                'Low': 0.00000001,
+                'Volume': 166340678.42280999,
+                'Last': 0.00000005,
+                'BaseVolume': 3,
+                'TimeStamp': '2014-07-09T07:21:40.51',
+                'Bid': 0.00000004,
+                'Ask': 0.00000005,
+                'OpenBuyOrders': 18,
+                'OpenSellOrders': 18,
+                'PrevDay': 0.00000002,
+                'Created': '2014-05-30T07:57:49.637',
+                'DisplayMarketName': ''
+            }}
+    }
 
 
 def get_health():
-    return [{'Currency': 'ETH', 'IsActive': True},
-            {'Currency': 'TKN', 'IsActive': True},
-            {'Currency': 'BLK', 'IsActive': True}]
+    return {
+        'ETH/BTC': {'base': 'ETH', 'active': True},
+        'TKN/BTC': {'base': 'TKN', 'active': True},
+        'BLK/BTC': {'base': 'BLK', 'active': True}}
 
 
 def get_health_empty():
-    return []
+    return {}
 
 
 def test_refresh_market_pair_not_in_whitelist(mocker):
@@ -92,10 +102,10 @@ def test_refresh_market_pair_not_in_whitelist(mocker):
 
     mocker.patch('freqtrade.freqtradebot.exchange.get_wallet_health', get_health)
     refreshedwhitelist = freqtradebot._refresh_whitelist(
-        conf['exchange']['pair_whitelist'] + ['BTC_XXX']
+        conf['exchange']['pair_whitelist'] + ['XXX/BTC']
     )
     # List ordered by BaseVolume
-    whitelist = ['BTC_ETH', 'BTC_TKN']
+    whitelist = ['ETH/BTC', 'TKN/BTC']
     # Ensure all except those in whitelist are removed
     assert whitelist == refreshedwhitelist
 
@@ -108,7 +118,7 @@ def test_refresh_whitelist(mocker):
     refreshedwhitelist = freqtradebot._refresh_whitelist(conf['exchange']['pair_whitelist'])
 
     # List ordered by BaseVolume
-    whitelist = ['BTC_ETH', 'BTC_TKN']
+    whitelist = ['ETH/BTC', 'TKN/BTC']
     # Ensure all except those in whitelist are removed
     assert whitelist == refreshedwhitelist
 
@@ -123,7 +133,7 @@ def test_refresh_whitelist_dynamic(mocker):
     )
 
     # argument: use the whitelist dynamically by exchange-volume
-    whitelist = ['BTC_TKN', 'BTC_ETH']
+    whitelist = ['TKN/BTC', 'ETH/BTC']
 
     refreshedwhitelist = freqtradebot._refresh_whitelist(
         freqtradebot._gen_pair_whitelist(conf['stake_currency'])