move generators to baseTest, cleaned up wrapping.py