diff --git a/tests/chip_id_tests.py b/tests/chip_id_tests.py
index f83b4f7..5e14d36 100644
--- a/tests/chip_id_tests.py
+++ b/tests/chip_id_tests.py
@@ -1,22 +1,21 @@
 #!/usr/bin/env python
 
+import binascii
 import datetime
 import os
 import sys
-import struct
 import socket
+import struct
+import subprocess
 import tempfile
 import time
-import binascii
+import threading
 
 import logging
-logging.basicConfig(level=logging.INFO, format="%(message)s")
-logger = logging.getLogger('program')
+logging.basicConfig(level=logging.INFO, \
+        format="%(levelname)s %(name)s : %(message)s")
+logger = logging.getLogger(__name__ )
 
-import threading
-import subprocess
-
-import inspect
 
 from m3.ice import ICE
 import m3.ice_simulator
@@ -27,10 +26,6 @@ class TestDefaultChipId(object):
     #magic nose stuff
     _multiprocess_shared_ = False
 
-    class TestFailedException(Exception):
-        logger.info('='*42 + '\nTEST FAILED\n' + '='*42)
-        pass
-
     @classmethod
     def setup_class(cls, ):
        
@@ -56,6 +51,7 @@ def setup_class(cls, ):
 
     @classmethod
     def teardown_class(cls):
+        cls.sim_thread.join()
         m3.ice_simulator.destroy_fake_serial()
 
     def test_goc_message_default(self):
@@ -75,18 +71,12 @@ def test_goc_message_default(self):
         self.driver.goc_programmer.cmd_message()
 
                 
-        # I have no idea how this works.....
-
 
 class TestNonDefaultChipID(object):
 
     #magic nose stuff
     _multiprocess_shared_ = False
 
-    class TestFailedException(Exception):
-        logger.info('='*42 + '\nTEST FAILED\n' + '='*42)
-        pass
-
     @classmethod
     def setup_class(cls, ):
        
@@ -112,8 +102,11 @@ def setup_class(cls, ):
 
     @classmethod
     def teardown_class(cls):
+        cls.sim_thread.join()
+
         m3.ice_simulator.destroy_fake_serial()
 
+
     def test_goc_message_default(self):
         logger.info("Testing Goc Message Feature w/default chip_id") 
 
@@ -137,10 +130,6 @@ class TestChipIDMaskProgram(object):
     #magic nose stuff
     _multiprocess_shared_ = False
 
-    class TestFailedException(Exception):
-        logger.info('='*42 + '\nTEST FAILED\n' + '='*42)
-        pass
-
     @classmethod
     def setup_class(cls, ):
        
@@ -166,9 +155,9 @@ def setup_class(cls, ):
 
     @classmethod
     def teardown_class(cls):
+        cls.sim_thread.join()
         m3.ice_simulator.destroy_fake_serial()
 
-
     def test_goc_flash_default(self):
         logger.info("Testing Goc Message Feature w/default chip_id") 
 
@@ -225,13 +214,15 @@ def test_goc_flash_default(self):
         os.remove(tmp_path)
 
 
-
+#
+#
+#
 if __name__ == '__main__':
 
-    logging.basicConfig(level=logging.INFO, format="%(levelname)s %(name)s : %(message)s")
-
     import nose
-    result = nose.run( defaultTest=__name__)
+
+    # make sure only 1 tests runs at once
+    result = nose.run( argv=['--processes=0'], defaultTest=__name__)
     
     if result == True:
         print 'TESTS PASSED'
diff --git a/tests/transactions/goc_message_nondefault_chip.trx b/tests/transactions/goc_message_nondefault_chip.trx
index 4080a0d..ebd83d0 100644
--- a/tests/transactions/goc_message_nondefault_chip.trx
+++ b/tests/transactions/goc_message_nondefault_chip.trx
@@ -6,40 +6,31 @@ SEND 0004
 WAIT 560000
 SEND 000002
 SEND 0004
-
 WAIT 7601020004
 SEND 000100
-
 WAIT 3f02013f
 SEND 00020b
 SEND 3f424d4f505f62666d6f70
-
 WAIT 6f0305630061a800
 SEND 000300
-
 WAIT 6f04027001
 SEND 000400
-
 WAIT 6f05026f00
 SEND 000500
-
 WAIT 7006036f0301
 SEND 000600
-
 WAIT 6d07026d00
 SEND 000700
-
 WAIT 6f080563000411aa
 SEND 000800
-
 WAIT 6609027394
 SEND 000900
-
 WAIT 6f0a056300008235
 SEND 000a00
-
-WAIT 660b0f8f0001000090000000a0bbbbaaaa6a
+WAIT 660b0f800001000081000000a0bbbbaaaa6a
 SEND 000b00
-
 WAIT 660c0180
 SEND 000c00
+
+#prevents serial from closing too soon
+SLEEP 2