Minor script test refactoring