v0.2.49..v0.2.50 changeset ConflateCmdTest.sh

diff --git a/test-files/cmd/slow/ConflateCmdTest.sh b/test-files/cmd/slow/ConflateCmdTest.sh
index 2b3ae3f..6b27c76 100755
--- a/test-files/cmd/slow/ConflateCmdTest.sh
+++ b/test-files/cmd/slow/ConflateCmdTest.sh
@@ -4,9 +4,11 @@ set -e
 mkdir -p $HOOT_HOME/tmp/
 mkdir -p test-output/cmd/slow/ConflateCmdTest
 
-hoot conflate -C Testing.conf test-files/conflate/unified/AllDataTypesA.osm test-files/conflate/unified/AllDataTypesB.osm test-output/cmd/slow/ConflateCmdTest/output.osm
+export CONFLATE_OPTS="-C Testing.conf -C UnifyingAlgorithm.conf -C ReferenceConflation.conf"
+
+hoot conflate $CONFLATE_OPTS test-files/conflate/unified/AllDataTypesA.osm test-files/conflate/unified/AllDataTypesB.osm test-output/cmd/slow/ConflateCmdTest/output.osm
 hoot diff test-output/cmd/slow/ConflateCmdTest/output.osm test-files/cmd/slow/ConflateCmdTest/output.osm || diff test-output/cmd/slow/ConflateCmdTest/output.osm test-files/cmd/slow/ConflateCmdTest/output.osm
 
 # Check to make sure we don't bomb out on empty files
-hoot conflate -C Testing.conf --warn test-files/Empty.osm test-files/Empty.osm tmp/ConflateCmdTest.osm
+hoot conflate $CONFLATE_OPTS --warn test-files/Empty.osm test-files/Empty.osm tmp/ConflateCmdTest.osm
 hoot diff test-files/Empty.osm tmp/ConflateCmdTest.osm || cat tmp/ConflateCmdTest.osm