Aaaand fix imports for Python 2.6 in tests