Add unittest2 and pip to tox deps

This seems to be required for pypy to work correctly
Minor fixes for pypy tests