diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72c4990..00d92e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ if (PREVIEW_STANDALONE)
     FetchContent_Declare(
         emil
         GIT_REPOSITORY https://github.com/philips-software/amp-embedded-infra-lib
-        GIT_TAG        7573a8236a494a5893977c107585456a3b481eef # unreleased
+        GIT_TAG        798ec3da653f955a1eb218279fa93f52f15fcfbf # unreleased
     )
 
     FetchContent_MakeAvailable(emil)
@@ -30,7 +30,7 @@ if (PREVIEW_STANDALONE)
         FetchContent_Declare(
             halst
             GIT_REPOSITORY https://github.com/philips-software/amp-hal-st
-            GIT_TAG        a830ed6a47fc56236ed3a3d54ece794e027c64ed # unreleased
+            GIT_TAG        5f2a467b1ebc215251219d6457023ffa307d5042 # unreleased
         )
 
         FetchContent_MakeAvailable(halst)
diff --git a/preview/touch/test/TestTouchScreen.cpp b/preview/touch/test/TestTouchScreen.cpp
index 1801399..8d7fed7 100644
--- a/preview/touch/test/TestTouchScreen.cpp
+++ b/preview/touch/test/TestTouchScreen.cpp
@@ -137,7 +137,7 @@ TEST_F(TouchScreenTest, Measure_results_in_touch_measurement)
 
 TEST_F(TouchScreenTest, on_no_touch_none_is_reported)
 {
-    infra::VerifyingFunctionMock<void(infra::Optional<infra::Point>)> expectOnResult(infra::none);
+    infra::VerifyingFunction<void(infra::Optional<infra::Point>)> expectOnResult(infra::none);
     onResult = expectOnResult;
 
     xTouchResult = services::TouchScreen::PixelPosition{ 400 };
@@ -177,7 +177,7 @@ TEST_F(TouchScreenTest, after_measurement_is_done_y_measurement_starts)
 
 TEST_F(TouchScreenTest, after_last_measurement_result_is_reported)
 {
-    infra::VerifyingFunctionMock<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point()));
+    infra::VerifyingFunction<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point()));
     onResult = expectOnResult;
 
     DoTouchMeasurement();
@@ -190,7 +190,7 @@ TEST_F(TouchScreenTest, after_last_measurement_result_is_reported)
 
 TEST_F(TouchScreenTest, on_touch_position_is_reported)
 {
-    infra::VerifyingFunctionMock<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point(42, 134)));
+    infra::VerifyingFunction<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point(42, 134)));
     onResult = expectOnResult;
 
     xResult = services::TouchScreen::PixelPosition{ 42 };