more tests than expected, ran 2to3 -w on them