--- a/test/testmsp430asm.py	Fri Feb 28 18:07:14 2014 +0100
+++ b/test/testmsp430asm.py	Sat Mar 01 15:40:31 2014 +0100
@@ -4,17 +4,17 @@
 from ppci.asmnodes import AInstruction, ABinop, AUnop, ASymbol, ALabel, ANumber
 from ppci.assembler import tokenize, Assembler
 from ppci.objectfile import ObjectFile
-import outstream
-from target import Label
-from target.target_list import msp430target
+from ppci.outstream import BinaryOutputStream
+from ppci.target import Label
+from ppci.target.target_list import msp430target
 from testasm import AsmTestCaseBase
 
 
-class AssemblerMSP430TestCase(AsmTestCaseBase):
+class Msp430AssemblerTestCase(AsmTestCaseBase):
     def setUp(self):
         self.t = msp430target
         self.obj = ObjectFile()
-        self.o = outstream.BinaryOutputStream(self.obj)
+        self.o = BinaryOutputStream(self.obj)
         self.o.selectSection('.text')
         self.a = Assembler(target=self.t, stream=self.o)
 
@@ -34,10 +34,6 @@
         self.feed("reti")
         self.check('0013')
 
-    def testMSPinstructionCount(self):
-        """ Check that there are 27 instructions """
-        self.assertEqual(27, len(self.t.instructions))
-
 
 if __name__ == '__main__':
     unittest.main()