Resolved issues in test script