diff --git a/dav_events/management/commands/create_test_data.py b/dav_events/management/commands/create_test_data.py
index 8213c2f..eac774d 100644
--- a/dav_events/management/commands/create_test_data.py
+++ b/dav_events/management/commands/create_test_data.py
@@ -130,15 +130,20 @@ class Command(BaseCommand):
             if data_vars:
                 data_set = self._substitute_data_vars(data_set, data_vars)
 
-            if 'first_day_from_today' in data_set:
-                data_set['first_day'] = datetime.date.today() + datetime.timedelta(data_set['first_day_from_today'])
-                del data_set['first_day_from_today']
-            if 'last_day_from_today' in data_set:
-                data_set['last_day'] = datetime.date.today() + datetime.timedelta(data_set['last_day_from_today'])
-                del data_set['last_day_from_today']
-            if 'deadline_from_today' in data_set:
-                data_set['deadline'] = datetime.date.today() + datetime.timedelta(data_set['deadline_from_today'])
-                del data_set['deadline_from_today']
+            for date_key in ('first_day', 'last_day', 'alt_first_day', 'alt_last_day', 'deadline'):
+                k = '{}_from_today'.format(date_key)
+                if k in data_set:
+                    d = datetime.date.today() + datetime.timedelta(data_set[k])
+                    data_set[date_key] = d
+                    del data_set[k]
+            if 'pre_meeting_1_from_today' in data_set:
+                day = datetime.date.today() + datetime.timedelta(data_set['pre_meeting_1_from_today'])
+                data_set['pre_meeting_1'] = datetime.datetime.combine(day, datetime.time(19, 30))
+                del data_set['pre_meeting_1_from_today']
+            if 'pre_meeting_2_from_today' in data_set:
+                day = datetime.date.today() + datetime.timedelta(data_set['pre_meeting_2_from_today'])
+                data_set['pre_meeting_2'] = datetime.datetime.combine(day, datetime.time(19, 30))
+                del data_set['pre_meeting_2_from_today']
 
             status_updates = []
             if 'status_updates' in data_set:
diff --git a/etc/test_data.json b/etc/test_data.json
index e26a85a..ef6de14 100644
--- a/etc/test_data.json
+++ b/etc/test_data.json
@@ -83,6 +83,11 @@
       "sport": "W",
       "level": "beginner",
       "country": "DE",
+      "terrain": "submountains",
+      "location": "Pfälzerwald",
+      "transport": "public",
+      "meeting_point": "hbf",
+      "meeting_time": "08:00:00",
       "trainer_firstname": "Distanztrainer",
       "trainer_familyname": "für Wanderungen",
       "trainer_email": "{TRAINER_WEIT}",
@@ -182,12 +187,19 @@
       "status_updates": ["submitted", "accepted", "published"]
     },
     {
-      "title": "Geführte Familien Bergtour",
+      "title": "Geführte Familien-Bergtour",
       "description": "TEST!",
       "mode": "guided",
       "sport": "B",
       "level": "family",
       "country": "AT",
+      "location": "Wilder Kaiser",
+      "meeting_point": "OTHER",
+      "meeting_point_other": "Parkplatz Wochenbrunner Alm",
+      "meeting_time": "07:30:00",
+      "transport": "self",
+      "accommodation": "hut",
+      "meals": "vp",
       "min_participants": 2,
       "max_participants": 4,
       "registration_required": true,
@@ -197,7 +209,75 @@
       "trainer_email": "{TRAINER_HOCH}",
       "first_day_from_today": 4,
       "last_day_from_today": 6,
+      "pre_meeting_1_from_today": 3,
       "status_updates": ["submitted", "accepted", "published"]
+    },
+    {
+      "title": "Begleitete Hochtour",
+      "description": "TEST!",
+      "mode": "supervised",
+      "sport": "B",
+      "level": "advanced",
+      "country": "CH",
+      "location": "Wallis",
+      "min_participants": 2,
+      "max_participants": 2,
+      "registration_required": true,
+      "deadline_from_today": 0,
+      "trainer_firstname": "Höhentrainer",
+      "trainer_familyname": "für Bergsteigen",
+      "trainer_email": "{TRAINER_HOCH}",
+      "first_day_from_today": 6,
+      "alt_first_day_from_today": 8,
+      "last_day_from_today": 7,
+      "alt_last_day_from_today": 9,
+      "pre_meeting_1_from_today": 5,
+      "status_updates": ["submitted", "accepted", "published"]
+    },
+    {
+      "title": "Familienklettertour",
+      "description": "TEST!",
+      "mode": "joint",
+      "sport": "K",
+      "level": "family",
+      "country": "DE",
+      "location": "Battert",
+      "registration_required": true,
+      "trainer_firstname": "Höhentrainer",
+      "trainer_familyname": "für Klettern",
+      "trainer_email": "{TRAINER_HOCH}",
+      "first_day_from_today": 5,
+      "status_updates": ["submitted", "accepted", "published"]
+    },
+    {
+      "title": "Skikurs",
+      "description": "TEST!",
+      "mode": "training",
+      "sport": "S",
+      "level": "advanced",
+      "country": "DE",
+      "location": "Mehliskopf",
+      "registration_required": true,
+      "trainer_firstname": "Distanztrainer",
+      "trainer_familyname": "für Ski",
+      "trainer_email": "{TRAINER_WEIT}",
+      "first_day_from_today": -10,
+      "status_updates": ["submitted", "accepted", "published"]
+    },
+    {
+      "title": "Skikurs",
+      "description": "TEST!",
+      "mode": "training",
+      "sport": "S",
+      "level": "advanced",
+      "country": "DE",
+      "location": "Mehliskopf",
+      "registration_required": true,
+      "trainer_firstname": "Distanztrainer",
+      "trainer_familyname": "für Ski",
+      "trainer_email": "{TRAINER_WEIT}",
+      "first_day_from_today": 10,
+      "status_updates": ["submitted", "accepted", "published", "canceled"]
     }
   ]
 }