started engine tests; refactored existing tests