diff --git a/include/courier/helpers.h b/include/courier/helpers.h
index fea3b42..721ebeb 100644
--- a/include/courier/helpers.h
+++ b/include/courier/helpers.h
@@ -30,9 +30,10 @@ class DefaultCourier : public Courier {
 class Sender {
   public:
     Sender() = default;
-    explicit Sender(std::string name_in,
+    explicit Sender(std::string class_name_in,
+                    std::string name_in,
                     const std::shared_ptr<Courier>& courier_in = std::make_shared<DefaultCourier>())
-        : name(std::move(name_in)), courier(courier_in) {};
+        : name(std::move(name_in)), courier(courier_in), class_name(std::move(class_name_in)) {};
     std::string name;
 
   protected:
@@ -61,6 +62,8 @@ class Sender {
     {
         courier->send_debug(make_message(message));
     }
+    void set_courier(const std::shared_ptr<Courier>& courier_in) { courier = courier_in; }
+    std::shared_ptr<Courier> get_courier() { return courier; };
 };
 
 } // namespace Courier
diff --git a/test/library.h b/test/library.h
index a50106a..fe4ca81 100644
--- a/test/library.h
+++ b/test/library.h
@@ -11,9 +11,8 @@ class LibraryClass : Courier::Sender {
     explicit LibraryClass(std::string name_in,
                           const std::shared_ptr<Courier::Courier>& courier_in =
                               std::make_shared<Courier::DefaultCourier>())
-        : Courier::Sender(std::move(name_in), courier_in)
+        : Courier::Sender("LibraryClass", std::move(name_in), courier_in)
     {
-        class_name = "LibraryClass";
     }
     void generate_debug() { send_debug("Something for the developer happened."); }
     void generate_info() { send_info("Something you should notice happened."); }