merge + pypy test