                         "wednesday" : [["21:00", "2:00"]]]
         let actual = OpenHours.fromFirebaseValue(firebase)
 
-        let monExpected = (open: getNormalizedDate(forHour: 7, forMin: 0)!,
-                           close: getNormalizedDate(forHour: 14, forMin: 30)!)
-        let tuesExpected = (open: getNormalizedDate(forHour: 21, forMin: 0)!,
-                            close: getNormalizedDate(forHour: 22, forMin: 0)!)
-        let wedExpected = (open: getNormalizedDate(forHour: 21, forMin: 0)!,
-                           close: getNormalizedDate(forHour: 2, forMin: 0, isTomorrow: true)!)
+        var openingDateComponents = DateComponents()
+        openingDateComponents.hour = 7
+        openingDateComponents.minute = 0
+        var closingDateComponents = DateComponents()
+        closingDateComponents.hour = 14
+        closingDateComponents.minute = 30
+        let monExpected = (openTime: openingDateComponents,
+                           closeTime: closingDateComponents)
+
+        openingDateComponents.hour = 21
+        closingDateComponents.hour = 22
+        closingDateComponents.minute = 0
+        let tuesExpected = (openTime: openingDateComponents,
+                            closeTime: closingDateComponents)
+
+        closingDateComponents.hour = 2
+        let wedExpected = (openTime: openingDateComponents,
+                            closeTime: closingDateComponents)
         let expected = OpenHours(hours: [DayOfWeek.monday : monExpected,
                                          DayOfWeek.tuesday : tuesExpected,
                                          DayOfWeek.wednesday : wedExpected])

        XCTAssertNotNil(actual)
        assertEquals(actual!, expected)

        // Time comparisons
        for day in actual!.hours.keys {
            let (open, close) = actual!.hours[day]!
            XCTAssertLessThan(open, close)
        }
    }

    // Date is normalized to allow simple time comparisons, like OpenHours' stored dates.

        for dayOfWeek in expected.hours.keys {
            let (actualOpen, actualClose) = actual.hours[dayOfWeek]!
            let (expectedOpen, expectedClose) = expected.hours[dayOfWeek]!
            XCTAssertEqual(actualOpen.hour, expectedOpen.hour)
            XCTAssertEqual(actualOpen.minute, expectedOpen.minute)
            XCTAssertEqual(actualClose.hour, expectedClose.hour)
            XCTAssertEqual(actualClose.minute, expectedClose.minute)
        }
    }

