Refactored mock proxies.