Small changes to test script