Merge "Add TEST_MAPPINGs for CDM"