Engine: Refs #3641 - Fixing v1 controller tests
Merge pull request #3372 from daviddavis/temp/20131113132421

Engine: Refs #3641 - Fixing v1 controller tests