diff --git a/scripts/base/frameworks/sumstats/plugins/last.bro b/scripts/base/frameworks/sumstats/plugins/last.bro
index 1c70db372c..e2cf31c902 100644
--- a/scripts/base/frameworks/sumstats/plugins/last.bro
+++ b/scripts/base/frameworks/sumstats/plugins/last.bro
@@ -21,10 +21,10 @@ export {
 	};
 
 	## Get a vector of element values from a ResultVal.
-	global get_last_elements: function(rv: ResultVal): vector of Observation;
+	global get_last: function(rv: ResultVal): vector of Observation;
 }
 
-function get_last_elements(rv: ResultVal): vector of Observation
+function get_last(rv: ResultVal): vector of Observation
 	{
 	local s: vector of Observation = vector();
 	if ( rv?$last_elements )
diff --git a/scripts/base/frameworks/sumstats/plugins/sample.bro b/scripts/base/frameworks/sumstats/plugins/sample.bro
index 328067c939..b722d6d7a3 100644
--- a/scripts/base/frameworks/sumstats/plugins/sample.bro
+++ b/scripts/base/frameworks/sumstats/plugins/sample.bro
@@ -108,6 +108,7 @@ hook compose_resultvals_hook(result: ResultVal, rv1: ResultVal, rv2: ResultVal)
 			}
 
 		local totalcount = rv1$sample_elements + rv2$sample_elements;
+		result$sample_elements = totalcount;
 
 		for ( i in other_vector ) 
 			{
diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout
deleted file mode 100644
index 579bd109d9..0000000000
--- a/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout
+++ /dev/null
@@ -1,12 +0,0 @@
-6.5.4.3
-[[num=2, dbl=<uninitialized>, str=<uninitialized>], [num=5, dbl=<uninitialized>, str=<uninitialized>]]
-2
-10.10.10.10
-[[num=5, dbl=<uninitialized>, str=<uninitialized>]]
-1
-1.2.3.4
-[[num=5, dbl=<uninitialized>, str=<uninitialized>], [num=22, dbl=<uninitialized>, str=<uninitialized>], [num=94, dbl=<uninitialized>, str=<uninitialized>], [num=91, dbl=<uninitialized>, str=<uninitialized>], [num=52, dbl=<uninitialized>, str=<uninitialized>]]
-0
-7.2.1.5
-[[num=1, dbl=<uninitialized>, str=<uninitialized>], [num=91, dbl=<uninitialized>, str=<uninitialized>]]
-2
diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/out b/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/out
new file mode 100644
index 0000000000..2451b82f45
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/out
@@ -0,0 +1,18 @@
+1
+1.2.3.4
+10.10.10.10
+2
+2
+34
+6.5.4.3
+7.2.1.5
+[num=1, dbl=<uninitialized>, str=<uninitialized>]
+[num=2, dbl=<uninitialized>, str=<uninitialized>]
+[num=22, dbl=<uninitialized>, str=<uninitialized>]
+[num=5, dbl=<uninitialized>, str=<uninitialized>]
+[num=5, dbl=<uninitialized>, str=<uninitialized>]
+[num=5, dbl=<uninitialized>, str=<uninitialized>]
+[num=52, dbl=<uninitialized>, str=<uninitialized>]
+[num=91, dbl=<uninitialized>, str=<uninitialized>]
+[num=91, dbl=<uninitialized>, str=<uninitialized>]
+[num=94, dbl=<uninitialized>, str=<uninitialized>]
diff --git a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro
index 458bef01de..1b0f0eec94 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro
+++ b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro
@@ -5,8 +5,8 @@
 # @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro %INPUT
 # @TEST-EXEC: btest-bg-wait 15
-
-# @TEST-EXEC: btest-diff manager-1/.stdout
+# @TEST-EXEC: cat manager-1/.stdout | sort > out
+# @TEST-EXEC: btest-diff out
 
 @TEST-START-FILE cluster-layout.bro
 redef Cluster::nodes = {
@@ -31,7 +31,9 @@ event bro_init() &priority=5
 	                  		{
 					print key$host;
 	                     		local r = rt[key]["test"];
-	                     		print r$samples;
+					for ( sample in r$samples ) {
+						print r$samples[sample];
+					}
 					print r$sample_elements;
 	                  		}