Minor changes to test script