Update test for CRB mappings
Deduplicate RDS mappings
Merge pull request #326 from rjc123/master

Updated mappings and tests for CRB and RDS