pypy: try to fix remaining 4 tests