Fix tests broken by the CGNR change.
2 files changed