diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp
--- a/src/test/getarg_tests.cpp
+++ b/src/test/getarg_tests.cpp
@@ -22,7 +22,7 @@
     void
     SetupArgs(const std::vector<std::pair<std::string, unsigned int>> &args);
     void ResetArgs(const std::string &strArg);
-    ArgsManager m_args;
+    ArgsManager m_local_args;
 };
 } // namespace getarg_tests
 
@@ -44,14 +44,16 @@
     }
 
     std::string error;
-    BOOST_CHECK(m_args.ParseParameters(vecChar.size(), vecChar.data(), error));
+    BOOST_CHECK(
+        m_local_args.ParseParameters(vecChar.size(), vecChar.data(), error));
 }
 
 void LocalTestingSetup::SetupArgs(
     const std::vector<std::pair<std::string, unsigned int>> &args) {
-    m_args.ClearArgs();
+    m_local_args.ClearArgs();
     for (const auto &arg : args) {
-        m_args.AddArg(arg.first, "", arg.second, OptionsCategory::OPTIONS);
+        m_local_args.AddArg(arg.first, "", arg.second,
+                            OptionsCategory::OPTIONS);
     }
 }
 
@@ -59,55 +61,55 @@
     const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_ANY);
     SetupArgs({foo});
     ResetArgs("-foo");
-    BOOST_CHECK(m_args.GetBoolArg("-foo", false));
-    BOOST_CHECK(m_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", true));
 
-    BOOST_CHECK(!m_args.GetBoolArg("-fo", false));
-    BOOST_CHECK(m_args.GetBoolArg("-fo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-fo", false));
+    BOOST_CHECK(m_local_args.GetBoolArg("-fo", true));
 
-    BOOST_CHECK(!m_args.GetBoolArg("-fooo", false));
-    BOOST_CHECK(m_args.GetBoolArg("-fooo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-fooo", false));
+    BOOST_CHECK(m_local_args.GetBoolArg("-fooo", true));
 
     ResetArgs("-foo=0");
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", false));
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", true));
 
     ResetArgs("-foo=1");
-    BOOST_CHECK(m_args.GetBoolArg("-foo", false));
-    BOOST_CHECK(m_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", true));
 
     // New 0.6 feature: auto-map -nosomething to !-something:
     ResetArgs("-nofoo");
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", false));
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", true));
 
     ResetArgs("-nofoo=1");
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", false));
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", true));
 
     // -nofoo should win
     ResetArgs("-foo -nofoo");
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", false));
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", true));
 
     // -nofoo should win
     ResetArgs("-foo=1 -nofoo=1");
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", false));
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", true));
 
     // -nofoo=0 should win
     ResetArgs("-foo=0 -nofoo=0");
-    BOOST_CHECK(m_args.GetBoolArg("-foo", false));
-    BOOST_CHECK(m_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", true));
 
     // New 0.6 feature: treat -- same as -:
     ResetArgs("--foo=1");
-    BOOST_CHECK(m_args.GetBoolArg("-foo", false));
-    BOOST_CHECK(m_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", true));
 
     ResetArgs("--nofoo=1");
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", false));
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", true));
 }
 
 BOOST_AUTO_TEST_CASE(stringarg) {
@@ -115,24 +117,24 @@
     const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_ANY);
     SetupArgs({foo, bar});
     ResetArgs("");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", ""), "");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", "eleven"), "eleven");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", ""), "");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", "eleven"), "eleven");
 
     ResetArgs("-foo -bar");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", ""), "");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", "eleven"), "");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", ""), "");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", "eleven"), "");
 
     ResetArgs("-foo=");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", ""), "");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", "eleven"), "");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", ""), "");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", "eleven"), "");
 
     ResetArgs("-foo=11");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", ""), "11");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", "eleven"), "11");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", ""), "11");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", "eleven"), "11");
 
     ResetArgs("-foo=eleven");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", ""), "eleven");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", "eleven"), "eleven");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", ""), "eleven");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", "eleven"), "eleven");
 }
 
 BOOST_AUTO_TEST_CASE(intarg) {
@@ -140,20 +142,20 @@
     const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_ANY);
     SetupArgs({foo, bar});
     ResetArgs("");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", 11), 11);
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", 0), 0);
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", 11), 11);
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", 0), 0);
 
     ResetArgs("-foo -bar");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", 11), 0);
-    BOOST_CHECK_EQUAL(m_args.GetArg("-bar", 11), 0);
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", 11), 0);
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-bar", 11), 0);
 
     ResetArgs("-foo=11 -bar=12");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", 0), 11);
-    BOOST_CHECK_EQUAL(m_args.GetArg("-bar", 11), 12);
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", 0), 11);
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-bar", 11), 12);
 
     ResetArgs("-foo=NaN -bar=NotANumber");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", 1), 0);
-    BOOST_CHECK_EQUAL(m_args.GetArg("-bar", 11), 0);
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", 1), 0);
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-bar", 11), 0);
 }
 
 BOOST_AUTO_TEST_CASE(doubledash) {
@@ -161,11 +163,11 @@
     const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_ANY);
     SetupArgs({foo, bar});
     ResetArgs("--foo");
-    BOOST_CHECK_EQUAL(m_args.GetBoolArg("-foo", false), true);
+    BOOST_CHECK_EQUAL(m_local_args.GetBoolArg("-foo", false), true);
 
     ResetArgs("--foo=verbose --bar=1");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-foo", ""), "verbose");
-    BOOST_CHECK_EQUAL(m_args.GetArg("-bar", 0), 1);
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-foo", ""), "verbose");
+    BOOST_CHECK_EQUAL(m_local_args.GetArg("-bar", 0), 1);
 }
 
 BOOST_AUTO_TEST_CASE(boolargno) {
@@ -173,26 +175,26 @@
     const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_ANY);
     SetupArgs({foo, bar});
     ResetArgs("-nofoo");
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", true));
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", false));
 
     ResetArgs("-nofoo=1");
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", true));
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", false));
 
     ResetArgs("-nofoo=0");
-    BOOST_CHECK(m_args.GetBoolArg("-foo", true));
-    BOOST_CHECK(m_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", false));
 
     // --nofoo should win
     ResetArgs("-foo --nofoo");
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", true));
-    BOOST_CHECK(!m_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(!m_local_args.GetBoolArg("-foo", false));
 
     // foo always wins:
     ResetArgs("-nofoo -foo");
-    BOOST_CHECK(m_args.GetBoolArg("-foo", true));
-    BOOST_CHECK(m_args.GetBoolArg("-foo", false));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", true));
+    BOOST_CHECK(m_local_args.GetBoolArg("-foo", false));
 }
 
 BOOST_AUTO_TEST_CASE(logargs) {
@@ -213,7 +215,7 @@
         [&str](const std::string &s) { str += s; });
 
     // Log the arguments
-    m_args.LogArgs();
+    m_local_args.LogArgs();
 
     LogInstance().DeleteCallback(print_connection);
     // Check that what should appear does, and what shouldn't doesn't.