Engine: Refs #3584 - Simplifying test task glue files
Merge pull request #3369 from daviddavis/temp/20131112103503

Engine: Refs #3584 - Simplifying test task glue files