fixing ordering issue that broke pypy tests