Moved tests to engine