Updated for test script