Restored Python 3 compatibility in tests.