Merge "Add test mapping for new permission code." into main