Got all tests working on Python 3.4.0