Refactored mock system.