Removes use of AssertIsNone and AssertLess so that test suite is python 2.6 compatible