Getting more work out of test.py and into load.py