diff --git a/src/helics/core/FilterFederate.cpp b/src/helics/core/FilterFederate.cpp
index 86fb359caf..75dd3eacd0 100644
--- a/src/helics/core/FilterFederate.cpp
+++ b/src/helics/core/FilterFederate.cpp
@@ -17,11 +17,11 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "queryHelpers.hpp"
 
 #include <cassert>
+#include <memory>
 #include <string>
 #include <tuple>
 #include <utility>
 #include <vector>
-#include <memory>
 
 namespace helics {
 
diff --git a/tests/helics/application_api/CallbackFederateTests.cpp b/tests/helics/application_api/CallbackFederateTests.cpp
index bd3b40cdc2..e692cfae52 100644
--- a/tests/helics/application_api/CallbackFederateTests.cpp
+++ b/tests/helics/application_api/CallbackFederateTests.cpp
@@ -17,11 +17,11 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <future>
 #include <gtest/gtest.h>
+#include <memory>
 #include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
-#include <memory>
 
 class callbackFed: public ::testing::Test, public FederateTestFixture {};
 
diff --git a/tests/helics/application_api/FederateTests.cpp b/tests/helics/application_api/FederateTests.cpp
index dc80b14ea5..9934fd4fee 100644
--- a/tests/helics/application_api/FederateTests.cpp
+++ b/tests/helics/application_api/FederateTests.cpp
@@ -20,9 +20,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gmock/gmock.h"
 #include <future>
 #include <gtest/gtest.h>
+#include <memory>
 #include <string>
 #include <thread>
-#include <memory>
 
 /** these test cases test out the value converters
  */
diff --git a/tests/helics/application_api/FilterTests.cpp b/tests/helics/application_api/FilterTests.cpp
index bb1ff740ce..0060d63ee9 100644
--- a/tests/helics/application_api/FilterTests.cpp
+++ b/tests/helics/application_api/FilterTests.cpp
@@ -22,11 +22,11 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <cstdio>
 #include <future>
 #include <gtest/gtest.h>
+#include <memory>
 #include <string>
 #include <thread>
 #include <utility>
 #include <vector>
-#include <memory>
 
 /** these test cases test out the message federates
  */
diff --git a/tests/helics/application_api/MessageFederateAdditionalTests.cpp b/tests/helics/application_api/MessageFederateAdditionalTests.cpp
index 4239f65ef2..576073a505 100644
--- a/tests/helics/application_api/MessageFederateAdditionalTests.cpp
+++ b/tests/helics/application_api/MessageFederateAdditionalTests.cpp
@@ -17,11 +17,11 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <thread>
 #include <utility>
 #include <vector>
-#include <memory>
 
 /** these test cases test out the message federates
  */
diff --git a/tests/helics/application_api/PrimaryTypeConversionTests.cpp b/tests/helics/application_api/PrimaryTypeConversionTests.cpp
index a5aa8e35d0..cdf26ec11b 100644
--- a/tests/helics/application_api/PrimaryTypeConversionTests.cpp
+++ b/tests/helics/application_api/PrimaryTypeConversionTests.cpp
@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <string>
 #include <vector>
 
-
 /** these test cases test out the value converters
  */
 #include "helics/application_api/HelicsPrimaryTypes.hpp"
diff --git a/tests/helics/application_api/TranslatorTests.cpp b/tests/helics/application_api/TranslatorTests.cpp
index 5cf5983ce0..58a5fce175 100644
--- a/tests/helics/application_api/TranslatorTests.cpp
+++ b/tests/helics/application_api/TranslatorTests.cpp
@@ -25,9 +25,9 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <future>
 #include <gtest/gtest.h>
-#include <thread>
-#include <string>
 #include <memory>
+#include <string>
+#include <thread>
 #include <utility>
 
 /** these test cases test out translator operations
diff --git a/tests/helics/application_api/ValueConverterTests.cpp b/tests/helics/application_api/ValueConverterTests.cpp
index fc98764be7..9197d925b0 100644
--- a/tests/helics/application_api/ValueConverterTests.cpp
+++ b/tests/helics/application_api/ValueConverterTests.cpp
@@ -8,10 +8,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <algorithm>
 #include <complex>
 #include <gtest/gtest.h>
+#include <limits>
 #include <list>
 #include <set>
 #include <string>
-#include <limits>
 #include <vector>
 
 /** these test cases test out the value converters
diff --git a/tests/helics/application_api/ValueFederateAdditionalTests.cpp b/tests/helics/application_api/ValueFederateAdditionalTests.cpp
index e908083fc6..3ef0e89235 100644
--- a/tests/helics/application_api/ValueFederateAdditionalTests.cpp
+++ b/tests/helics/application_api/ValueFederateAdditionalTests.cpp
@@ -18,11 +18,11 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <fstream>
 #include <future>
 #include <gtest/gtest.h>
+#include <memory>
 #include <numeric>
 #include <sstream>
 #include <string>
 #include <utility>
-#include <memory>
 #include <vector>
 
 /** these test cases test out the value federates with some additional tests
diff --git a/tests/helics/application_api/ValueFederateKeyTests.cpp b/tests/helics/application_api/ValueFederateKeyTests.cpp
index 463afce41a..4e5b293b92 100644
--- a/tests/helics/application_api/ValueFederateKeyTests.cpp
+++ b/tests/helics/application_api/ValueFederateKeyTests.cpp
@@ -23,9 +23,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #    include "testFixtures_shared.hpp"
 #endif
 #include <fstream>
+#include <memory>
 #include <streambuf>
 #include <string>
-#include <memory>
 #include <vector>
 
 /** these test cases test out the value federates
diff --git a/tests/helics/application_api/data_viewTests.cpp b/tests/helics/application_api/data_viewTests.cpp
index babcb1f25c..951e2d289e 100644
--- a/tests/helics/application_api/data_viewTests.cpp
+++ b/tests/helics/application_api/data_viewTests.cpp
@@ -10,10 +10,11 @@ SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "helics/application_api/data_view.hpp"
+
+#include <memory>
 #include <string>
-#include <vector>
 #include <utility>
-#include <memory>
+#include <vector>
 
 using namespace helics;
 
diff --git a/tests/helics/application_api/helicsTypeTests.cpp b/tests/helics/application_api/helicsTypeTests.cpp
index 6fe9e9eb07..2e9a799c5c 100644
--- a/tests/helics/application_api/helicsTypeTests.cpp
+++ b/tests/helics/application_api/helicsTypeTests.cpp
@@ -8,9 +8,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/common/JsonProcessingFunctions.hpp"
 
 #include <complex>
+#include <gtest/gtest.h>
 #include <string>
 #include <vector>
-#include <gtest/gtest.h>
 
 /** these test cases test out the value converters
  */
diff --git a/tests/helics/application_api/subPubObjectTests.cpp b/tests/helics/application_api/subPubObjectTests.cpp
index 4e2d029241..2e8d450f66 100644
--- a/tests/helics/application_api/subPubObjectTests.cpp
+++ b/tests/helics/application_api/subPubObjectTests.cpp
@@ -15,9 +15,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "units/units/units.hpp"
 
 #include <future>
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
 
 #define CORE_TYPE_TO_TEST helics::CoreType::TEST
 
diff --git a/tests/helics/application_api/testFixtures.cpp b/tests/helics/application_api/testFixtures.cpp
index f1d454e9d1..ad955a6424 100644
--- a/tests/helics/application_api/testFixtures.cpp
+++ b/tests/helics/application_api/testFixtures.cpp
@@ -12,9 +12,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <cctype>
 #include <cstdlib>
 #include <iostream>
+#include <memory>
 #include <spdlog/spdlog.h>
 #include <string>
-#include <memory>
 
 bool hasIndexCode(std::string_view type_name)
 {
diff --git a/tests/helics/application_api/zmqSSTests.cpp b/tests/helics/application_api/zmqSSTests.cpp
index 01703d59f4..cd8565a9a9 100644
--- a/tests/helics/application_api/zmqSSTests.cpp
+++ b/tests/helics/application_api/zmqSSTests.cpp
@@ -16,9 +16,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gtest/gtest.h"
 #include <future>
 #include <iostream>
-#include <thread>
 #include <memory>
 #include <string>
+#include <thread>
 #include <vector>
 
 using namespace std::literals::chrono_literals;
diff --git a/tests/helics/apps/BrokerAppTests.cpp b/tests/helics/apps/BrokerAppTests.cpp
index 6647e90312..cd1889a0a9 100644
--- a/tests/helics/apps/BrokerAppTests.cpp
+++ b/tests/helics/apps/BrokerAppTests.cpp
@@ -15,11 +15,11 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <cstdio>
 #include <filesystem>
 #include <future>
-#include <thread>
+#include <memory>
 #include <string>
+#include <thread>
 #include <utility>
 #include <vector>
-#include <memory>
 
 TEST(BrokerAppTests, constructor1)
 {
diff --git a/tests/helics/apps/BrokerServerTests.cpp b/tests/helics/apps/BrokerServerTests.cpp
index b0cf7d4101..46589cb86d 100644
--- a/tests/helics/apps/BrokerServerTests.cpp
+++ b/tests/helics/apps/BrokerServerTests.cpp
@@ -14,8 +14,8 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include "gtest/gtest.h"
 #include <cstdio>
-#include <thread>
 #include <string>
+#include <thread>
 #include <vector>
 
 using namespace helics;
diff --git a/tests/helics/apps/CloneTests.cpp b/tests/helics/apps/CloneTests.cpp
index a268bcfe14..7cffc95122 100644
--- a/tests/helics/apps/CloneTests.cpp
+++ b/tests/helics/apps/CloneTests.cpp
@@ -13,10 +13,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <cstdio>
 #include <filesystem>
 #include <future>
-#include <thread>
+#include <iostream>
 #include <string>
+#include <thread>
 #include <vector>
-#include <iostream>
 
 TEST(clone_tests, simple_clone_test_pub)
 {
diff --git a/tests/helics/apps/Connector2StageTests.cpp b/tests/helics/apps/Connector2StageTests.cpp
index b8b7dc327b..f443a33130 100644
--- a/tests/helics/apps/Connector2StageTests.cpp
+++ b/tests/helics/apps/Connector2StageTests.cpp
@@ -18,10 +18,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <algorithm>
 #include <atomic>
 #include <future>
-#include <thread>
+#include <memory>
 #include <string>
+#include <thread>
 #include <vector>
-#include <memory>
 
 static std::string newCoreName(std::string_view baseName)
 {
diff --git a/tests/helics/apps/ConnectorFileTests.cpp b/tests/helics/apps/ConnectorFileTests.cpp
index 58c904e343..8fd7410a31 100644
--- a/tests/helics/apps/ConnectorFileTests.cpp
+++ b/tests/helics/apps/ConnectorFileTests.cpp
@@ -16,8 +16,8 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <fmt/format.h>
 #include <future>
-#include <thread>
 #include <string>
+#include <thread>
 
 static constexpr std::string_view testdir = TEST_DIR "/connector/";
 
diff --git a/tests/helics/apps/ConnectorTests2.cpp b/tests/helics/apps/ConnectorTests2.cpp
index 6e2b5e21dd..0d7dbe2b4e 100644
--- a/tests/helics/apps/ConnectorTests2.cpp
+++ b/tests/helics/apps/ConnectorTests2.cpp
@@ -16,10 +16,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/apps/CoreApp.hpp"
 
 #include <future>
-#include <thread>
+#include <memory>
 #include <string>
+#include <thread>
 #include <vector>
-#include <memory>
 
 class MultibrokerFixture: public ::testing::Test {
   public:
diff --git a/tests/helics/apps/ConnectorTestsPotentialInterfaces.cpp b/tests/helics/apps/ConnectorTestsPotentialInterfaces.cpp
index e619e09107..b799277663 100644
--- a/tests/helics/apps/ConnectorTestsPotentialInterfaces.cpp
+++ b/tests/helics/apps/ConnectorTestsPotentialInterfaces.cpp
@@ -15,8 +15,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/apps/CoreApp.hpp"
 
 #include <future>
-#include <thread>
 #include <string>
+#include <thread>
 
 static constexpr std::string_view testdir = TEST_DIR "/connector/";
 
diff --git a/tests/helics/apps/CoreAppTests.cpp b/tests/helics/apps/CoreAppTests.cpp
index 8fea8e1fa2..dc7ccf6622 100644
--- a/tests/helics/apps/CoreAppTests.cpp
+++ b/tests/helics/apps/CoreAppTests.cpp
@@ -19,11 +19,11 @@ using ::testing::HasSubstr;
 #include <cstdio>
 #include <filesystem>
 #include <future>
-#include <thread>
+#include <memory>
 #include <string>
-#include <vector>
+#include <thread>
 #include <utility>
-#include <memory>
+#include <vector>
 
 TEST(CoreAppTests, constructor1)
 {
diff --git a/tests/helics/apps/EchoTests.cpp b/tests/helics/apps/EchoTests.cpp
index 143da04735..c83913c13c 100644
--- a/tests/helics/apps/EchoTests.cpp
+++ b/tests/helics/apps/EchoTests.cpp
@@ -12,8 +12,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gtest/gtest.h"
 #include <cstdio>
 #include <future>
-#include <thread>
 #include <string>
+#include <thread>
 
 // this test will test basic echo functionality
 TEST(echo_tests, echo_test1)
diff --git a/tests/helics/apps/PlayerTests.cpp b/tests/helics/apps/PlayerTests.cpp
index 444da550c6..a2faac15f8 100644
--- a/tests/helics/apps/PlayerTests.cpp
+++ b/tests/helics/apps/PlayerTests.cpp
@@ -14,10 +14,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/apps/Player.hpp"
 
 #include <future>
-#include <thread>
+#include <iostream>
 #include <string>
+#include <thread>
 #include <vector>
-#include <iostream>
 
 TEST(player_tests, simple_player)
 {
diff --git a/tests/helics/apps/RecorderTests.cpp b/tests/helics/apps/RecorderTests.cpp
index 6f34405f2b..5b3f7a569d 100644
--- a/tests/helics/apps/RecorderTests.cpp
+++ b/tests/helics/apps/RecorderTests.cpp
@@ -17,8 +17,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <cstdio>
 #include <filesystem>
 #include <future>
-#include <thread>
 #include <string>
+#include <thread>
 #include <vector>
 
 TEST(recorder_tests, simple_recorder_test)
diff --git a/tests/helics/apps/TracerTests.cpp b/tests/helics/apps/TracerTests.cpp
index 1faa1b0ebe..8a95c65dd0 100644
--- a/tests/helics/apps/TracerTests.cpp
+++ b/tests/helics/apps/TracerTests.cpp
@@ -19,11 +19,11 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <algorithm>
 #include <future>
 #include <iostream>
-#include <thread>
+#include <memory>
 #include <string>
-#include <vector>
+#include <thread>
 #include <utility>
-#include <memory>
+#include <vector>
 
 using namespace std::literals::chrono_literals;
 
diff --git a/tests/helics/apps/combo_tests.cpp b/tests/helics/apps/combo_tests.cpp
index c2c39e1c08..ea8e7c11d9 100644
--- a/tests/helics/apps/combo_tests.cpp
+++ b/tests/helics/apps/combo_tests.cpp
@@ -16,8 +16,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <cstdio>
 #include <filesystem>
 #include <future>
-#include <string>
 #include <iostream>
+#include <string>
 
 static void generateFiles(const std::filesystem::path& f1, const std::filesystem::path& f2)
 {
diff --git a/tests/helics/common/SmallBufferTests.cpp b/tests/helics/common/SmallBufferTests.cpp
index ec03459887..cb9260d05b 100644
--- a/tests/helics/common/SmallBufferTests.cpp
+++ b/tests/helics/common/SmallBufferTests.cpp
@@ -11,9 +11,10 @@ SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "helics/core/SmallBuffer.hpp"
+
 #include <string>
-#include <vector>
 #include <utility>
+#include <vector>
 
 using namespace helics;
 
diff --git a/tests/helics/shared_library/SystemTests.cpp b/tests/helics/shared_library/SystemTests.cpp
index 77221eb4f2..fa668c6f10 100644
--- a/tests/helics/shared_library/SystemTests.cpp
+++ b/tests/helics/shared_library/SystemTests.cpp
@@ -13,8 +13,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <atomic>
 #include <csignal>
 #include <future>
-#include <thread>
 #include <string>
+#include <thread>
 
 // test generating a global from a broker and some of its error pathways
 TEST(other_tests, broker_global_value)
diff --git a/tests/helics/shared_library/TranslatorTests.cpp b/tests/helics/shared_library/TranslatorTests.cpp
index d3c6254ff5..6c1286e129 100644
--- a/tests/helics/shared_library/TranslatorTests.cpp
+++ b/tests/helics/shared_library/TranslatorTests.cpp
@@ -10,8 +10,8 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <future>
 #include <gtest/gtest.h>
-#include <thread>
 #include <string>
+#include <thread>
 /** these test cases test out the message federates
  */
 
diff --git a/tests/helics/shared_library/cpptestFixtures.cpp b/tests/helics/shared_library/cpptestFixtures.cpp
index 934a4a7158..0fbcb1ad73 100644
--- a/tests/helics/shared_library/cpptestFixtures.cpp
+++ b/tests/helics/shared_library/cpptestFixtures.cpp
@@ -13,8 +13,8 @@ Livermore National Laboratory, operated by Lawrence Livermore National Security,
 #include "../src/helics/cpp98/Broker.hpp"
 
 #include <cctype>
-#include <string>
 #include <memory>
+#include <string>
 
 static bool hasIndexCode(const std::string& type_name)
 {
diff --git a/tests/helics/shared_library/ctestFixtures.cpp b/tests/helics/shared_library/ctestFixtures.cpp
index a23f6f4b7a..1f83fa2196 100644
--- a/tests/helics/shared_library/ctestFixtures.cpp
+++ b/tests/helics/shared_library/ctestFixtures.cpp
@@ -8,8 +8,8 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <cassert>
 #include <cctype>
-#include <string>
 #include <cstdio>
+#include <string>
 
 static bool hasIndexCode(const std::string& type_name)
 {
diff --git a/tests/helics/system_tests/TimingTests.cpp b/tests/helics/system_tests/TimingTests.cpp
index b1e00be754..579c375a46 100644
--- a/tests/helics/system_tests/TimingTests.cpp
+++ b/tests/helics/system_tests/TimingTests.cpp
@@ -13,8 +13,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <future>
 #include <iostream>
 #include <string>
-#include <vector>
 #include <utility>
+#include <vector>
 
 /** these test cases test out the value converters
  */
diff --git a/tests/helics/system_tests/brokerTimeoutTests.cpp b/tests/helics/system_tests/brokerTimeoutTests.cpp
index 6d4f06a7f0..5dbfbff636 100644
--- a/tests/helics/system_tests/brokerTimeoutTests.cpp
+++ b/tests/helics/system_tests/brokerTimeoutTests.cpp
@@ -18,9 +18,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "helics/network/test/TestCore.h"
 
 #include <future>
-#include <thread>
 #include <memory>
 #include <string>
+#include <thread>
 
 #define CORE_TYPE_TO_TEST helics::CoreType::TEST
 
diff --git a/tests/helics/system_tests/heat-transfer-tests.cpp b/tests/helics/system_tests/heat-transfer-tests.cpp
index 78b4f9bf67..d3dfee3762 100644
--- a/tests/helics/system_tests/heat-transfer-tests.cpp
+++ b/tests/helics/system_tests/heat-transfer-tests.cpp
@@ -14,8 +14,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <memory>
 #include <string>
 #include <thread>
-#include <vector>
 #include <utility>
+#include <vector>
 
 helics::Time tend = 3600.0;  // simulation end time
 
diff --git a/tests/helics/system_tests/profilingTests.cpp b/tests/helics/system_tests/profilingTests.cpp
index 925de9eb7a..93389fc0fb 100644
--- a/tests/helics/system_tests/profilingTests.cpp
+++ b/tests/helics/system_tests/profilingTests.cpp
@@ -17,11 +17,11 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <future>
 #include <gmlc/libguarded/guarded.hpp>
 #include <gtest/gtest.h>
+#include <memory>
 #include <regex>
 #include <string>
 #include <thread>
 #include <vector>
-#include <memory>
 
 /** these test cases test out user-directed logging functionality
  */