diff --git a/.gitignore b/.gitignore
index 4ceeefe9bc..9d8049e927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,6 +91,10 @@ compile_commands.json
 /scripts/*.graphml
 /scripts/*.json
 
+# tracy binaries
+/tracy-capture
+/tracy-gui
+
 # test output
 stellar-core-test-*
 test-partitions.*
diff --git a/docs/software/commands.md b/docs/software/commands.md
index 37a61ce114..ec392c2922 100644
--- a/docs/software/commands.md
+++ b/docs/software/commands.md
@@ -420,20 +420,6 @@ Most commands return their results in JSON format.
   `sorobaninfo?format=detailed` command to compare against the existing settings to see exactly
   what is changing.
 
-* **surveytopology**
-  `surveytopology?duration=DURATION&node=NODE_ID`<br>
-  **This command is deprecated and will be removed in a future release. Use the
-  new time sliced survey interface instead (`startsurveycollecting`,
-  `stopsurveycollecting`, `surveytopologytimesliced`, and `getsurveyresults`).**
-  Starts a survey that will request peer connectivity information from nodes
-  in the backlog. `DURATION` is the number of seconds this survey will run
-  for, and `NODE_ID` is the public key you will add to the backlog to survey.
-  Running this command while the survey is running will add the node to the
-  backlog and reset the timer to run for `DURATION` seconds.  See [Changing
-  default survey behavior](#changing-default-survey-behavior) for details about
-  the default survey behavior, as well as how to change that behavior or opt-out
-  entirely.
-
 * **stopsurvey**
   `stopsurvey`<br>
   Will stop the survey if one is running. Noop if no survey is running
diff --git a/lib/util/basen.h b/lib/util/basen.h
index 84bf7b1f2a..caec728f8e 100644
--- a/lib/util/basen.h
+++ b/lib/util/basen.h
@@ -1,5 +1,3 @@
-#pragma once
-
 /**
  * base-n, 1.0
  * Copyright (C) 2012 Andrzej Zawadzki (azawadzki@gmail.com)
diff --git a/src/Makefile.am b/src/Makefile.am
index eaa9684a05..8033899bc2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -435,7 +435,6 @@ else # !USE_POSTGRES
 TESTS=test/selftest-nopg
 endif # !USE_POSTGRES
 TESTS += test/check-nondet
-TESTS += test/check-sorobans
 
 format: always
 if USE_CLANG_FORMAT
diff --git a/src/test/check-nondet b/src/test/check-nondet
index 1b8e739144..8d8c1b3244 100755
--- a/src/test/check-nondet
+++ b/src/test/check-nondet
@@ -39,3 +39,10 @@ then
     echo "to calls to std::uniform_int_distribution, which varies between compilers."
     exit 1
 fi
+
+if git grep 'SecretKey::random' '**/test/*.h' '**/test/*.cpp'
+then
+    echo
+    echo "please use SecretKey::pseudoRandomForTesting() instead of SecretKey::random() in tests"
+    exit 1
+fi
diff --git a/src/test/selftest-nopg b/src/test/selftest-nopg
index ef297b0cdd..49de01438a 100755
--- a/src/test/selftest-nopg
+++ b/src/test/selftest-nopg
@@ -4,4 +4,5 @@
 # under the Apache License, Version 2.0. See the COPYING file at the root
 # of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-exec "${top_srcdir}/src/test/selftest-parallel" "${top_srcdir}/src/test/run-selftest-nopg"
+exec "${top_srcdir}/src/test/selftest-parallel" "${top_srcdir}/src/test/run-selftest-nopg" \
+    && exec "${top_srcdir}/src/test/check-sorobans"
diff --git a/src/test/selftest-pg b/src/test/selftest-pg
index c99a178cb4..44c7c5ddfe 100755
--- a/src/test/selftest-pg
+++ b/src/test/selftest-pg
@@ -4,4 +4,5 @@
 # under the Apache License, Version 2.0. See the COPYING file at the root
 # of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-exec "${top_srcdir}/src/test/selftest-parallel" "${top_srcdir}/src/test/run-selftest-pg"
+"${top_srcdir}/src/test/selftest-parallel" "${top_srcdir}/src/test/run-selftest-pg" \
+    && exec "${top_srcdir}/src/test/check-sorobans"