diff --git a/tests/test_engine_resources.py b/tests/test_engine_resources.py
index 22b6158f01afebe77a2a6353ce62ec3bf93b1b3a..bc82813f65f516f643b02c25422afb32f862bdf4 100644
--- a/tests/test_engine_resources.py
+++ b/tests/test_engine_resources.py
@@ -208,7 +208,7 @@ class TestEngineResources(unittest.TestCase):
         print(self._testMethodName)
 
         show = Show(id=123, name="some show")
-        episode = Episode(id="1432", title="SuperSonicShow 23/1")
+        episode = Episode(id="1432", title="SuperSonicShow 23/1", memo="")
         ts = Timeslot(
             id=42, repetition_id=None, start=100000, end=100360, show=show, episode=episode
         )
diff --git a/tests/test_scheduling_domain.py b/tests/test_scheduling_domain.py
index f9e468ea35fd6bcdc160af6eae0db3ad78395ba6..a206bb6bcb2c8f9b78eee4442ad121780563c731 100644
--- a/tests/test_scheduling_domain.py
+++ b/tests/test_scheduling_domain.py
@@ -48,7 +48,7 @@ class TestDomain(unittest.TestCase):
         print(self._testMethodName)
 
         show = Show(id=555, name="3angulation")
-        episode = Episode(id=3, title="SuperSonicShow 23/1")
+        episode = Episode(id=3, title="SuperSonicShow 23/1", memo="")
         ts = Timeslot(
             id=333, repetition_id=888, start=1675463003, end=1675466003, show=show, episode=episode
         )
@@ -132,6 +132,35 @@ class TestDomain(unittest.TestCase):
         self.assertIsNotNone(ts.playlists.show)
         self.assertEqual(pl_show, ts.get_current_playlist())
 
+    def test_get_current_playlist_from_virtual_timeslot(self):
+        print(self._testMethodName)
+
+        ts = Timeslot(
+            id=333,
+            virtual=True,
+            repetition_id=888,
+            start=1675463003,
+            end=1675466009,
+            show=None,
+            episode=None,
+        )
+
+        # Virtual timeslots do use playlists
+        self.assertTrue(ts.is_virtual())
+        self.assertIsNone(ts.get_current_playlist())
+
+        pl_timeslot = Playlist(1, "playlist A")
+        pl_schedule = Playlist(2, "playlist B")
+        pl_show = Playlist(3, "playlist C")
+
+        ts.set_playlists(pl_timeslot, pl_schedule, pl_show)
+        self.assertIsNotNone(ts.playlists.timeslot)
+        self.assertIsNotNone(ts.playlists.schedule)
+        self.assertIsNotNone(ts.playlists.show)
+
+        # Even though there are playlists assigned, they are not returned
+        self.assertIsNone(ts.get_current_playlist())
+
     def test_playlist_duration_zero(self):
         print(self._testMethodName)
 
@@ -398,8 +427,8 @@ class TestDomain(unittest.TestCase):
 
         show1 = Show(1, "show1")
         show2 = Show(2, "show2")
-        episode1 = Episode(11, "title1")
-        episode2 = Episode(22, "title2")
+        episode1 = Episode(11, "title1", "my memo for this episode")
+        episode2 = Episode(22, "title2", None)
         ts1 = Timeslot(id=333, repetition_id=888, start=100, end=120, show=show1, episode=episode1)
         ts2 = Timeslot(id=444, repetition_id=999, start=100, end=120, show=show2, episode=episode2)
 
diff --git a/tests/test_scheduling_timetable.py b/tests/test_scheduling_timetable.py
index 281e8a9425dcd1f1a7851a42fc98c32ce08d5f45..ecb1d6b9f4608ca4333b69a22851f4439a0d1b97 100644
--- a/tests/test_scheduling_timetable.py
+++ b/tests/test_scheduling_timetable.py
@@ -590,7 +590,7 @@ class TestSchedulingTimetable(unittest.TestCase):
 
         # Create updated timeslot
         show = Show(22, "Updated Show")
-        episode = Episode("123", "Updated Episode")
+        episode = Episode("123", "Updated Episode", "My memo")
         ts3_updated = Timeslot(
             id=3, repetition_id=1234, start=now + 120, end=now + 180, show=show, episode=episode
         )