Test dependencies
Whitespace cleanup
__future__ import fixes
Migrate to the new future interface