Merge "Add test mapping for a11y"