refactoring
improved compiled engine and extended unit tests