diff --git a/scc b/scc
index 1b44e14..7a5fd95 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 1b44e143ffbfee93a7a53c0ac06cda11c46b4155
+Subproject commit 7a5fd95c58765b3e3db8666842f3c8ae748fac60
diff --git a/tests/memory_subsys/memory_test.cpp b/tests/memory_subsys/memory_test.cpp
index e5ac162..d0e50f8 100644
--- a/tests/memory_subsys/memory_test.cpp
+++ b/tests/memory_subsys/memory_test.cpp
@@ -31,15 +31,14 @@ template <typename T> void prepare_trans(tlm::tlm_generic_payload& trans, tlm::t
     trans.set_response_status(tlm::TLM_INCOMPLETE_RESPONSE);
 }
 
-template<typename T>
-void do_dmi_access(T& isck, uint64_t address, uint64_t expected_size) {
+template <typename T> void do_dmi_access(T& isck, uint64_t address, uint64_t expected_size) {
     tlm::tlm_generic_payload gp;
     tlm::tlm_dmi dmi;
     gp.set_address(address);
     auto res = isck->get_direct_mem_ptr(gp, dmi);
     REQUIRE(res == true);
     REQUIRE(dmi.get_start_address() == address);
-    REQUIRE(dmi.get_end_address() == (address + expected_size-1));
+    REQUIRE(dmi.get_end_address() == (address + expected_size - 1));
     REQUIRE(dmi.is_read_write_allowed());
 }
 
diff --git a/tests/memory_subsys/testbench.h b/tests/memory_subsys/testbench.h
index 363e1df..3ec7cb1 100644
--- a/tests/memory_subsys/testbench.h
+++ b/tests/memory_subsys/testbench.h
@@ -5,8 +5,8 @@
 #include <scc/cci_util.h>
 #include <scc/configurer.h>
 #include <scc/memory.h>
-#include <scc/router.h>
 #include <scc/observer.h>
+#include <scc/router.h>
 #include <scc/sc_variable.h>
 #include <scc/tracer.h>
 #include <string>