unit tests for engine and grammar improved
Merge test engine