Updated testing for pypy, removed some unneeded imports in tests