Almost fix regression tests; code changes still required
Don't give first fuzzy match; regression tests pass