Refactoring test scripts