             ("C", 3)
         ]
         
-        XCTAssertTrue(OrderedDictionary(elements: elements) == self.orderedDictionary)
+        XCTAssertTrue(OrderedDictionary(elements: elements) == orderedDictionary)
     }
     
     func testElementsGenerator() {
-        for entry in self.orderedDictionary.enumerate() {
-            XCTAssertEqual(self.orderedDictionary[entry.index].0, entry.element.0)
-            XCTAssertEqual(self.orderedDictionary[entry.index].1, entry.element.1)
+        for entry in orderedDictionary.enumerate() {
+            XCTAssertEqual(orderedDictionary[entry.index].0, entry.element.0)
+            XCTAssertEqual(orderedDictionary[entry.index].1, entry.element.1)
         }
     }
     
     func testOrderedKeysAndValues() {
-        XCTAssertEqual(self.orderedDictionary.orderedKeys, ["A", "B", "C"])
-        XCTAssertEqual(self.orderedDictionary.orderedValues, [1, 2, 3])
+        XCTAssertEqual(orderedDictionary.orderedKeys, ["A", "B", "C"])
+        XCTAssertEqual(orderedDictionary.orderedValues, [1, 2, 3])
     }
     
     // ======================================================= //

    // ======================================================= //
    
    func testKeyBasedSubscript() {
        self.orderedDictionary["A"] = 5
        self.orderedDictionary["D"] = 10
        self.orderedDictionary["B"] = nil
        
        XCTAssertEqual(self.orderedDictionary.count, 3)
        
        XCTAssertEqual(self.orderedDictionary["A"], 5)
        XCTAssertEqual(self.orderedDictionary.indexForKey("A"), 0)
        XCTAssertTrue(self.orderedDictionary.containsKey("A"))
        
        XCTAssertNil(self.orderedDictionary["B"])
        XCTAssertNil(self.orderedDictionary.indexForKey("B"))
        XCTAssertFalse(self.orderedDictionary.containsKey("B"))
        
        XCTAssertEqual(self.orderedDictionary["C"], 3)
        XCTAssertEqual(self.orderedDictionary.indexForKey("C"), 1)
        XCTAssertTrue(self.orderedDictionary.containsKey("C"))
        
        XCTAssertEqual(self.orderedDictionary["D"], 10)
        XCTAssertEqual(self.orderedDictionary.indexForKey("D"), 2)
        XCTAssertTrue(self.orderedDictionary.containsKey("D"))
    }
    
    // ======================================================= //

    // ======================================================= //
    
    func testInitializedContent() {
        XCTAssertEqual(orderedDictionary.count, 3)
        
        XCTAssertEqual(orderedDictionary["A"], 1)
        XCTAssertEqual(orderedDictionary.indexForKey("A"), 0)
        XCTAssertTrue(orderedDictionary.containsKey("A"))
        
        XCTAssertEqual(orderedDictionary["B"], 2)
        XCTAssertEqual(orderedDictionary.indexForKey("B"), 1)
        XCTAssertTrue(orderedDictionary.containsKey("B"))
        
        XCTAssertEqual(orderedDictionary["C"], 3)
        XCTAssertEqual(orderedDictionary.indexForKey("C"), 2)
        XCTAssertTrue(orderedDictionary.containsKey("C"))
    }
    
    func testInitializationUsingPairs() {
