Refactoring test files and options as part of the task runner.