diff --git a/bmc/firmware-handler/test/Makefile.am b/bmc/firmware-handler/test/Makefile.am
index bf818fd..13ed805 100644
--- a/bmc/firmware-handler/test/Makefile.am
+++ b/bmc/firmware-handler/test/Makefile.am
@@ -4,6 +4,7 @@
 	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/tools/ \
 	-I$(top_srcdir)/bmc/ \
+	-I$(top_srcdir)/bmc/test \
 	-I$(top_srcdir)/bmc/firmware-handler \
 	$(GTEST_CFLAGS) \
 	$(GMOCK_CFLAGS) \
diff --git a/bmc/firmware-handler/test/triggerable_mock.hpp b/bmc/firmware-handler/test/create_action_map.hpp
similarity index 61%
rename from bmc/firmware-handler/test/triggerable_mock.hpp
rename to bmc/firmware-handler/test/create_action_map.hpp
index 3469127..8238e2f 100644
--- a/bmc/firmware-handler/test/triggerable_mock.hpp
+++ b/bmc/firmware-handler/test/create_action_map.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "firmware_handler.hpp"
-#include "status.hpp"
+#include "triggerable_mock.hpp"
 
 #include <memory>
 #include <string>
@@ -11,21 +11,6 @@
 
 namespace ipmi_flash
 {
-// TriggerableActionInterface
-
-class TriggerMock : public TriggerableActionInterface
-{
-  public:
-    MOCK_METHOD0(trigger, bool());
-    MOCK_METHOD0(abort, void());
-    MOCK_METHOD0(status, ActionStatus());
-};
-
-std::unique_ptr<TriggerableActionInterface> CreateTriggerMock()
-{
-    return std::make_unique<TriggerMock>();
-}
-
 ActionMap CreateActionMap(const std::string& blobPath)
 {
     std::unique_ptr<ActionPack> actionPack = std::make_unique<ActionPack>();
diff --git a/bmc/firmware-handler/test/firmware_canhandle_unittest.cpp b/bmc/firmware-handler/test/firmware_canhandle_unittest.cpp
index 34c4e51..17d5c11 100644
--- a/bmc/firmware-handler/test/firmware_canhandle_unittest.cpp
+++ b/bmc/firmware-handler/test/firmware_canhandle_unittest.cpp
@@ -1,8 +1,8 @@
+#include "create_action_map.hpp"
 #include "data_mock.hpp"
 #include "firmware_handler.hpp"
 #include "flags.hpp"
 #include "image_mock.hpp"
-#include "triggerable_mock.hpp"
 #include "util.hpp"
 
 #include <vector>
diff --git a/bmc/firmware-handler/test/firmware_commit_unittest.cpp b/bmc/firmware-handler/test/firmware_commit_unittest.cpp
index d564de6..8d6bfe2 100644
--- a/bmc/firmware-handler/test/firmware_commit_unittest.cpp
+++ b/bmc/firmware-handler/test/firmware_commit_unittest.cpp
@@ -1,8 +1,8 @@
+#include "create_action_map.hpp"
 #include "data_mock.hpp"
 #include "firmware_handler.hpp"
 #include "flags.hpp"
 #include "image_mock.hpp"
-#include "triggerable_mock.hpp"
 #include "util.hpp"
 
 #include <memory>
diff --git a/bmc/firmware-handler/test/firmware_handler_unittest.cpp b/bmc/firmware-handler/test/firmware_handler_unittest.cpp
index 1c3cc58..1eeb898 100644
--- a/bmc/firmware-handler/test/firmware_handler_unittest.cpp
+++ b/bmc/firmware-handler/test/firmware_handler_unittest.cpp
@@ -1,7 +1,7 @@
+#include "create_action_map.hpp"
 #include "firmware_handler.hpp"
 #include "flags.hpp"
 #include "image_mock.hpp"
-#include "triggerable_mock.hpp"
 #include "util.hpp"
 
 #include <algorithm>
diff --git a/bmc/firmware-handler/test/firmware_open_unittest.cpp b/bmc/firmware-handler/test/firmware_open_unittest.cpp
index 274ea14..2d54c41 100644
--- a/bmc/firmware-handler/test/firmware_open_unittest.cpp
+++ b/bmc/firmware-handler/test/firmware_open_unittest.cpp
@@ -1,7 +1,7 @@
+#include "create_action_map.hpp"
 #include "firmware_handler.hpp"
 #include "flags.hpp"
 #include "image_mock.hpp"
-#include "triggerable_mock.hpp"
 #include "util.hpp"
 
 #include <memory>
diff --git a/bmc/firmware-handler/test/firmware_stat_unittest.cpp b/bmc/firmware-handler/test/firmware_stat_unittest.cpp
index fcb2d34..1205e26 100644
--- a/bmc/firmware-handler/test/firmware_stat_unittest.cpp
+++ b/bmc/firmware-handler/test/firmware_stat_unittest.cpp
@@ -1,7 +1,7 @@
+#include "create_action_map.hpp"
 #include "firmware_handler.hpp"
 #include "flags.hpp"
 #include "image_mock.hpp"
-#include "triggerable_mock.hpp"
 #include "util.hpp"
 
 #include <memory>
diff --git a/bmc/firmware-handler/test/firmware_unittest.hpp b/bmc/firmware-handler/test/firmware_unittest.hpp
index da2e8f7..0d18bda 100644
--- a/bmc/firmware-handler/test/firmware_unittest.hpp
+++ b/bmc/firmware-handler/test/firmware_unittest.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "create_action_map.hpp"
 #include "data_mock.hpp"
 #include "firmware_handler.hpp"
 #include "flags.hpp"
diff --git a/bmc/firmware-handler/test/image_mock.hpp b/bmc/firmware-handler/test/image_mock.hpp
deleted file mode 100644
index 2a967ac..0000000
--- a/bmc/firmware-handler/test/image_mock.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "image_handler.hpp"
-
-#include <gmock/gmock.h>
-
-namespace ipmi_flash
-{
-
-class ImageHandlerMock : public ImageHandlerInterface
-{
-  public:
-    virtual ~ImageHandlerMock() = default;
-    MOCK_METHOD2(open, bool(const std::string&, std::ios_base::openmode));
-    MOCK_METHOD0(close, void());
-    MOCK_METHOD2(write, bool(std::uint32_t, const std::vector<std::uint8_t>&));
-    MOCK_METHOD2(read, std::optional<std::vector<std::uint8_t>>(std::uint32_t,
-                                                                std::uint32_t));
-    MOCK_METHOD0(getSize, int());
-};
-
-} // namespace ipmi_flash