             XCTFail("Could not test class at index 6")
         }
         
-        // Test the class at index 8 (note same start and end dates)
+        // Test the class at index 8
         if(classes.count > 8) {
+            let startDate = dateFormatter.dateFromString("03.09.2014 13:10")
+            let endDate = dateFormatter.dateFromString("03.09.2014 13:55")
             XCTAssertEqual(classes[8].course, "Stærðfræði I", "The course name of the class at index 8 should be Stærðfræði I")
             XCTAssertEqual(classes[8].type, ClassType.Discussion, "The class at index 8 should be a discussion class")
             XCTAssertEqual(classes[8].location, "V105", "The location of the course at index 8 should be V105")
-            XCTAssertEqual(classes[8].startDate, startDate!, "The class at index 8 should start at 02.09.2014 13:10")
+            XCTAssertEqual(classes[8].startDate, startDate!, "The class at index 8 should start at 03.09.2014 13:10")
             XCTAssertEqual(classes[8].endDate, endDate!, "The class at index 8 should end at 02.09.2014 13:55")
         } else {
             XCTFail("Could not test class at index 8")

        // Test if all classes were parsed
        XCTAssertEqual(classes.count, 22, "There should be 22 classes")
        
        // Create dates
        let dateFormatter = NSDateFormatter()
        dateFormatter.dateFormat = "dd.MM.yyyy HH:mm"
        let startDate = dateFormatter.dateFromString("02.09.2014 13:10")
        let endDate = dateFormatter.dateFromString("02.09.2014 13:55")
        
        // Test the class at index 6
        if(classes.count > 6) {
            XCTAssertEqual(classes[6].course, "Tölvusamskipti", "The course name of the class at index 6 should be Tölvusamskipti")
            XCTAssertEqual(classes[6].type, ClassType.Lecture, "The course at index 6 should be a lecture")
            XCTAssertEqual(classes[6].location, "V201", "The location of the course at index 6 should be V201")

        
        // Test the class at index 6
        if(classes.count > 6) {
            let startDate = dateFormatter.dateFromString("11.04.2014 15:45")
            let endDate = dateFormatter.dateFromString("11.04.2014 16:30")
            XCTAssertEqual(classes[6].course, "Hugbúnaðarfræði II", "The course name of the class (exam) at index 6 should be Hugbúnaðarfræði II")
            XCTAssertEqual(classes[6].type, ClassType.Exam, "The class (exam) at index 6 should have the type Exam")
            XCTAssertEqual(classes[6].location, "M101", "The class (exam) at index 6 should have the location M101")
