 			let firstNoteIndex = 0
 			let firstMeasureIndex = 7
 			try staff.startTieFromNoteAtIndex(firstNoteIndex, inMeasureAtIndex: firstMeasureIndex)
-			let firstMeasure = (staff.notesHolders[firstMeasureIndex] as! MeasureRepeat).measures[0]
+			let firstMeasure = (staff.notesHolders[6] as! MeasureRepeat).measures[0]
 			let firstNote = firstMeasure.notes[firstNoteIndex] as! Note
 			let secondNote = firstMeasure.notes[firstNoteIndex + 1] as! Note
 			XCTAssert(firstNote.tie == .Begin)

	
	func testMeasureAtIndexForMeasureThatRepeats() {
		do {
			let measureThatRepeats = try staff.measureAtIndex(5) as! RepeatedMeasure
			let measureRepeat = staff.notesHolders[5] as! MeasureRepeat
			XCTAssertEqual(measureThatRepeats, measureRepeat.expand()[0] as? RepeatedMeasure)
		} catch {
			XCTFail(String(error))
		}

	
	// MARK: Successes
	
	func testNotesHolderAtIndexForFirstMeasureThatIsRepeated() {
		do {
			let actual = try staff.notesHolderAtIndex(5)
            let expected = staff.notesHolders[5]
            XCTAssertEqual(actual as? MeasureRepeat, expected as? MeasureRepeat)
		} catch {
			XCTFail(String(error))
		}
	}

    func testNotesHolderAtIndexForSecondMeasureThatIsRepeated() {
        do {
            let actual = try staff.notesHolderAtIndex(8)
            let expected = staff.notesHolders[7]
            XCTAssertEqual(actual as? MeasureRepeat, expected as? MeasureRepeat)
        } catch {
            XCTFail(String(error))
        }
    }

    func testNotesHolderAtIndexForRepeatedMeasureInFirstRepeat() {
        do {
            let actual = try staff.notesHolderAtIndex(6)
            let expected = staff.notesHolders[5]
            XCTAssertEqual(actual as? MeasureRepeat, expected as? MeasureRepeat)
        } catch {
            XCTFail(String(error))
        }
    }

    func testNotesHolderAtIndexForRepeatedMeasureInSecondRepeat() {
        do {
            let actual = try staff.notesHolderAtIndex(12)
            let expected = staff.notesHolders[7]
            XCTAssertEqual(actual as? MeasureRepeat, expected as? MeasureRepeat)
        } catch {
            XCTFail(String(error))
        }
    }
	
	func testNotesHolderAtIndexForRegularMeasure() {
		do {
			let actual = try staff.notesHolderAtIndex(0)
            let expected = staff.notesHolders[0]
			XCTAssertEqual(actual as? Measure, expected as? Measure)
		} catch {
			XCTFail(String(error))
		}
