S56580: remove cfd toggle ref and fix resulting test breakage