diff --git a/test/window_mapper_mock.hpp b/test/window_mapper_mock.hpp
index 8fc41fa..dd3a89b 100644
--- a/test/window_mapper_mock.hpp
+++ b/test/window_mapper_mock.hpp
@@ -16,11 +16,9 @@
   public:
     virtual ~HardwareInterfaceMock() = default;
 
+    MOCK_METHOD0(open, MemorySet());
     MOCK_METHOD0(close, ());
-    MOCK_METHOD2(mapWindow,
-                 std::pair<std::uint32_t, std::uint32_t>(std::uint32_t,
-                                                         std::uint32_t));
-    MOCK_METHOD1(copyFrom, std::vector<std::uint8_t>(std::uint32_t));
+    MOCK_METHOD2(mapWindow, WindowMapResult(std::uint32_t, std::uint32_t));
 };
 
 } // namespace ipmi_flash