Reduce 2to3 differences
Fix tests for Python 3.2 on Windows