Update COMMON_MAPPINGS to align with the properties file and change the test so that it consistently works. See gh-32101