Tests working again, in python 2.7 and 3.4