tweaks for 2to3 in tests & setup