Changing test method from assertIsNone to assertTrue(x is None) for compatability with Python 2.6