More PyPy test fixes