Allow PyPy3 to fail
Refactor