make some updates for pypy tests