More fixes for the test script and program.