Revert "Should save match only if it is not present in the Gazetteer"

This reverts commit 98b5adcbbed5474c5f95b8d64a38926b027aeddf.
Unit tests: minor renaming
Test data updated to match the example data