Repaired all tests to correctly work correctly on Python 2.x