Merge "Consolidate a11y unit tests and get them working"