Issue: WCK-54 repair mock engine
Merge pull request #5 from F483/master

Issue: WCK-54 repair mock engine