Fix Python 3 test failures
Fix PyPy 2 test failure