diff --git a/src/plugins/JTest/JTestPlotter.h b/src/plugins/JTest/JTestPlotter.h
index a8b882ef6..0c643f925 100644
--- a/src/plugins/JTest/JTestPlotter.h
+++ b/src/plugins/JTest/JTestPlotter.h
@@ -23,7 +23,6 @@ class JTestPlotter : public JEventProcessor {
     JTestPlotter() {
         SetPrefix("jtest:plotter");
         SetTypeName(NAME_OF_THIS);
-        SetCallbackStyle(CallbackStyle::ExpertMode);
     }
 
     void Init() override {
@@ -34,14 +33,14 @@ class JTestPlotter : public JEventProcessor {
         app->SetDefaultParameter("jtest:plotter_bytes_spread", m_write_spread, "Spread of bytes written during plotting");
     }
 
-    void Process(const JEvent& event) override {
+    void Process(const std::shared_ptr<const JEvent>& event) override {
 
         // Read the track data
-        auto td = event.GetSingle<JTestTrackData>();
+        auto td = event->GetSingle<JTestTrackData>();
         read_memory(td->buffer);
 
         // Read the extra data objects inserted by JTestTracker
-        event.Get<JTestTracker::JTestTrackAuxilliaryData>();
+        event->Get<JTestTracker::JTestTrackAuxilliaryData>();
 
         // Everything that happens after here is in a critical section
         std::lock_guard<std::mutex> lock(m_mutex);
@@ -52,7 +51,7 @@ class JTestPlotter : public JEventProcessor {
         // Write the histogram data
         auto hd = new JTestHistogramData;
         write_memory(hd->buffer, m_write_bytes, m_write_spread);
-        event.Insert(hd);
+        event->Insert(hd);
     }
 
 };
diff --git a/src/programs/perf_tests/CMakeLists.txt b/src/programs/perf_tests/CMakeLists.txt
index d12240f1f..558516bbd 100644
--- a/src/programs/perf_tests/CMakeLists.txt
+++ b/src/programs/perf_tests/CMakeLists.txt
@@ -1,7 +1,6 @@
 
 
 add_jana_test(jana-perf-tests)
-set_tests_properties(jana-perf-tests PROPERTIES DISABLED TRUE)
 
 if (USE_PODIO)
     find_package(podio REQUIRED)
diff --git a/src/programs/perf_tests/PerfTests.cc b/src/programs/perf_tests/PerfTests.cc
index b1f9f12a7..974a57731 100644
--- a/src/programs/perf_tests/PerfTests.cc
+++ b/src/programs/perf_tests/PerfTests.cc
@@ -13,9 +13,6 @@
 #include <PodioStressTest.h>
 #endif
 
-#include <iostream>
-#include <thread>
-
 
 
 int main() {