Refactor engine and improved unit tests