         XCTAssertEqual(tinna.color, "lightgray", "Should be able to return the first record with given attributes.")
     }
     
-    // MARK: Finding All
+    func testFirstWithAttributesGeneric() {
+        let tinnaAttributes = ["name" : "Tinna", "color" : "lightgray"]
+        let tinna: Animal = Animal.firstWithAttributes(tinnaAttributes)!
+        XCTAssertEqual(tinna.color, "lightgray", "Should be able to return the first record with given attributes.")
+    }
+    
+    // MARK: Find All
     
     func testAll() {
         let animals = Animal.all()
         XCTAssertEqual(animals!.count, 7, "Should be able to return all records of entity.")
+    }
+    
+    func testAllGeneric() {
+        let animals: [Animal] = Animal.all()!
+        XCTAssertEqual(animals.count, 7, "Should be able to return all records of entity.")
     }
     
     func testAllWithPredicate() {

        XCTAssertEqual(whiteAnimals!.count, 2, "Should be able to return all records for given attributes and OR predicate type.")
    }
    
    // MARK: Deleting
    
    func testDelete() {
        let sortDescriptor = NSSortDescriptor(key: "name", ascending: true)

        XCTAssertEqual(yellowAnimals!.count, 2, "Should be able to return all records for given predicate.")
    }
    
    func testAllWithPredicateGeneric() {
        let predicate = NSPredicate(format: "color == %@", "yellow")
        let yellowAnimals: [Animal] = Animal.allWithPredicate(predicate)!
        XCTAssertEqual(yellowAnimals.count, 2, "Should be able to return all records for given predicate.")
    }
    
    func testAllWithAttribute() {
        let whiteAnimals = Animal.allWithAttribute("color", value: "white")
        XCTAssertEqual(whiteAnimals!.count, 2, "Should be able to return all records for given attribute.")
    }
    
    func testAllWithAttributeGeneric() {
        let whiteAnimals: [Animal] = Animal.allWithAttribute("color", value: "white")!
        XCTAssertEqual(whiteAnimals.count, 2, "Should be able to return all records for given attribute.")
    }
    
    func testAllWithAttributes() {
        let whiteAttributes = ["name" : "Villy", "color" : "white"]
        
