diff --git a/src/shared/drivers/spi/SPI.h b/src/shared/drivers/spi/SPI.h
index 8d2077fca048d27085f7f3f64447ac7ca5222663..07761041ff0f5079edfa690bc301a76e62068dbb 100644
--- a/src/shared/drivers/spi/SPI.h
+++ b/src/shared/drivers/spi/SPI.h
@@ -30,7 +30,7 @@
 using SPIType = SPI_TypeDef;
 #else
 #include <utils/TestUtils/FakeSpiTypedef.h>
-using SPIType = FakeSpiTypedef;
+using SPIType = Boardcore::FakeSpiTypedef;
 #endif
 
 namespace Boardcore
diff --git a/src/shared/drivers/spi/SPIBus.h b/src/shared/drivers/spi/SPIBus.h
index 0d5b0c0b7faeb8c166fd55b8e454a1409ba22aac..ae6ff1910827dddbaa94f751de81d603392e2cdc 100644
--- a/src/shared/drivers/spi/SPIBus.h
+++ b/src/shared/drivers/spi/SPIBus.h
@@ -29,8 +29,8 @@
 #ifndef USE_MOCK_PERIPHERALS
 using SPIType = SPI_TypeDef;
 #else
-#include <test/FakeSpiTypedef.h>
-using SPIType = FakeSpiTypedef;
+#include <utils/TestUtils/FakeSpiTypedef.h>
+using SPIType = Boardcore::FakeSpiTypedef;
 #endif
 
 namespace Boardcore
@@ -46,10 +46,10 @@ public:
     SPIBus(SPIType* spi);
 
     ///< Delete copy/move contructors/operators.
-    SPIBus(const SPIBus&)            = delete;
+    SPIBus(const SPIBus&) = delete;
     SPIBus& operator=(const SPIBus&) = delete;
     SPIBus(SPIBus&&)                 = delete;
-    SPIBus& operator=(SPIBus&&)      = delete;
+    SPIBus& operator=(SPIBus&&) = delete;
 
     /**
      * @brief Configures and enables the bus with the provided configuration.
diff --git a/src/shared/drivers/spi/SPIBusInterface.h b/src/shared/drivers/spi/SPIBusInterface.h
index f10a7e33228d5b43bf701e5e8178cead2abf8411..32bc057ca45bc375c495f52af0e3b311f13b5593 100644
--- a/src/shared/drivers/spi/SPIBusInterface.h
+++ b/src/shared/drivers/spi/SPIBusInterface.h
@@ -30,7 +30,7 @@
 using GpioType = miosix::GpioPin;
 #else
 #include <utils/TestUtils/MockGpioPin.h>
-using GpioType = MockGpioPin;
+using GpioType = Boardcore::MockGpioPin;
 #endif
 
 namespace Boardcore
@@ -93,10 +93,10 @@ public:
     SPIBusInterface() {}
 
     ///< Delete copy/move contructors/operators.
-    SPIBusInterface(const SPIBusInterface&)            = delete;
+    SPIBusInterface(const SPIBusInterface&) = delete;
     SPIBusInterface& operator=(const SPIBusInterface&) = delete;
     SPIBusInterface(SPIBusInterface&&)                 = delete;
-    SPIBusInterface& operator=(SPIBusInterface&&)      = delete;
+    SPIBusInterface& operator=(SPIBusInterface&&) = delete;
 
     /**
      * @brief Configures the bus with the provided configuration parameters.
diff --git a/src/shared/drivers/usart/USART.h b/src/shared/drivers/usart/USART.h
index 14faf77c87f7739259d45a2fa28931168a026117..b06b19ea903b9ad6abd6d830ca7862e4c411a2e3 100644
--- a/src/shared/drivers/usart/USART.h
+++ b/src/shared/drivers/usart/USART.h
@@ -34,6 +34,7 @@
 using USARTType = USART_TypeDef;
 #else
 // TODO: Create test utils
+using USARTType = USART_TypeDef;
 #endif
 
 #ifdef STM32F429xx
diff --git a/src/shared/utils/TestUtils/FakeSpiTypedef.h b/src/shared/utils/TestUtils/FakeSpiTypedef.h
index dae48554ab5c4ac85e0d6e642f7e723a77b48be0..eccb4a17b5b5e50ded8434fdfdaf814b467ae1a5 100644
--- a/src/shared/utils/TestUtils/FakeSpiTypedef.h
+++ b/src/shared/utils/TestUtils/FakeSpiTypedef.h
@@ -86,6 +86,8 @@ struct FakeSpiTypedef
     MockGpioPin cs;
 
     FakeSpiTypedef() : DR(*this) { cs.high(); }
+
+    FakeSpiTypedef(SPI_TypeDef* spi) : DR(*this) { cs.high(); }
 };
 
 }  // namespace Boardcore