diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45226da..8aa16c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ set(ENABLE_TESTING OFF)
 FetchContent_Declare(
     graph-prototype
     GIT_REPOSITORY https://github.com/fair-acc/graph-prototype.git
-    GIT_TAG 1f3469c73ea182b38ff66f18d46e5251fc1edbf8 # main as of 2024-03-07
+    GIT_TAG 1402c524e557b6a81403e52dfe6a7c42c278dafd # main as of 2024-03-26
 )
 
 FetchContent_Declare(
diff --git a/blocklib/picoscope/test/qa_Picoscope4000a.cc b/blocklib/picoscope/test/qa_Picoscope4000a.cc
index 0a50dab..590ebbd 100644
--- a/blocklib/picoscope/test/qa_Picoscope4000a.cc
+++ b/blocklib/picoscope/test/qa_Picoscope4000a.cc
@@ -89,15 +89,15 @@ testStreamingBasics() {
     fmt::println("Total: {}", sink.samples_seen);
 
     expect(ge(sink.samples_seen, 80000UZ));
-    expect(le(sink.samples_seen, 160000UZ));
+    expect(le(sink.samples_seen, 170000UZ));
     expect(eq(tagMonitor.tags.size(), 1UZ));
     const auto &tag = tagMonitor.tags[0];
     expect(eq(tag.index, int64_t{ 0 }));
-    expect(eq(std::get<float>(tag.at(std::string(tag::SAMPLE_RATE.key()))), static_cast<float>(kSampleRate)));
-    expect(eq(std::get<std::string>(tag.at(std::string(tag::SIGNAL_NAME.key()))), "Test signal"s));
-    expect(eq(std::get<std::string>(tag.at(std::string(tag::SIGNAL_UNIT.key()))), "Test unit"s));
-    expect(eq(std::get<float>(tag.at(std::string(tag::SIGNAL_MIN.key()))), 0.f));
-    expect(eq(std::get<float>(tag.at(std::string(tag::SIGNAL_MAX.key()))), 5.f));
+    expect(eq(std::get<float>(tag.at(std::string(tag::SAMPLE_RATE.shortKey()))), static_cast<float>(kSampleRate)));
+    expect(eq(std::get<std::string>(tag.at(std::string(tag::SIGNAL_NAME.shortKey()))), "Test signal"s));
+    expect(eq(std::get<std::string>(tag.at(std::string(tag::SIGNAL_UNIT.shortKey()))), "Test unit"s));
+    expect(eq(std::get<float>(tag.at(std::string(tag::SIGNAL_MIN.shortKey()))), 0.f));
+    expect(eq(std::get<float>(tag.at(std::string(tag::SIGNAL_MAX.shortKey()))), 5.f));
 }
 
 const boost::ut::suite Picoscope4000aTests = [] {