Engine: Fixing test factories
Merge pull request #3313 from daviddavis/eng-factories

Engine: Fixing test factories