Modified EngineHandler test