Issue: WCK-54 repair mock engine