Fixes failing tests in the engine model
Merge pull request #8 from roperzh/issue-7

Fixes failing tests in the engine model