Engine: engine-test-system - system model tests
Merge pull request #3316 from thomasmckay/engine-test-system

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

Engine: Fix env model tests, refs #3585