Tests now compatible with python 2.x and 3.x