diff --git a/tests/test_finance.py b/tests/test_finance.py
index c3605fe7..b5ef0e4c 100644
--- a/tests/test_finance.py
+++ b/tests/test_finance.py
@@ -14,7 +14,7 @@ import zipline.protocol as zp
 
 from zipline.test_algorithms import TestAlgorithm
 from zipline.finance.trading import TradingEnvironment
-from zipline.simulator import AddressAllocator
+from zipline.core.devsimulator import AddressAllocator
 from zipline.lines import SimulatedTrading
 from zipline.finance.performance import PerformanceTracker
 from zipline.utils.protocol_utils import ndict
@@ -143,7 +143,7 @@ class FinanceTestCase(TestCase):
         
         # TODO: for some reason the orders aren't filled without an extra
         # trade.
-        trade_count = 5001
+        trade_count = 5
         self.zipline_test_config['order_count'] = trade_count - 1
         self.zipline_test_config['trade_count'] = trade_count 
         self.zipline_test_config['order_amount'] = 1
diff --git a/zipline/simulator.py b/zipline/core/devsimulator.py
similarity index 100%
rename from zipline/simulator.py
rename to zipline/core/devsimulator.py
diff --git a/zipline/lines.py b/zipline/lines.py
index 3ab0c12b..1cead572 100644
--- a/zipline/lines.py
+++ b/zipline/lines.py
@@ -69,7 +69,7 @@ from zipline.transforms import BaseTransform
 
 from zipline.test_algorithms import TestAlgorithm
 from zipline.finance.trading import TradeSimulationClient
-from zipline.simulator import Simulator
+from zipline.core.devsimulator import Simulator
 from zipline.core.monitor import Controller
 from zipline.finance.trading import SIMULATION_STYLE