diff --git a/doc/scripts/DocSourcesList.cmake b/doc/scripts/DocSourcesList.cmake
index 476f4dbf22..8afe2b5545 100644
--- a/doc/scripts/DocSourcesList.cmake
+++ b/doc/scripts/DocSourcesList.cmake
@@ -37,6 +37,7 @@ rest_target(${psd} base/frameworks/file-analysis/main.bro)
 rest_target(${psd} base/frameworks/input/main.bro)
 rest_target(${psd} base/frameworks/input/readers/ascii.bro)
 rest_target(${psd} base/frameworks/input/readers/benchmark.bro)
+rest_target(${psd} base/frameworks/input/readers/binary.bro)
 rest_target(${psd} base/frameworks/input/readers/raw.bro)
 rest_target(${psd} base/frameworks/intel/cluster.bro)
 rest_target(${psd} base/frameworks/intel/input.bro)
@@ -74,21 +75,25 @@ rest_target(${psd} base/protocols/conn/main.bro)
 rest_target(${psd} base/protocols/conn/polling.bro)
 rest_target(${psd} base/protocols/dns/consts.bro)
 rest_target(${psd} base/protocols/dns/main.bro)
+rest_target(${psd} base/protocols/ftp/file-analysis.bro)
 rest_target(${psd} base/protocols/ftp/file-extract.bro)
 rest_target(${psd} base/protocols/ftp/gridftp.bro)
 rest_target(${psd} base/protocols/ftp/main.bro)
 rest_target(${psd} base/protocols/ftp/utils-commands.bro)
+rest_target(${psd} base/protocols/http/file-analysis.bro)
 rest_target(${psd} base/protocols/http/file-extract.bro)
 rest_target(${psd} base/protocols/http/file-hash.bro)
 rest_target(${psd} base/protocols/http/file-ident.bro)
 rest_target(${psd} base/protocols/http/main.bro)
 rest_target(${psd} base/protocols/http/utils.bro)
 rest_target(${psd} base/protocols/irc/dcc-send.bro)
+rest_target(${psd} base/protocols/irc/file-analysis.bro)
 rest_target(${psd} base/protocols/irc/main.bro)
 rest_target(${psd} base/protocols/modbus/consts.bro)
 rest_target(${psd} base/protocols/modbus/main.bro)
 rest_target(${psd} base/protocols/smtp/entities-excerpt.bro)
 rest_target(${psd} base/protocols/smtp/entities.bro)
+rest_target(${psd} base/protocols/smtp/file-analysis.bro)
 rest_target(${psd} base/protocols/smtp/main.bro)
 rest_target(${psd} base/protocols/socks/consts.bro)
 rest_target(${psd} base/protocols/socks/main.bro)
diff --git a/testing/btest/Baseline/core.when-interpreter-exceptions/bro..stdout b/testing/btest/Baseline/core.when-interpreter-exceptions/bro..stdout
index 49eafc365f..792954f9a0 100644
--- a/testing/btest/Baseline/core.when-interpreter-exceptions/bro..stdout
+++ b/testing/btest/Baseline/core.when-interpreter-exceptions/bro..stdout
@@ -1,6 +1,6 @@
-timeout g(), F
-timeout g(), T
 timeout
+timeout g(), T
+timeout g(), F
 g() done, no exception, T
 localhost resolved
 localhost resolved from f(), T
diff --git a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
index 018480850c..0c9f74db81 100644
--- a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
+++ b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
@@ -29,6 +29,7 @@ scripts/base/init-bare.bro
     scripts/base/frameworks/input/./readers/ascii.bro
     scripts/base/frameworks/input/./readers/raw.bro
     scripts/base/frameworks/input/./readers/benchmark.bro
+    scripts/base/frameworks/input/./readers/binary.bro
   scripts/base/frameworks/file-analysis/__load__.bro
     scripts/base/frameworks/file-analysis/./main.bro
       build/src/base/file_analysis.bif.bro
diff --git a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
index dc0ae1393e..a34ae7faa3 100644
--- a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
+++ b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
@@ -91,6 +91,7 @@ scripts/base/init-default.bro
   scripts/base/protocols/ftp/__load__.bro
     scripts/base/protocols/ftp/./utils-commands.bro
     scripts/base/protocols/ftp/./main.bro
+    scripts/base/protocols/ftp/./file-analysis.bro
     scripts/base/protocols/ftp/./file-extract.bro
     scripts/base/protocols/ftp/./gridftp.bro
       scripts/base/protocols/ssl/__load__.bro
@@ -100,12 +101,14 @@ scripts/base/init-default.bro
   scripts/base/protocols/http/__load__.bro
     scripts/base/protocols/http/./main.bro
     scripts/base/protocols/http/./utils.bro
+    scripts/base/protocols/http/./file-analysis.bro
     scripts/base/protocols/http/./file-ident.bro
     scripts/base/protocols/http/./file-hash.bro
     scripts/base/protocols/http/./file-extract.bro
   scripts/base/protocols/irc/__load__.bro
     scripts/base/protocols/irc/./main.bro
     scripts/base/protocols/irc/./dcc-send.bro
+    scripts/base/protocols/irc/./file-analysis.bro
   scripts/base/protocols/modbus/__load__.bro
     scripts/base/protocols/modbus/./consts.bro
     scripts/base/protocols/modbus/./main.bro
@@ -113,6 +116,7 @@ scripts/base/init-default.bro
     scripts/base/protocols/smtp/./main.bro
     scripts/base/protocols/smtp/./entities.bro
     scripts/base/protocols/smtp/./entities-excerpt.bro
+    scripts/base/protocols/smtp/./file-analysis.bro
   scripts/base/protocols/socks/__load__.bro
     scripts/base/protocols/socks/./consts.bro
     scripts/base/protocols/socks/./main.bro
diff --git a/testing/btest/core/when-interpreter-exceptions.bro b/testing/btest/core/when-interpreter-exceptions.bro
index b1880c5139..9b6f689dcf 100644
--- a/testing/btest/core/when-interpreter-exceptions.bro
+++ b/testing/btest/core/when-interpreter-exceptions.bro
@@ -1,6 +1,6 @@
 # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/rotation.trace %INPUT
 # @TEST-EXEC: btest-bg-wait -k 3
-# @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff bro/.stderr
+# @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps | $SCRIPTS/diff-sort" btest-diff bro/.stderr
 # @TEST-EXEC: btest-diff bro/.stdout
 
 # interpreter exceptions in "when" blocks shouldn't cause termination