Merge "[Ravenwood] Update TEST_MAPPINGs" into main