no need to support py2.5 anymore, so simplify tests, making them pass on 3.X