engine - fixed failing tests