Cleanup imports in tests
Fix Python 2.6 compatibility in tests