#9: Adding python 3 compatibility, and fixing previous tests