Fix to get tests passing with pypy 1.9.0