Merge "Revert "Updates tests for new accessibility flags.""