diff --git a/doc/scripts/DocSourcesList.cmake b/doc/scripts/DocSourcesList.cmake
index cf82618377..0b67ab1995 100644
--- a/doc/scripts/DocSourcesList.cmake
+++ b/doc/scripts/DocSourcesList.cmake
@@ -19,6 +19,7 @@ rest_target(${psd} base/init-bare.bro internal)
 rest_target(${CMAKE_BINARY_DIR}/scripts base/bif/analyzer.bif.bro)
 rest_target(${CMAKE_BINARY_DIR}/scripts base/bif/bloom-filter.bif.bro)
 rest_target(${CMAKE_BINARY_DIR}/scripts base/bif/bro.bif.bro)
+rest_target(${CMAKE_BINARY_DIR}/scripts base/bif/cardinality-counter.bif.bro)
 rest_target(${CMAKE_BINARY_DIR}/scripts base/bif/const.bif.bro)
 rest_target(${CMAKE_BINARY_DIR}/scripts base/bif/event.bif.bro)
 rest_target(${CMAKE_BINARY_DIR}/scripts base/bif/file_analysis.bif.bro)
@@ -130,6 +131,7 @@ rest_target(${psd} base/frameworks/sumstats/cluster.bro)
 rest_target(${psd} base/frameworks/sumstats/main.bro)
 rest_target(${psd} base/frameworks/sumstats/non-cluster.bro)
 rest_target(${psd} base/frameworks/sumstats/plugins/average.bro)
+rest_target(${psd} base/frameworks/sumstats/plugins/hll_unique.bro)
 rest_target(${psd} base/frameworks/sumstats/plugins/last.bro)
 rest_target(${psd} base/frameworks/sumstats/plugins/max.bro)
 rest_target(${psd} base/frameworks/sumstats/plugins/min.bro)
diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.thresholding/.stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.thresholding/output
similarity index 100%
rename from testing/btest/Baseline/scripts.base.frameworks.sumstats.thresholding/.stdout
rename to testing/btest/Baseline/scripts.base.frameworks.sumstats.thresholding/output
index 3afedd785d..d4ff3b7698 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.sumstats.thresholding/.stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.sumstats.thresholding/output
@@ -1,6 +1,6 @@
-THRESHOLD_SERIES: hit a threshold series value at 3 for sumstats_key(host=1.2.3.4)
-THRESHOLD: hit a threshold value at 6 for sumstats_key(host=1.2.3.4)
-THRESHOLD_SERIES: hit a threshold series value at 6 for sumstats_key(host=1.2.3.4)
-THRESHOLD: hit a threshold value at 1001 for sumstats_key(host=7.2.1.5)
-THRESHOLD_SERIES: hit a threshold series value at 1001 for sumstats_key(host=7.2.1.5)
 THRESHOLD WITH RATIO BETWEEN REDUCERS: hit a threshold value at 55x for sumstats_key(host=7.2.1.5)
+THRESHOLD: hit a threshold value at 1001 for sumstats_key(host=7.2.1.5)
+THRESHOLD: hit a threshold value at 6 for sumstats_key(host=1.2.3.4)
+THRESHOLD_SERIES: hit a threshold series value at 1001 for sumstats_key(host=7.2.1.5)
+THRESHOLD_SERIES: hit a threshold series value at 3 for sumstats_key(host=1.2.3.4)
+THRESHOLD_SERIES: hit a threshold series value at 6 for sumstats_key(host=1.2.3.4)
diff --git a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro
index e83096919a..d2fd592855 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro
+++ b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro
@@ -29,7 +29,7 @@ event bro_init() &priority=5
 	                  $epoch_result(ts: time, key: SumStats::Key, result: SumStats::Result) =
 	                  	{
 	                  	local r = result["test"];
-	                  	print fmt("Host: %s - num:%d - sum:%.1f - avg:%.1f - max:%.1f - min:%.1f - var:%.1f - std_dev:%.1f - unique:%d - hllunique:%d", key$host, r$num, r$sum, r$average, r$max, r$min, r$variance, r$std_dev, r$unique, r$hllunique);
+	                  	print fmt("Host: %s - num:%d - sum:%.1f - avg:%.1f - max:%.1f - min:%.1f - var:%.1f - std_dev:%.1f - unique:%d - hllunique:%d", key$host, r$num, r$sum, r$average, r$max, r$min, r$variance, r$std_dev, r$unique, r$hll_unique);
 	                  	},
 	                  $epoch_finished(ts: time) =
 	                  	{
diff --git a/testing/btest/scripts/base/frameworks/sumstats/basic.bro b/testing/btest/scripts/base/frameworks/sumstats/basic.bro
index d8738b71b7..fb1254baca 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/basic.bro
+++ b/testing/btest/scripts/base/frameworks/sumstats/basic.bro
@@ -18,7 +18,7 @@ event bro_init() &priority=5
 	                  $epoch_result(ts: time, key: SumStats::Key, result: SumStats::Result) =
 	                  	{
 	                  	local r = result["test.metric"];
-	                  	print fmt("Host: %s - num:%d - sum:%.1f - var:%.1f - avg:%.1f - max:%.1f - min:%.1f - std_dev:%.1f - unique:%d - hllunique:%d", key$host, r$num, r$sum, r$variance, r$average, r$max, r$min, r$std_dev, r$unique, r$hllunique);
+	                  	print fmt("Host: %s - num:%d - sum:%.1f - var:%.1f - avg:%.1f - max:%.1f - min:%.1f - std_dev:%.1f - unique:%d - hllunique:%d", key$host, r$num, r$sum, r$variance, r$average, r$max, r$min, r$std_dev, r$unique, r$hll_unique);
 	                  	}
 		 ]);
 
diff --git a/testing/btest/scripts/base/frameworks/sumstats/thresholding.bro b/testing/btest/scripts/base/frameworks/sumstats/thresholding.bro
index b00b30a375..b7bb826446 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/thresholding.bro
+++ b/testing/btest/scripts/base/frameworks/sumstats/thresholding.bro
@@ -1,5 +1,5 @@
-# @TEST-EXEC: bro %INPUT
-# @TEST-EXEC: btest-diff .stdout
+# @TEST-EXEC: bro %INPUT | sort >output
+# @TEST-EXEC: btest-diff output
 
 redef enum Notice::Type += {
 	Test_Notice,