Fixing tests in Python 3
Merge pull request #52 from keitheis/fix-tests-on-python-3

Fixing tests in Python 3