Engine: Refs #3641 - Non-api controller tests
Merge pull request #3389 from daviddavis/temp/20131118100656

Engine: Refs #3641 - Non-api controller tests