Add skipIf for PYPY, additional tests