Registry consistency tests: before doing certain equality comparisons, add whitespace before and after hyphens

Registry consistency tests: before doing certain equality comparisons, add whitespace before and after hyphens #951