[WIP] try to restore pypy tests