Fix tests broken by UserRemoteConfig changes