Fixing some issues with SimpleEngine test
Merge branch 'palistov_engine'