diff --git a/.devcontainer b/.devcontainer
index fbc0062..03a451e 160000
--- a/.devcontainer
+++ b/.devcontainer
@@ -1 +1 @@
-Subproject commit fbc0062b22e0dafbe65e24f5669c22621f516f42
+Subproject commit 03a451e89d3d72c0b538639a92282ef042bd543b
diff --git a/test/geos.cpp b/test/geos.cpp
index 706269f..a28baa1 100644
--- a/test/geos.cpp
+++ b/test/geos.cpp
@@ -8,11 +8,11 @@
 class GEOSHandle
 {
 public:
-  GEOSHandle() : handle(initGEOS_r(nullptr, nullptr)) { }
+  GEOSHandle() : handle(GEOS_init_r()) { }
   ~GEOSHandle()
   {
     if (handle)
-      finishGEOS_r(handle);
+      GEOS_finish_r(handle);
   }
   GEOSContextHandle_t get() const { return handle; }
 
diff --git a/test/spatialite-tools/CMakeLists.txt b/test/spatialite-tools/CMakeLists.txt
index 00ceab0..7bac621 100644
--- a/test/spatialite-tools/CMakeLists.txt
+++ b/test/spatialite-tools/CMakeLists.txt
@@ -11,7 +11,7 @@ set(tools
   exif_loader
   )
 foreach(tool ${tools})
-  set(tool_EXE $<TARGET_FILE:xpro::${tool}>)
+  set(tool_EXE $<TARGET_FILE:spatialite-tools::${tool}>)
   set(tool_CMAKE ${CMAKE_CURRENT_BINARY_DIR}/${tool}.cmake)
   configure_file(tool.in.cmake ${tool_CMAKE} @ONLY)
   file(GENERATE OUTPUT ${tool_CMAKE} INPUT ${tool_CMAKE})