diff --git a/tests/client.py b/tests/client.py
index 324f52a7..03874b95 100644
--- a/tests/client.py
+++ b/tests/client.py
@@ -1,15 +1,16 @@
+import logging
 from gevent_zeromq import zmq
 
-import zipline.util as qutil
-import zipline.messaging as qmsg
 import zipline.protocol as zp
+from zipline.core.component import Component
 from zipline.protocol import CONTROL_PROTOCOL, COMPONENT_TYPE
-from zipline.finance.trading import TradeSimulationClient
 
-class TestClient(qmsg.Component):
+LOGGER = logging.getLogger('ZiplineLogger')
+
+class TestClient(Component):
 
     def __init__(self):
-        qmsg.Component.__init__(self)
+        Component.__init__(self)
         self.init()
 
     def init(self):
@@ -55,7 +56,7 @@ class TestClient(qmsg.Component):
             #logger.info('msg:' + str(msg))
 
             if msg == str(CONTROL_PROTOCOL.DONE):
-                qutil.LOGGER.info("Client is DONE!")
+                LOGGER.info("Client is DONE!")
                 self.signal_done()
                 return
 
@@ -79,7 +80,7 @@ class TestClient(qmsg.Component):
                 self.prev_dt = event.dt
 
             if self.received_count % 100 == 0:
-                qutil.LOGGER.info("received {n} messages".format(n=self.received_count))
-            
+                LOGGER.info("received {n} messages".format(n=self.received_count))
+
     def unframe(self, msg):
         return zp.MERGE_UNFRAME(msg)
diff --git a/tests/test_finance.py b/tests/test_finance.py
index 4d5d88fa..ba9eb9af 100644
--- a/tests/test_finance.py
+++ b/tests/test_finance.py
@@ -1,5 +1,6 @@
-"""Tests for the zipline.finance package"""
-import mock
+"""
+Tests for the zipline.finance package
+"""
 import pytz
 
 from unittest2 import TestCase
@@ -9,17 +10,11 @@ from collections import defaultdict
 from nose.tools import timed
 
 import zipline.utils.factory as factory
-from zipline.utils import logger
-import zipline.finance.risk as risk
 import zipline.protocol as zp
-import zipline.finance.performance as perf
 
 from zipline.test_algorithms import TestAlgorithm
-from zipline.finance.sources import SpecificEquityTrades
-from zipline.finance.trading import TransactionSimulator, \
-TradeSimulationClient, TradingEnvironment
-from zipline.simulator import AddressAllocator, Simulator
-from zipline.core.monitor import Controller
+from zipline.finance.trading import TradingEnvironment
+from zipline.simulator import AddressAllocator
 from zipline.lines import SimulatedTrading
 from zipline.finance.performance import PerformanceTracker
 from zipline.utils.protocol_utils import namedict
diff --git a/tests/transform.py b/tests/transform.py
deleted file mode 100644
index 0f81a3f5..00000000
--- a/tests/transform.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from zipline.messaging import BaseTransform
-from zipline.protocol import COMPONENT_TYPE
-
-class DivideByZeroTransform(BaseTransform):
-    """
-    A transform that fails.
-    """
-
-    def __init__(self, name):
-        BaseTransform.__init__(self, "PASSTHROUGH")
-        self.state['name'] = name
-        self.init()
-
-    def init(self):
-        pass
-
-    @property
-    def get_type(self):
-        return COMPONENT_TYPE.CONDUIT
-
-    def transform(self, event):
-        return { 'value': 0/0 }
diff --git a/zipline/lines.py b/zipline/lines.py
index b0b51eb7..6d398cfe 100644
--- a/zipline/lines.py
+++ b/zipline/lines.py
@@ -116,7 +116,7 @@ class SimulatedTrading(object):
         :py:class:`zipline.trading.TradingEnvironment`
         - allocator: an instance of 
         :py:class:`zipline.simulator.AddressAllocator`
-        - simulator_class: a :py:class:`zipline.messaging.ComponentHost` 
+        - simulator_class: a :py:class:`zipline.core.host.ComponentHost` 
         subclass (not an instance)
         - simulation_style: optional parameter that configures the 
         :py:class:`zipline.finance.trading.TransactionSimulator`. Expects