Engine: Refs #3641 - Fixing v2 controller tests