diff --git a/test-data/src/main/java/se/su/dsv/scipro/testdata/DataInitializer.java b/test-data/src/main/java/se/su/dsv/scipro/testdata/DataInitializer.java
index c12cb602b2..89742860d1 100644
--- a/test-data/src/main/java/se/su/dsv/scipro/testdata/DataInitializer.java
+++ b/test-data/src/main/java/se/su/dsv/scipro/testdata/DataInitializer.java
@@ -73,6 +73,9 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
     @Inject
     private MilestoneActivityTemplateService milestoneActivityTemplateService;
 
+    @Inject
+    private EventService eventService;
+
     @Inject
     private FileService fileService;
 
@@ -2017,36 +2020,42 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
             "First meeting held",
             "First meeting with supervisor.",
             milestonePhaseTemplate1,
-            null
+            null,
+                null
         );
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Project plan approved",
             "Project plan approved by supervisor.",
             milestonePhaseTemplate1,
-            null
+            null, null
+        );
+
+        List<Event> events = eventService.findAll();
+
+        createMileStone(
+            MilestoneActivityTemplate.Type.PROJECT,
+            "Rough draft sent to reviewer for approval (Auto)",
+            "Rough draft sent to the reviewer for the first time.",
+            milestonePhaseTemplate2,
+            null, events.stream().filter(event -> event.getName().equals("RoughDraftApprovalRequested")).findFirst().get()
         );
 
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
-            "Rough draft sent to reviewer for approval",
-            "Rough draft approved by reviewer.",
-            milestonePhaseTemplate2,
-            null
-        );
-        createMileStone(
-            MilestoneActivityTemplate.Type.PROJECT,
-            "Rough draft approved by reviewer",
+            "Rough draft approved by reviewer (Auto)",
             "Rough draft approved.",
             milestonePhaseTemplate2,
-            null
+            null, events.stream().filter(event -> event.getName().equals("Step.ROUGH_DRAFT_APPROVAL")).findFirst().get()
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
-            "Peer review 1",
+            "Peer review 1 (Auto)",
             "This is a recommendation of when to perform peer review 1.",
             milestonePhaseTemplate2,
-            MilestoneActivityTemplate.PEER_REVIEW_ONE
+            MilestoneActivityTemplate.PEER_REVIEW_ONE,
+                null
         );
 
         createMileStone(
@@ -2054,14 +2063,14 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
             "Result and discussion completed and approved",
             "Result and discussion.",
             milestonePhaseTemplate3,
-            null
+            null, null
         );
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
             "Peer review 2",
             "This is a recommendation of when to perform peer review 2.",
             milestonePhaseTemplate3,
-            MilestoneActivityTemplate.PEER_REVIEW_TWO
+            MilestoneActivityTemplate.PEER_REVIEW_TWO, null
         );
 
         createMileStone(
@@ -2069,42 +2078,42 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
             "Thesis approved for final seminar presentation",
             "Thesis approved for final seminar.",
             milestonePhaseTemplate4,
-            null
+            null, null
         );
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Final seminar created",
             "Creation of final seminar.",
             milestonePhaseTemplate4,
-            MilestoneActivityTemplate.CREATE_SEMINAR
+            MilestoneActivityTemplate.CREATE_SEMINAR, null
         );
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Final seminar thesis uploaded",
             "Final seminar thesis uploaded.",
             milestonePhaseTemplate4,
-            MilestoneActivityTemplate.THESIS_UPLOADED
+            MilestoneActivityTemplate.THESIS_UPLOADED, null
         );
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
             "Perform an oral and written opposition",
             "Opposition.",
             milestonePhaseTemplate4,
-            null
+            null, null
         );
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
             "Active participation in a final seminar",
             "Active participation.",
             milestonePhaseTemplate4,
-            null
+            null, null
         );
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
             "Defend the thesis in a final seminar",
             "Defence of final thesis.",
             milestonePhaseTemplate4,
-            null
+            null, null
         );
 
         createMileStone(
@@ -2112,28 +2121,28 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
             "Revised final thesis of the submitted thesis",
             "Revised final thesis.",
             milestonePhaseTemplate5,
-            null
+            null, null
         );
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Originality report approved",
             "Originality report.",
             milestonePhaseTemplate5,
-            null
+            null, null
         );
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Supervisor and reviewer final grading report submitted",
             "Final grading report.",
             milestonePhaseTemplate5,
-            null
+            null, null
         );
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
             "Grading completed",
             "Grading completed by examiner.",
             milestonePhaseTemplate5,
-            null
+            null, null
         );
     }
 
@@ -2142,7 +2151,8 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
         String title,
         String description,
         MilestonePhaseTemplate milestonePhaseTemplate,
-        String code
+        String code,
+        Event event
     ) {
         MilestoneActivityTemplate milestoneActivityTemplate = new MilestoneActivityTemplate(type, title, description);
         milestoneActivityTemplate.addProjectType(bachelorClass);
@@ -2150,6 +2160,7 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
         milestoneActivityTemplate.addProjectType(magisterClass);
         milestoneActivityTemplate.setMilestonePhaseTemplate(milestonePhaseTemplate);
         milestoneActivityTemplate.setCode(code);
+        milestoneActivityTemplate.setActivatedBy(event);
         milestoneActivityTemplateService.save(milestoneActivityTemplate, milestonePhaseTemplate);
     }