(Hopefully) fixed tests not running in python 2