Fixes failing tests in the engine model

Fixes #7