fix test.py to work now that we have concated the test scripts