         
         let flashcard = flashcards[0]
         
-        let flashcardById = manager.flashcard(withId: flashcard.id)
+        let flashcardById = manager.flashcard(withId: flashcard.serverID)
         
         XCTAssertNotNil(flashcardById,"Receiving added flashcard by id, must not be nil")
         
-        let newCard = Flashcard(id: "xxxxxz", deckId: "xxxx", question: "question", answer: "answer", tip: nil)
+        let newCard = Flashcard(serverID: "xxxxxz", deckId: "xxxx", question: "question", answer: "answer", tip: nil)
         
-        let newCardById = manager.flashcard(withId: newCard.id)
+        let newCardById = manager.flashcard(withId: newCard.serverID)
         
         XCTAssertNil(newCardById, "Manager doesn't contain newCard so it must not be able to find it by id")
         

        
        let _ = try? manager.removeFlashcard(flashcard)
        
        let foundCard = manager.flashcard(withId: flashcard.id)
        
        XCTAssertNil(foundCard, "Flashcard has been removed, manager must not contain it")
        

        let firstDock = docks[0]
        
        self.measureBlock {
            manager.deck(withId: firstDock.serverID)
        }
    }
    
