Merge "Remove redundant regex operators used in tests"