Update mock to reflect Core API v1 changes

@settinghead please review. I tested locally - CH tests pass.