v0.2.47..v0.2.48 changeset Testing.conf

diff --git a/conf/core/Testing.conf b/conf/core/Testing.conf
index 59f47d0..0c27e99 100644
--- a/conf/core/Testing.conf
+++ b/conf/core/Testing.conf
@@ -1,6 +1,18 @@
 {
+  "#" : "There is a specific test for building part multithreaded merging, so lets leave it single threaded for all other tests.",
+  "building.part.merger.thread.count": "1",
+  "#" : "Truncating tag values with ApiTagTruncateVisitor is a default conflation op and valuable in order to keep JOSM output looking good.", 
+  "#" : "However, We want to disable it during conflation tests so that we can more easily trace feature provenance via UUID. Arguably, we",
+  "#" : "could alternatively come up with a generic syntax in JSON options to do this kind of disabling for any option...",
+  "conflate.tag.disable.value.truncation": "true",
   "#" : "Options required for unit test runs",
   "hash.seed.zero": "true",
-  "building.part.merger.thread.count": "1",
+  "#" : "Poi/Polygon address matching has a slow init time that we dont want to incur for every test. We only want to incur it for those",
+  "#" : "on which it is required, and it is enabled selectively in child confs.",
+  "poi.polygon.address.match.enabled": "false",
+  "#" : "At user request in the UI we have hardcoded POI/Polygon tag merging to use the PreserveTypesTagMerger, as there is currently",
+  "#" : "no way to dynamically change tag merging from within the UI. Since PreserveTypesTagMerger is still experimental, we want to leave",
+  "#" : "the merger in the these tests at its original value and possibly change it at a later time.",
+  "poi.polygon.tag.merger": "hoot::OverwriteTag2Merger",
   "#" : "end"
 }