Working on engine tests