Extended the test script