diff --git a/testing/btest/Baseline/core.load-unload/output b/testing/btest/Baseline/core.load-unload/output
index 5bda7e456e..e69de29bb2 100644
--- a/testing/btest/Baseline/core.load-unload/output
+++ b/testing/btest/Baseline/core.load-unload/output
@@ -1,12 +0,0 @@
-loading /Users/jsiwek/tmp/bro/policy/bro.init
-   loading /Users/jsiwek/tmp/bro/build/src/const.bif.bro
-   loading /Users/jsiwek/tmp/bro/build/src/types.bif.bro
-   loading /Users/jsiwek/tmp/bro/build/src/strings.bif.bro
-   loading /Users/jsiwek/tmp/bro/build/src/bro.bif.bro
-   loading /Users/jsiwek/tmp/bro/policy/logging.bro
-      loading /Users/jsiwek/tmp/bro/build/src/logging.bif.bro
-   loading /Users/jsiwek/tmp/bro/policy/logging-ascii.bro
-   loading /Users/jsiwek/tmp/bro/build/src/event.bif.bro
-   loading /Users/jsiwek/tmp/bro/policy/pcap.bro
-   loading /Users/jsiwek/tmp/bro/policy/server-ports.bro
-loading /Users/jsiwek/tmp/bro/testing/btest/.tmp/core.load-unload/load-unload.bro
diff --git a/testing/btest/Baseline/policy.frameworks.logging.rotate-custom/out b/testing/btest/Baseline/policy.frameworks.logging.rotate-custom/out
index c87445cff5..24601e4ed9 100644
--- a/testing/btest/Baseline/policy.frameworks.logging.rotate-custom/out
+++ b/testing/btest/Baseline/policy.frameworks.logging.rotate-custom/out
@@ -1,32 +1,32 @@
-2nd test2-11-03-07_03.00.05.log test2.log 11-03-07_03.00.05 11-03-07_03.59.55 0
 1st test-11-03-07_03.00.05.log test.log 11-03-07_03.00.05 11-03-07_04.00.05 0
+1st test-11-03-07_04.00.05.log test.log 11-03-07_04.00.05 11-03-07_05.00.05 0
+1st test-11-03-07_05.00.05.log test.log 11-03-07_05.00.05 11-03-07_06.00.05 0
+1st test-11-03-07_06.00.05.log test.log 11-03-07_06.00.05 11-03-07_07.00.05 0
+1st test-11-03-07_07.00.05.log test.log 11-03-07_07.00.05 11-03-07_08.00.05 0
+1st test-11-03-07_08.00.05.log test.log 11-03-07_08.00.05 11-03-07_09.00.05 0
+1st test-11-03-07_09.00.05.log test.log 11-03-07_09.00.05 11-03-07_10.00.05 0
+1st test-11-03-07_10.00.05.log test.log 11-03-07_10.00.05 11-03-07_11.00.05 0
+1st test-11-03-07_11.00.05.log test.log 11-03-07_11.00.05 11-03-07_12.00.05 0
+1st test-11-03-07_12.00.05.log test.log 11-03-07_12.00.05 11-03-07_12.59.55 1
+2nd test2-11-03-07_03.00.05.log test2.log 11-03-07_03.00.05 11-03-07_03.59.55 0
 2nd test2-11-03-07_03.59.55.log test2.log 11-03-07_03.59.55 11-03-07_04.00.05 0
 2nd test2-11-03-07_04.00.05.log test2.log 11-03-07_04.00.05 11-03-07_04.59.55 0
-1st test-11-03-07_04.00.05.log test.log 11-03-07_04.00.05 11-03-07_05.00.05 0
 2nd test2-11-03-07_04.59.55.log test2.log 11-03-07_04.59.55 11-03-07_05.00.05 0
 2nd test2-11-03-07_05.00.05.log test2.log 11-03-07_05.00.05 11-03-07_05.59.55 0
-1st test-11-03-07_05.00.05.log test.log 11-03-07_05.00.05 11-03-07_06.00.05 0
 2nd test2-11-03-07_05.59.55.log test2.log 11-03-07_05.59.55 11-03-07_06.00.05 0
 2nd test2-11-03-07_06.00.05.log test2.log 11-03-07_06.00.05 11-03-07_06.59.55 0
-1st test-11-03-07_06.00.05.log test.log 11-03-07_06.00.05 11-03-07_07.00.05 0
 2nd test2-11-03-07_06.59.55.log test2.log 11-03-07_06.59.55 11-03-07_07.00.05 0
 2nd test2-11-03-07_07.00.05.log test2.log 11-03-07_07.00.05 11-03-07_07.59.55 0
-1st test-11-03-07_07.00.05.log test.log 11-03-07_07.00.05 11-03-07_08.00.05 0
 2nd test2-11-03-07_07.59.55.log test2.log 11-03-07_07.59.55 11-03-07_08.00.05 0
 2nd test2-11-03-07_08.00.05.log test2.log 11-03-07_08.00.05 11-03-07_08.59.55 0
-1st test-11-03-07_08.00.05.log test.log 11-03-07_08.00.05 11-03-07_09.00.05 0
 2nd test2-11-03-07_08.59.55.log test2.log 11-03-07_08.59.55 11-03-07_09.00.05 0
 2nd test2-11-03-07_09.00.05.log test2.log 11-03-07_09.00.05 11-03-07_09.59.55 0
-1st test-11-03-07_09.00.05.log test.log 11-03-07_09.00.05 11-03-07_10.00.05 0
 2nd test2-11-03-07_09.59.55.log test2.log 11-03-07_09.59.55 11-03-07_10.00.05 0
 2nd test2-11-03-07_10.00.05.log test2.log 11-03-07_10.00.05 11-03-07_10.59.55 0
-1st test-11-03-07_10.00.05.log test.log 11-03-07_10.00.05 11-03-07_11.00.05 0
 2nd test2-11-03-07_10.59.55.log test2.log 11-03-07_10.59.55 11-03-07_11.00.05 0
 2nd test2-11-03-07_11.00.05.log test2.log 11-03-07_11.00.05 11-03-07_11.59.55 0
-1st test-11-03-07_11.00.05.log test.log 11-03-07_11.00.05 11-03-07_12.00.05 0
 2nd test2-11-03-07_11.59.55.log test2.log 11-03-07_11.59.55 11-03-07_12.00.05 0
 2nd test2-11-03-07_12.00.05.log test2.log 11-03-07_12.00.05 11-03-07_12.59.55 0
-1st test-11-03-07_12.00.05.log test.log 11-03-07_12.00.05 11-03-07_12.59.55 1
 2nd test2-11-03-07_12.59.55.log test2.log 11-03-07_12.59.55 11-03-07_12.59.55 1
 # t	id.orig_h	id.orig_p	id.resp_h	id.resp_p
 1299466805.0	10.0.0.1	20	10.0.0.2	1024
diff --git a/testing/btest/core/load-unload.bro b/testing/btest/core/load-unload.bro
index 701e415134..1cf637704c 100644
--- a/testing/btest/core/load-unload.bro
+++ b/testing/btest/core/load-unload.bro
@@ -1,7 +1,7 @@
 # This tests the @unload directive
 #
-# @TEST-EXEC: echo 'print "oops";' >dontloadmebro.bro
-# @TEST-EXEC: bro -l %INPUT dontloadmebro >output 2>&1
-# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output
+# @TEST-EXEC: echo 'print "oops12345";' >dontloadmebro.bro
+# @TEST-EXEC: bro -l %INPUT dontloadmebro >output
+# @TEST-EXEC: btest-diff output
 
 @unload dontloadmebro
diff --git a/testing/btest/core/print-bpf-filters-ipv4.bro b/testing/btest/core/print-bpf-filters-ipv4.bro
index e709332aee..acfeebe21e 100644
--- a/testing/btest/core/print-bpf-filters-ipv4.bro
+++ b/testing/btest/core/print-bpf-filters-ipv4.bro
@@ -1,12 +1,12 @@
 # @TEST-REQUIRES: bro -e 'print bro_has_ipv6()' | grep -q F
 #
 # @TEST-EXEC: bro -e '' >output
-# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: cat packet_filter.log >>output
 # @TEST-EXEC: bro PacketFilter::all_packets=F ssh >>output
-# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: cat packet_filter.log >>output
 # @TEST-EXEC: bro -f "port 42" -e '' >>output
-# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: cat packet_filter.log >>output
 # @TEST-EXEC: bro -C -f "port 56730" -r $TRACES/mixed-vlan-mpls.trace conn >>output
-# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: cat packet_filter.log >>output
 # @TEST-EXEC: btest-diff output
 # @TEST-EXEC: btest-diff conn.log
diff --git a/testing/btest/core/print-bpf-filters-ipv6.bro b/testing/btest/core/print-bpf-filters-ipv6.bro
index f034085411..c4378f8ec6 100644
--- a/testing/btest/core/print-bpf-filters-ipv6.bro
+++ b/testing/btest/core/print-bpf-filters-ipv6.bro
@@ -1,12 +1,12 @@
 # @TEST-REQUIRES: bro -e 'print bro_has_ipv6()' | grep -q T
 #
 # @TEST-EXEC: bro -e '' >output
-# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: cat packet_filter.log >>output
 # @TEST-EXEC: bro PacketFilter::all_packets=F ssh >>output
-# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: cat packet_filter.log >>output
 # @TEST-EXEC: bro -f "port 42" -e '' >>output
-# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: cat packet_filter.log >>output
 # @TEST-EXEC: bro -C -f "port 56730" -r $TRACES/mixed-vlan-mpls.trace conn >>output
-# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: cat packet_filter.log >>output
 # @TEST-EXEC: btest-diff output
 # @TEST-EXEC: btest-diff conn.log
diff --git a/testing/btest/policy/frameworks/logging/rotate-custom.bro b/testing/btest/policy/frameworks/logging/rotate-custom.bro
index a22eaf05a7..2781a8f59e 100644
--- a/testing/btest/policy/frameworks/logging/rotate-custom.bro
+++ b/testing/btest/policy/frameworks/logging/rotate-custom.bro
@@ -1,5 +1,5 @@
 #
-# @TEST-EXEC: bro -r %DIR/rotation.trace %INPUT | egrep "test|test2" >out
+# @TEST-EXEC: bro -r %DIR/rotation.trace %INPUT | egrep "test|test2" | sort >out
 # @TEST-EXEC: for i in `ls test*.log | sort`; do printf '> %s\n' $i; cat $i; done | sort | uniq >>out
 # @TEST-EXEC: btest-diff out
 
diff --git a/testing/btest/policy/protocols/conn/known-hosts.bro b/testing/btest/policy/protocols/conn/known-hosts.bro
index a41a0d5864..668887cb3c 100644
--- a/testing/btest/policy/protocols/conn/known-hosts.bro
+++ b/testing/btest/policy/protocols/conn/known-hosts.bro
@@ -1,20 +1,21 @@
 # A basic test of the known-hosts script's logging and asset_tracking options
 
 # @TEST-EXEC: bro -r $TRACES/wikipedia.trace %INPUT KnownHosts::asset_tracking=LOCAL_HOSTS
-# @TEST-EXEC: mv knownhosts.log knownhosts-local.log
+# @TEST-EXEC: mv known_hosts.log knownhosts-local.log
 # @TEST-EXEC: btest-diff knownhosts-local.log
 
 # @TEST-EXEC: bro -r $TRACES/wikipedia.trace %INPUT KnownHosts::asset_tracking=REMOTE_HOSTS
-# @TEST-EXEC: mv knownhosts.log knownhosts-remote.log
+# @TEST-EXEC: mv known_hosts.log knownhosts-remote.log
 # @TEST-EXEC: btest-diff knownhosts-remote.log
 
 # @TEST-EXEC: bro -r $TRACES/wikipedia.trace %INPUT KnownHosts::asset_tracking=ALL_HOSTS
-# @TEST-EXEC: mv knownhosts.log knownhosts-all.log
+# @TEST-EXEC: mv known_hosts.log knownhosts-all.log
 # @TEST-EXEC: btest-diff knownhosts-all.log
 
 # @TEST-EXEC: bro -r $TRACES/wikipedia.trace %INPUT KnownHosts::asset_tracking=NO_HOSTS
-# @TEST-EXEC: test '!' -e knownhosts.log
+# @TEST-EXEC: test '!' -e known_hosts.log
 
 @load conn/known-hosts
+@load site
 
-redef local_nets += {141.142.0.0/16};
+redef Site::local_nets += {141.142.0.0/16};
diff --git a/testing/btest/policy/protocols/conn/known-services.bro b/testing/btest/policy/protocols/conn/known-services.bro
index c619fdb801..b7f968a793 100644
--- a/testing/btest/policy/protocols/conn/known-services.bro
+++ b/testing/btest/policy/protocols/conn/known-services.bro
@@ -1,23 +1,24 @@
 # A basic test of the known-services script's logging and asset_tracking options
 
 # @TEST-EXEC: bro -r $TRACES/var-services-std-ports.trace %INPUT KnownServices::asset_tracking=LOCAL_HOSTS
-# @TEST-EXEC: mv knownservices.log knownservices-local.log
+# @TEST-EXEC: mv known_services.log knownservices-local.log
 # @TEST-EXEC: btest-diff knownservices-local.log
 
 # @TEST-EXEC: bro -r $TRACES/var-services-std-ports.trace %INPUT KnownServices::asset_tracking=REMOTE_HOSTS
-# @TEST-EXEC: mv knownservices.log knownservices-remote.log
+# @TEST-EXEC: mv known_services.log knownservices-remote.log
 # @TEST-EXEC: btest-diff knownservices-remote.log
 
 # @TEST-EXEC: bro -r $TRACES/var-services-std-ports.trace %INPUT KnownServices::asset_tracking=ALL_HOSTS
-# @TEST-EXEC: mv knownservices.log knownservices-all.log
+# @TEST-EXEC: mv known_services.log knownservices-all.log
 # @TEST-EXEC: btest-diff knownservices-all.log
 
 # @TEST-EXEC: bro -r $TRACES/var-services-std-ports.trace %INPUT KnownServices::asset_tracking=NO_HOSTS
-# @TEST-EXEC: test '!' -e knownservices.log
+# @TEST-EXEC: test '!' -e known_services.log
 
 @load conn/known-services
 @load http
 @load ssh
 @load ftp
+@load site
 
-redef local_nets += {172.16.238.0/24};
+redef Site::local_nets += {172.16.238.0/24};