diff --git a/.gitignore b/.gitignore
index 367c42837..fa2fd8f26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ libstuff/libstuff.d
 libstuff/libstuff.h.gch
 .idea
 .clangd
+.clang-tidy
 .nfs*
 .cache
 compile_commands.json
diff --git a/BedrockServer.cpp b/BedrockServer.cpp
index 459f62f9d..95612c2ff 100644
--- a/BedrockServer.cpp
+++ b/BedrockServer.cpp
@@ -2,6 +2,7 @@
 #include "BedrockServer.h"
 
 #include <arpa/inet.h>
+#include <csignal>
 #include <cstring>
 #include <fstream>
 #include <sys/resource.h>
@@ -217,7 +218,7 @@ void BedrockServer::sync()
             _syncNode->beginShutdown();
 
             // This will cause us to skip the next `poll` iteration which avoids a 1 second wait.
-            _notifyDone.push(true);
+            _notifyDoneSync.push(true);
         }
 
         // The fd_map contains a list of all file descriptors (eg, sockets, Unix pipes) that poll will wait on for
@@ -225,7 +226,7 @@ void BedrockServer::sync()
         fd_map fdm;
 
         // Pre-process any sockets the sync node is managing (i.e., communication with peer nodes).
-        _notifyDone.prePoll(fdm);
+        _notifyDoneSync.prePoll(fdm);
         _syncNode->prePoll(fdm);
 
         // Add our command queues to our fd_map.
@@ -236,6 +237,9 @@ void BedrockServer::sync()
         {
             AutoTimerTime pollTime(pollTimer);
             S_poll(fdm, max(nextActivity, now) - now);
+            if (SCheckSignal(SIGTERM)) {
+                _notifyDone.push(true);
+            }
         }
 
         // And set our next timeout for 1 second from now.
@@ -251,7 +255,7 @@ void BedrockServer::sync()
             AutoTimerTime postPollTime(postPollTimer);
             _syncNode->postPoll(fdm, nextActivity);
             _syncNodeQueuedCommands.postPoll(fdm);
-            _notifyDone.postPoll(fdm);
+            _notifyDoneSync.postPoll(fdm);
         }
 
         // Ok, let the sync node to it's updating for as many iterations as it requires. We'll update the replication
@@ -350,6 +354,9 @@ void BedrockServer::sync()
                 committingCommand = true;
                 _syncNode->startCommit(SQLiteNode::QUORUM);
                 _lastQuorumCommandTime = STimeNow();
+                
+                // This interrupts the next poll loop immediately. This prevents a 1-second wait when running as a single server.
+                _notifyDoneSync.push(true);
                 SDEBUG("Finished sending distributed transaction for db upgrade.");
 
                 // As it's a quorum commit, we'll need to read from peers. Let's start the next loop iteration.
@@ -378,6 +385,7 @@ void BedrockServer::sync()
                     _upgradeInProgress = false;
                     _upgradeCompleted = true;
                     SINFO("UpgradeDB succeeded, done.");
+                    _notifyDone.push(true);
                 } else {
                     SINFO("UpgradeDB failed, trying again.");
                 }
@@ -1224,6 +1232,9 @@ BedrockServer::BedrockServer(const SData& args_)
 {
     _version = VERSION;
 
+    // This allows the signal thread to notify us when a signal is received to interrupt the current poll loop.
+    SSIGNAL_NOTIFY_INTERRUPT = &_notifyDoneSync;
+
     // Enable the requested plugins, and update our version string if required.
     list<string> pluginNameList = SParseList(args["-plugins"]);
     SINFO("Loading plugins: " << args["-plugins"]);
diff --git a/BedrockServer.h b/BedrockServer.h
index 13ff40ba6..4a6175d27 100644
--- a/BedrockServer.h
+++ b/BedrockServer.h
@@ -467,9 +467,9 @@ class BedrockServer : public SQLiteServer {
     // We call this method whenever a node changes state
     void notifyStateChangeToPlugins(SQLite& db, SQLiteNodeState newState) override;
 
-    // This is just here to allow `poll` in main.cpp to get interrupted when the server shuts down.
-    // to wait up to a full second for them.
+    // These are just here to allow `poll` in main.cpp to get interrupted when the server shuts down.
     SSynchronizedQueue<bool> _notifyDone;
+    SSynchronizedQueue<bool> _notifyDoneSync;
 
     atomic<size_t> _maxSocketThreads{3'000};
     atomic<size_t> _dbPoolSize{25'000};
diff --git a/libstuff/SSignal.cpp b/libstuff/SSignal.cpp
index e6c246f7d..6b8ac7f2f 100644
--- a/libstuff/SSignal.cpp
+++ b/libstuff/SSignal.cpp
@@ -1,4 +1,5 @@
 #include "libstuff.h"
+#include "SSynchronizedQueue.h"
 #include <sqlitecluster/SQLiteNode.h>
 #include <cxxabi.h>
 #include <execinfo.h>
@@ -17,6 +18,8 @@ void SSetSignalHandlerDieFunc(function<void()>&& func) {
 constexpr auto sigStackSize{1024*64};
 char __SIGSTACK[sigStackSize];
 
+void* SSIGNAL_NOTIFY_INTERRUPT;
+
 // The function to call in our thread that handles signals.
 void _SSignal_signalHandlerThreadFunc();
 
@@ -163,6 +166,10 @@ void _SSignal_signalHandlerThreadFunc() {
                 _SSignal_pendingSignalBitMask.fetch_or(1 << signum);
             }
         }
+
+        if (SSIGNAL_NOTIFY_INTERRUPT) {
+            static_cast<SSynchronizedQueue<bool>*>(SSIGNAL_NOTIFY_INTERRUPT)->push(true);
+        }
     }
 }
 
diff --git a/libstuff/SSynchronizedQueue.h b/libstuff/SSynchronizedQueue.h
index 06951ce21..71bfd9b5d 100644
--- a/libstuff/SSynchronizedQueue.h
+++ b/libstuff/SSynchronizedQueue.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <libstuff/libstuff.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/libstuff/libstuff.h b/libstuff/libstuff.h
index 140880c95..976ed0ad8 100644
--- a/libstuff/libstuff.h
+++ b/libstuff/libstuff.h
@@ -31,6 +31,8 @@ using namespace std;
 // Global indicating whether we're running the server on dev or production.
 extern atomic<bool> GLOBAL_IS_LIVE;
 
+extern void* SSIGNAL_NOTIFY_INTERRUPT;
+
 // Initialize libstuff on every thread before calling any of its functions
 void SInitialize(string threadName = "", const char* processName = 0);
 
diff --git a/test/lib/BedrockTester.cpp b/test/lib/BedrockTester.cpp
index 6b6f66a25..c112f69a1 100644
--- a/test/lib/BedrockTester.cpp
+++ b/test/lib/BedrockTester.cpp
@@ -273,7 +273,7 @@ string BedrockTester::startServer(bool wait) {
                 return result[0].content;
             }
             // This will happen if the server's not up yet. We'll just try again.
-            usleep(100000); // 0.1 seconds.
+            usleep(50'000); // 0.05 seconds.
             continue;
         }
     }
@@ -293,7 +293,7 @@ string BedrockTester::executeWaitVerifyContent(SData request, const string& expe
     uint64_t start = STimeNow();
     vector<SData> results;
     do {
-        results = executeWaitMultipleData({request}, 1, control);
+        results = BedrockTester::executeWaitMultipleData({request}, 1, control);
 
         if (results.size() > 0 && SStartsWith(results[0].methodLine, expectedResult)) {
             // good, got the result we wanted
@@ -608,7 +608,7 @@ bool BedrockTester::waitForStatusTerm(const string& term, const string& testValu
     uint64_t start = STimeNow();
     while (STimeNow() < start + timeoutUS) {
         try {
-            string result = SParseJSONObject(executeWaitVerifyContent(SData("Status"), "200", true))[term];
+            string result = SParseJSONObject(BedrockTester::executeWaitVerifyContent(SData("Status"), "200", true))[term];
 
             // if the value matches, return, otherwise wait
             if (result == testValue) {
diff --git a/test/lib/BedrockTester.h b/test/lib/BedrockTester.h
index 6e694b795..9fb31f111 100644
--- a/test/lib/BedrockTester.h
+++ b/test/lib/BedrockTester.h
@@ -36,7 +36,7 @@ class BedrockTester {
                   atomic<uint64_t>* alternateCounter = nullptr);
 
     // Destructor.
-    ~BedrockTester();
+    virtual ~BedrockTester();
 
     // Start the server. If `wait` is specified, wait until the server is fully up with the command port open and
     // accepting requests. Otherwise, returns as soon as the control port is open and can return `Status`.
@@ -65,17 +65,17 @@ class BedrockTester {
     // Takes a list of requests, and returns a corresponding list of responses.
     // Uses `connections` parallel connections to the server to send the requests.
     // If `control` is set, sends the message to the control port.
-    vector<SData> executeWaitMultipleData(vector<SData> requests, int connections = 10, bool control = false, bool returnOnDisconnect = false, int* errorCode = nullptr);
+    virtual vector<SData> executeWaitMultipleData(vector<SData> requests, int connections = 10, bool control = false, bool returnOnDisconnect = false, int* errorCode = nullptr);
 
     // Sends a single request, returning the response content.
     // If the response method line doesn't begin with the expected result, throws.
     // Convenience wrapper around executeWaitMultipleData.
-    string executeWaitVerifyContent(SData request, const string& expectedResult = "200 OK", bool control = false, uint64_t retryTimeoutUS = 0);
+    virtual string executeWaitVerifyContent(SData request, const string& expectedResult = "200 OK", bool control = false, uint64_t retryTimeoutUS = 0);
 
     // Sends a single request, returning the response content as a STable.
     // If the response method line doesn't begin with the expected result, throws.
     // Convenience wrapper around executeWaitMultipleData.
-    STable executeWaitVerifyContentTable(SData request, const string& expectedResult = "200 OK");
+    virtual STable executeWaitVerifyContentTable(SData request, const string& expectedResult = "200 OK");
 
     // Read from the DB file, without going through the bedrock server. Two interfaces are provided to maintain
     // compatibility with the `SQLite` class.