diff --git a/common/src/test/java/ctbrec/recorder/postprocessing/AbstractPlaceholderAwarePostProcessorTest.java b/common/src/test/java/ctbrec/recorder/postprocessing/AbstractPlaceholderAwarePostProcessorTest.java
index 11e6babe..6a125889 100644
--- a/common/src/test/java/ctbrec/recorder/postprocessing/AbstractPlaceholderAwarePostProcessorTest.java
+++ b/common/src/test/java/ctbrec/recorder/postprocessing/AbstractPlaceholderAwarePostProcessorTest.java
@@ -12,6 +12,7 @@ import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
+import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -38,7 +39,8 @@ class AbstractPlaceholderAwarePostProcessorTest extends AbstractPpTest {
         config = mockConfig();
         placeHolderAwarePp = new Move();
         modelNotesService = mock(ModelNotesService.class);
-        when(modelNotesService.loadModelNotes(any())).thenReturn(null);
+
+        when(modelNotesService.loadModelNotes(any())).thenReturn(Optional.of("tag,_foo,_bar"));
     }
 
     @Test
@@ -137,7 +139,7 @@ class AbstractPlaceholderAwarePostProcessorTest extends AbstractPpTest {
     @Test
     void testModelNotesReplacement() {
         String input = "asdf_${modelNotes}_asdf";
-        assertEquals("asdf_tag,_foo,_bar_asdf", placeHolderAwarePp.fillInPlaceHolders(input, createPostProcessingContext(rec, null, config)));
+        assertEquals("asdf_tag,_foo,_bar_asdf", placeHolderAwarePp.fillInPlaceHolders(input, createPostProcessingContext(rec, null, config, modelNotesService)));
     }
 
     @Test
diff --git a/common/src/test/java/ctbrec/recorder/postprocessing/AbstractPpTest.java b/common/src/test/java/ctbrec/recorder/postprocessing/AbstractPpTest.java
index dd3d38bf..6c708791 100644
--- a/common/src/test/java/ctbrec/recorder/postprocessing/AbstractPpTest.java
+++ b/common/src/test/java/ctbrec/recorder/postprocessing/AbstractPpTest.java
@@ -93,11 +93,16 @@ public abstract class AbstractPpTest {
     }
 
     PostProcessingContext createPostProcessingContext(Recording rec, RecordingManager recordingManager, Config config) {
+        return createPostProcessingContext(rec, recordingManager, config, null);
+    }
+
+    PostProcessingContext createPostProcessingContext(Recording rec, RecordingManager recordingManager, Config config, ModelNotesService modelNotesService) {
         PostProcessingContext ctx = new PostProcessingContext();
         ctx.setConfig(config);
         ctx.setRecording(rec);
         ctx.setRecorder(mockRecorder());
         ctx.setRecordingManager(recordingManager);
+        ctx.setModelNotesService(modelNotesService);
         return ctx;
     }
 }