Minor test script changes