--- a/test/testmsp430asm.py	Sun Mar 02 17:12:08 2014 +0100
+++ b/test/testmsp430asm.py	Fri Mar 07 17:05:32 2014 +0100
@@ -1,22 +1,21 @@
 #!/usr/bin/python
 
 import unittest
-from ppci.asmnodes import AInstruction, ABinop, AUnop, ASymbol, ALabel, ANumber
 from ppci.assembler import tokenize, Assembler
 from ppci.objectfile import ObjectFile
 from ppci.outstream import BinaryOutputStream
-from ppci.target import Label
 from ppci.target.target_list import msp430target
 from testasm import AsmTestCaseBase
 
+a = Assembler(msp430target)
 
 class Msp430AssemblerTestCase(AsmTestCaseBase):
     def setUp(self):
         self.t = msp430target
         self.obj = ObjectFile()
-        self.o = BinaryOutputStream(self.obj)
-        self.o.selectSection('.text')
-        self.a = Assembler(target=self.t, stream=self.o)
+        self.ostream = BinaryOutputStream(self.obj)
+        self.ostream.selectSection('.text')
+        self.a = a
 
     def testMov(self):
         self.feed("mov r14, r15")