Make the test suite pass with both Python 2.7 and 3.3