Engine: Refs #3615 - Fix validator tests
Merge pull request #3356 from daviddavis/validator-tests

Engine: Fix validator tests