diff --git a/include/CLI/impl/App_inl.hpp b/include/CLI/impl/App_inl.hpp
index ad0171daf..a4698a4dc 100644
--- a/include/CLI/impl/App_inl.hpp
+++ b/include/CLI/impl/App_inl.hpp
@@ -208,7 +208,7 @@ CLI11_INLINE Option *App::add_option(std::string option_name,
                 if(opt->snames_.empty()) {
                     continue;
                 }
-                for(const auto& osn : opt->snames_) {
+                for(const auto &osn : opt->snames_) {
                     if(osn.size() > 1) {
                         std::string test_name;
                         test_name.push_back(osn.front());
diff --git a/tests/BoostOptionTypeTest.cpp b/tests/BoostOptionTypeTest.cpp
index 5bf4cda24..3ee42679c 100644
--- a/tests/BoostOptionTypeTest.cpp
+++ b/tests/BoostOptionTypeTest.cpp
@@ -17,14 +17,13 @@
 #include <utility>
 #include <vector>
 
-
-using small_vector=boost::container::small_vector;
-using flat_set=boost::container::flat_set;
-using flat_map=boost::container::flat_map;
-using slist=boost::container::slist;
-using stable_vector=boost::container::stable_vector;
-using static_vector=boost::container::static_vector;
-using vector=boost::container::vector;
+using small_vector = boost::container::small_vector;
+using flat_set = boost::container::flat_set;
+using flat_map = boost::container::flat_map;
+using slist = boost::container::slist;
+using stable_vector = boost::container::stable_vector;
+using static_vector = boost::container::static_vector;
+using vector = boost::container::vector;
 
 TEMPLATE_TEST_CASE("Boost container single",
                    "[boost][optional]",
diff --git a/tests/ConfigFileTest.cpp b/tests/ConfigFileTest.cpp
index 54efba60d..948245966 100644
--- a/tests/ConfigFileTest.cpp
+++ b/tests/ConfigFileTest.cpp
@@ -7,11 +7,11 @@
 #include "app_helper.hpp"
 
 #include <cstdio>
-#include <sstream>
 #include <memory>
+#include <sstream>
+#include <string>
 #include <tuple>
 #include <vector>
-#include <string>
 
 TEST_CASE("StringBased: convert_arg_for_ini", "[config]") {
 
diff --git a/tests/FormatterTest.cpp b/tests/FormatterTest.cpp
index 819116320..2854a9a44 100644
--- a/tests/FormatterTest.cpp
+++ b/tests/FormatterTest.cpp
@@ -12,8 +12,8 @@
 
 #include "catch.hpp"
 #include <fstream>
-#include <string>
 #include <memory>
+#include <string>
 
 class SimpleFormatter : public CLI::FormatterBase {
   public:
diff --git a/tests/HelpTest.cpp b/tests/HelpTest.cpp
index fb4314e97..cf1998245 100644
--- a/tests/HelpTest.cpp
+++ b/tests/HelpTest.cpp
@@ -15,8 +15,8 @@
 #include "catch.hpp"
 #include <fstream>
 #include <set>
-#include <vector>
 #include <string>
+#include <vector>
 
 TEST_CASE("THelp: Basic", "[help]") {
     CLI::App app{"My prog"};
diff --git a/tests/NewParseTest.cpp b/tests/NewParseTest.cpp
index 656bb576f..c9934ba8a 100644
--- a/tests/NewParseTest.cpp
+++ b/tests/NewParseTest.cpp
@@ -8,8 +8,8 @@
 
 #include <complex>
 #include <cstdint>
-#include <utility>
 #include <string>
+#include <utility>
 #include <vector>
 
 using cx = std::complex<double>;
diff --git a/tests/OptionGroupTest.cpp b/tests/OptionGroupTest.cpp
index 11dc8353d..4cfececc1 100644
--- a/tests/OptionGroupTest.cpp
+++ b/tests/OptionGroupTest.cpp
@@ -7,8 +7,8 @@
 #include "app_helper.hpp"
 
 #include <memory>
-#include <vector>
 #include <string>
+#include <vector>
 
 using vs_t = std::vector<std::string>;
 
diff --git a/tests/OptionTypeTest.cpp b/tests/OptionTypeTest.cpp
index 6708b42fd..09dfa1d2f 100644
--- a/tests/OptionTypeTest.cpp
+++ b/tests/OptionTypeTest.cpp
@@ -16,17 +16,17 @@
 #include <cstdlib>
 #include <deque>
 #include <forward_list>
+#include <limits>
 #include <list>
 #include <map>
 #include <queue>
 #include <set>
+#include <string>
+#include <tuple>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <string>
-#include <tuple>
-#include <limits>
 
 using Catch::literals::operator"" _a;
 
diff --git a/tests/SetTest.cpp b/tests/SetTest.cpp
index 4f8fa42e2..379527164 100644
--- a/tests/SetTest.cpp
+++ b/tests/SetTest.cpp
@@ -7,10 +7,10 @@
 #include "app_helper.hpp"
 #include <map>
 #include <memory>
-#include <string>
 #include <set>
-#include <vector>
+#include <string>
 #include <utility>
+#include <vector>
 
 static_assert(CLI::is_shared_ptr<std::shared_ptr<int>>::value == true, "is_shared_ptr should work on shared pointers");
 static_assert(CLI::is_shared_ptr<int *>::value == false, "is_shared_ptr should work on pointers");
diff --git a/tests/SubcommandTest.cpp b/tests/SubcommandTest.cpp
index bec767920..4d38e4a5b 100644
--- a/tests/SubcommandTest.cpp
+++ b/tests/SubcommandTest.cpp
@@ -5,10 +5,10 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 #include "app_helper.hpp"
-#include <vector>
-#include <utility>
 #include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 using vs_t = std::vector<std::string>;
 
diff --git a/tests/TimerTest.cpp b/tests/TimerTest.cpp
index c5ab4af9e..10163756c 100644
--- a/tests/TimerTest.cpp
+++ b/tests/TimerTest.cpp
@@ -8,10 +8,10 @@
 
 #include "catch.hpp"
 #include <chrono>
+#include <iostream>
 #include <sstream>
 #include <string>
 #include <thread>
-#include <iostream>
 
 TEST_CASE("Timer: MSTimes", "[timer]") {
     CLI::Timer timer{"My Timer"};
diff --git a/tests/TransformTest.cpp b/tests/TransformTest.cpp
index b69fa3769..3a35128d6 100644
--- a/tests/TransformTest.cpp
+++ b/tests/TransformTest.cpp
@@ -11,13 +11,12 @@
 #include <array>
 #include <chrono>
 #include <cstdint>
-#include <unordered_map>
+#include <map>
+#include <memory>
 #include <string>
+#include <unordered_map>
 #include <utility>
-#include <map>
 #include <vector>
-#include <memory>
-
 
 #if defined(CLI11_CPP17)
 #if defined(__has_include)