Minor simplification of test script