diff --git a/.hgignore b/.hgignore
index bb6d589..fd5e404 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,4 @@
 syntax: glob
 
 *.pyc
+*.svn
diff --git a/xbee/tests/test_xbee.py b/xbee/tests/test_xbee.py
deleted file mode 100644
index 1e32326..0000000
--- a/xbee/tests/test_xbee.py
+++ /dev/null
@@ -1,113 +0,0 @@
-#! /usr/bin/python
-"""
-test_xbee.py
-
-By Paul Malmsten, 2010
-pmalmsten@gmail.com
-
-Tests the XBeeBase superclass module for XBee API conformance.
-"""
-import unittest
-from xbee.base import XBeeBase
-from Fake import FakeDevice, FakeReadDevice
-
-class TestWriteToDevice(unittest.TestCase):
-    """
-    XBeeBase class should properly write binary data in a valid API
-    frame to a given serial device.
-    """
-    
-    def test_write(self):
-        """
-        write method should write the expected data to the serial
-        device
-        """
-        device = FakeDevice()
-        
-        xbee = XBeeBase(device)
-        xbee.write('\x00')
-        
-        # Check resuting state of fake device
-        expected_frame = '\x7E\x00\x01\x00\xFF'
-        self.assertEqual(device.data, expected_frame)
-        
-    def test_write_again(self):
-        """
-        write method should write the expected data to the serial
-        device
-        """
-        device = FakeDevice()
-        
-        xbee = XBeeBase(device)
-        xbee.write('\x00\x01\x02')
-        
-        # Check resuting state of fake device
-        expected_frame = '\x7E\x00\x03\x00\x01\x02\xFC'
-        self.assertEqual(device.data, expected_frame)
-        
-class TestReadFromDevice(unittest.TestCase):
-    """
-    XBeeBase class should properly read and extract data from a valid
-    API frame
-    """
-    def test_read(self):
-        """
-        wait_for_frame should properly read a frame of data
-        """
-        device = FakeReadDevice('\x7E\x00\x01\x00\xFF')
-        xbee = XBeeBase(device)
-        
-        frame = xbee.wait_for_frame()
-        self.assertEqual(frame.data, '\x00')
-        
-    def test_read_invalid_followed_by_valid(self):
-        """
-        wait_for_frame should skip invalid data
-        """
-        device = FakeReadDevice(
-            '\x7E\x00\x01\x00\xFA' + '\x7E\x00\x01\x05\xFA')
-        xbee = XBeeBase(device)
-        
-        frame = xbee.wait_for_frame()
-        self.assertEqual(frame.data, '\x05')
-        
-class TestNotImplementedFeatures(unittest.TestCase):
-    """
-    In order to properly use the XBeeBase class for most situations,
-    it must be subclassed with the proper attributes definined. If
-    this is not the case, then a NotImplemented exception should be
-    raised as appropriate.
-    """
-    
-    def setUp(self):
-        """
-        Set up a base class XBeeBase object which does not have 
-        api_commands or api_responses defined
-        """
-        self.xbee = XBeeBase(None)
-    
-    def test_build_command(self):
-        """
-        build_command should raise NotImplemented
-        """
-        self.assertRaises(NotImplementedError, self.xbee.build_command, "at")
-        
-    def test_split_response(self):
-        """
-        split_command should raise NotImplemented
-        """
-        self.assertRaises(NotImplementedError, self.xbee.split_response, "\00")
-        
-    def test_shorthand(self):
-        """
-        Shorthand calls should raise NotImplementedError
-        """
-        try:
-            cmd = self.xbee.at
-        except NotImplementedError:
-            pass
-        else:
-            self.fail("Shorthand call on XBeeBase base class should raise NotImplementedError")
-        
-if __name__ == '__main__':
-    unittest.main()