diff --git a/src/shared/drivers/canbus/CanProtocol/CanProtocol.cpp b/src/shared/drivers/canbus/CanProtocol/CanProtocol.cpp
index 473a1f2c469fd08f61f3e273cc5e9667ca945b36..7004bfa05c4815fce44ebe94daf7c8755c073cd2 100644
--- a/src/shared/drivers/canbus/CanProtocol/CanProtocol.cpp
+++ b/src/shared/drivers/canbus/CanProtocol/CanProtocol.cpp
@@ -30,14 +30,8 @@ namespace Boardcore
 namespace Canbus
 {
 
-CanProtocol::CanProtocol(CanbusDriver* can, MsgHandler onReceive)
-{
-    // We assume the bus to be configured at its max velocity
-    CanProtocol(can, onReceive, 500 * 1000);
-}
-
 CanProtocol::CanProtocol(CanbusDriver* can, MsgHandler onReceive,
-                         uint32_t baudRate)
+                         uint32_t baudRate = 500 * 1000)
     : can(can), onReceive(onReceive)
 {
     loadEstimator = new BusLoadEstimation(baudRate);
diff --git a/src/shared/drivers/canbus/CanProtocol/CanProtocol.h b/src/shared/drivers/canbus/CanProtocol/CanProtocol.h
index 1c2942a45f742c9ebf623007a402ce80225d6f02..cf6f80c4ec26e18f1714fc7b4b1e99633ea2d6aa 100644
--- a/src/shared/drivers/canbus/CanProtocol/CanProtocol.h
+++ b/src/shared/drivers/canbus/CanProtocol/CanProtocol.h
@@ -51,16 +51,6 @@ class CanProtocol
     using MsgHandler = std::function<void(CanMessage data)>;
 
 public:
-    /**
-     * @brief Construct a new CanProtocol object.
-     *
-     * @param can Pointer to a CanbusDriver object.
-     *
-     * @param onReceive function to be called when a new message is received.
-     */
-
-    CanProtocol(CanbusDriver* can, MsgHandler onReceive);
-
     /**
      * @brief Construct a new CanProtocol object.
      *
@@ -68,7 +58,7 @@ public:
      *
      * @param onReceive function to be called when a new message is received.
      *
-     * @param baudRate used to calculate bus usage.
+     * @param baudRate used to calculate bus usage (default 500*1000).
      */
 
     CanProtocol(CanbusDriver* can, MsgHandler onReceive, uint32_t baudRate);
diff --git a/src/tests/drivers/canbus/CanProtocol/test-can-protocol-2way.cpp b/src/tests/drivers/canbus/CanProtocol/test-can-protocol-2way.cpp
index 53ff65c4a473a5345104a0bca9961e91efcadd35..1d62c6ec7bc112ae773fc5e871145194f7551c7e 100644
--- a/src/tests/drivers/canbus/CanProtocol/test-can-protocol-2way.cpp
+++ b/src/tests/drivers/canbus/CanProtocol/test-can-protocol-2way.cpp
@@ -115,7 +115,7 @@ void sendNewRequest()
     protocol->enqueueData(0x00, id, 0x01, 0x00, 0x00, f);
 }
 
-class MessageCollector : public ActiveObject
+class MessageCollect : public ActiveObject
 {
 public:
     void run() override
@@ -190,7 +190,7 @@ private:
     Stats msgstats;
 };
 
-MessageCollector mc;
+MessageCollect mc;
 
 int main()
 {
@@ -203,7 +203,10 @@ int main()
     bt.samplePoint = SAMPLE_POINT;
 
     CanbusDriver* c1 = new CanbusDriver(CAN1, cfg, bt);
-    CanbusDriver* c  = new CanbusDriver(CAN2, cfg, bt);
+    if (false && c1)
+    {
+    }
+    CanbusDriver* c = new CanbusDriver(CAN2, cfg, bt);
     protocol = new CanProtocol(c, bind(&handleCanMessage, _1), BAUD_RATE);
 
     // Allow every message _1