Merge "More TEST_MAPPING for role + permissions"