add tests, new engine