Engine: Fix env model tests, refs #3585
Merge pull request #3329 from daviddavis/temp/20131106133632

Engine: Fix env model tests, refs #3585