diff --git a/test/Database.hs b/test/Database.hs
index dfe4769a0..0de2da726 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -481,11 +481,11 @@ fillDb = do
   void . insert $ DegreeCourse ffp sdMst sdInf
   void . insert $ Lecturer jost   ffp CourseLecturer
   void . insert $ Lecturer gkleen ffp CourseAssistant
-  adhoc <- insert $ Sheet ffp "AdHoc-Gruppen" Nothing NotGraded (Arbitrary 3) Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
+  adhoc <- insert $ Sheet ffp "AdHoc-Gruppen" Nothing NotGraded (Arbitrary 3) Nothing Nothing (Just now) (Just now) Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
   insert_ $ SheetEdit gkleen now adhoc
-  feste <- insert $ Sheet ffp "Feste Gruppen" Nothing NotGraded RegisteredGroups Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
+  feste <- insert $ Sheet ffp "Feste Gruppen" Nothing NotGraded RegisteredGroups Nothing Nothing (Just now) (Just now) Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
   insert_ $ SheetEdit gkleen now feste
-  keine <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
+  keine <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing (Just now) (Just now) Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
   insert_ $ SheetEdit gkleen now keine
   void . insertMany $ map (\(u,sf) -> CourseParticipant ffp u now sf Nothing)
     [(fhamann   , Nothing)
@@ -623,8 +623,8 @@ fillDb = do
     , sheetGrouping = Arbitrary 3
     , sheetMarkingText = Nothing
     , sheetVisibleFrom = Just now
-    , sheetActiveFrom = now
-    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetActiveFrom = Just now
+    , sheetActiveTo = Just $ (14 * nominalDay) `addUTCTime` now
     , sheetSubmissionMode = SubmissionMode True Nothing
     , sheetHintFrom = Nothing
     , sheetSolutionFrom = Nothing
@@ -667,8 +667,8 @@ fillDb = do
     , sheetGrouping = Arbitrary 3
     , sheetMarkingText = Nothing
     , sheetVisibleFrom = Just now
-    , sheetActiveFrom = now
-    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetActiveFrom = Just now
+    , sheetActiveTo = Just $ (14 * nominalDay) `addUTCTime` now
     , sheetSubmissionMode = SubmissionMode False $ Just UploadSpecific
       { specificFiles = impureNonNull $ Set.fromList
         [ UploadSpecificFile "Aufgabe 1" "exercise_2.1.hs" False
@@ -689,8 +689,8 @@ fillDb = do
     , sheetGrouping = Arbitrary 3
     , sheetMarkingText = Nothing
     , sheetVisibleFrom = Just now
-    , sheetActiveFrom = now
-    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetActiveFrom = Just now
+    , sheetActiveTo = Just $ (14 * nominalDay) `addUTCTime` now
     , sheetSubmissionMode = SubmissionMode False . Just $ UploadAny True defaultExtensionRestriction
     , sheetHintFrom = Nothing
     , sheetSolutionFrom = Nothing
@@ -705,8 +705,8 @@ fillDb = do
     , sheetGrouping = Arbitrary 3
     , sheetMarkingText = Nothing
     , sheetVisibleFrom = Just now
-    , sheetActiveFrom = now
-    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetActiveFrom = Just now
+    , sheetActiveTo = Just $ (14 * nominalDay) `addUTCTime` now
     , sheetSubmissionMode = SubmissionMode False . Just $ UploadAny False Nothing
     , sheetHintFrom = Nothing
     , sheetSolutionFrom = Nothing