Fix Pypy tests
Merge with public