some fixes to get scripts/test.py to run all the tests.