Get all tests to pass under python 3.3