Merge "Add Collectors.mapping tests." into sc-dev