Updated mappings and tests for CRB and RDS