--- a/test/testarmasm.py	Sun Feb 23 16:24:01 2014 +0100
+++ b/test/testarmasm.py	Fri Feb 28 18:07:14 2014 +0100
@@ -3,20 +3,17 @@
 from ppci.objectfile import ObjectFile
 from asm import Assembler
 from testasm import AsmTestCaseBase
-from target.target_list import armtarget
+from target.target_list import arm_target, thumb_target
 
 
-class AssemblerArmThumb2TestCase(AsmTestCaseBase):
+class ThumbAssemblerTestCase(AsmTestCaseBase):
     def setUp(self):
-        self.t = armtarget
+        self.t = thumb_target
         self.obj = ObjectFile()
         self.o = outstream.BinaryOutputStream(self.obj)
         self.o.selectSection('.text')
         self.a = Assembler(target=self.t, stream=self.o)
 
-    def testMapOperand(self):
-        pass
-
     def testMovImm8(self):
         self.feed('mov r4, 100')
         self.check('6424')
@@ -154,15 +151,12 @@
 class AssemblerArmTestCase(AsmTestCaseBase):
     """ ARM-mode (not thumb-mode) instruction assembly test case """
     def setUp(self):
-        self.t = arm_arm_target
+        self.t = arm_target
         self.obj = ObjectFile()
         self.o = outstream.BinaryOutputStream(self.obj)
         self.o.selectSection('.text')
         self.a = Assembler(target=self.t, stream=self.o)
 
-    def testMapOperand(self):
-        pass
-
     def testMovImm(self):
         self.feed('mov r4, 100')
         self.check('6440a0e3')