Fix tests post-CHR removal