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

Engine: engine-test-system - system model tests