diff --git a/scripts/test-all-policy.bro b/scripts/test-all-policy.bro
index 4039fe2732..0e47543404 100644
--- a/scripts/test-all-policy.bro
+++ b/scripts/test-all-policy.bro
@@ -15,6 +15,9 @@
 # @load frameworks/control/controller.bro
 @load frameworks/dpd/detect-protocols.bro
 @load frameworks/dpd/packet-segment-logging.bro
+@load frameworks/metrics/conn-example.bro
+@load frameworks/metrics/http-example.bro
+@load frameworks/metrics/ssl-example.bro
 @load frameworks/software/version-changes.bro
 @load frameworks/software/vulnerable.bro
 @load integration/barnyard2/__load__.bro
diff --git a/testing/btest/Baseline/policy.misc.bare-loaded-scripts/canonified_loaded_scripts.log b/testing/btest/Baseline/policy.misc.bare-loaded-scripts/canonified_loaded_scripts.log
index 7d40d728da..8386089200 100644
--- a/testing/btest/Baseline/policy.misc.bare-loaded-scripts/canonified_loaded_scripts.log
+++ b/testing/btest/Baseline/policy.misc.bare-loaded-scripts/canonified_loaded_scripts.log
@@ -1,13 +1,13 @@
 # depth	name
 0	scripts/base/init-bare.bro
-1	build/src/const.bif.bro
-1	build/src/types.bif.bro
-1	build/src/strings.bif.bro
-1	build/src/bro.bif.bro
-1	build/src/reporter.bif.bro
-1	build/src/event.bif.bro
+1	build/src/base/const.bif.bro
+1	build/src/base/types.bif.bro
+1	build/src/base/strings.bif.bro
+1	build/src/base/bro.bif.bro
+1	build/src/base/reporter.bif.bro
+1	build/src/base/event.bif.bro
 1	scripts/base/frameworks/logging/__load__.bro
 2	scripts/base/frameworks/logging/./main.bro
-3	build/src/logging.bif.bro
+3	build/src/base/logging.bif.bro
 2	scripts/base/frameworks/logging/./writers/ascii.bro
 0	scripts/policy/misc/loaded-scripts.bro
diff --git a/testing/btest/Baseline/policy.misc.default-loaded-scripts/canonified_loaded_scripts.log b/testing/btest/Baseline/policy.misc.default-loaded-scripts/canonified_loaded_scripts.log
index 73ef868313..4a5f570e81 100644
--- a/testing/btest/Baseline/policy.misc.default-loaded-scripts/canonified_loaded_scripts.log
+++ b/testing/btest/Baseline/policy.misc.default-loaded-scripts/canonified_loaded_scripts.log
@@ -1,14 +1,14 @@
 # depth	name
 0	scripts/base/init-bare.bro
-1	build/src/const.bif.bro
-1	build/src/types.bif.bro
-1	build/src/strings.bif.bro
-1	build/src/bro.bif.bro
-1	build/src/reporter.bif.bro
-1	build/src/event.bif.bro
+1	build/src/base/const.bif.bro
+1	build/src/base/types.bif.bro
+1	build/src/base/strings.bif.bro
+1	build/src/base/bro.bif.bro
+1	build/src/base/reporter.bif.bro
+1	build/src/base/event.bif.bro
 1	scripts/base/frameworks/logging/__load__.bro
 2	scripts/base/frameworks/logging/./main.bro
-3	build/src/logging.bif.bro
+3	build/src/base/logging.bif.bro
 2	scripts/base/frameworks/logging/./writers/ascii.bro
 0	scripts/base/init-default.bro
 1	scripts/base/utils/site.bro
@@ -41,6 +41,7 @@
 1	scripts/base/frameworks/metrics/__load__.bro
 2	scripts/base/frameworks/metrics/./main.bro
 1	scripts/base/frameworks/communication/__load__.bro
+2	scripts/base/frameworks/communication/./main.bro
 1	scripts/base/frameworks/control/__load__.bro
 2	scripts/base/frameworks/control/./main.bro
 1	scripts/base/frameworks/cluster/__load__.bro
@@ -69,6 +70,8 @@
 2	scripts/base/protocols/irc/./dcc-send.bro
 1	scripts/base/protocols/smtp/__load__.bro
 2	scripts/base/protocols/smtp/./main.bro
+2	scripts/base/protocols/smtp/./entities.bro
+2	scripts/base/protocols/smtp/./entities-excerpt.bro
 1	scripts/base/protocols/ssh/__load__.bro
 2	scripts/base/protocols/ssh/./main.bro
 1	scripts/base/protocols/ssl/__load__.bro
diff --git a/testing/btest/policy/misc/test-all-default-coverage.bro b/testing/btest/policy/misc/test-all-policy-coverage.bro
similarity index 100%
rename from testing/btest/policy/misc/test-all-default-coverage.bro
rename to testing/btest/policy/misc/test-all-policy-coverage.bro