made tests work in py27 and py34