Add engine
Add missing tests for engine