Using six to make code more compatible with Python 3
Making the tests pass