diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs
index 3e84824aea..522b80973e 100644
--- a/Database/ContentIdentifier.hs
+++ b/Database/ContentIdentifier.hs
@@ -94,7 +94,7 @@ flushDbQueue (ContentIdentifierHandle h) = H.flushDbQueue h
 -- Be sure to also update the git-annex branch when using this.
 recordContentIdentifier :: ContentIdentifierHandle -> RemoteStateHandle -> ContentIdentifier -> Key -> IO ()
 recordContentIdentifier h (RemoteStateHandle u) cid k = queueDb h $ do
-	void $ insert_ $ ContentIdentifiers u cid k
+	void $ insertUnique $ ContentIdentifiers u cid k
 
 getContentIdentifiers :: ContentIdentifierHandle -> RemoteStateHandle -> Key -> IO [ContentIdentifier]
 getContentIdentifiers (ContentIdentifierHandle h) (RemoteStateHandle u) k = 
diff --git a/Test.hs b/Test.hs
index be15365352..e6d4cc9b12 100644
--- a/Test.hs
+++ b/Test.hs
@@ -148,9 +148,9 @@ tests crippledfilesystem adjustedbranchok opts =
 		map (\(d, te) -> withTestMode te initTests (unitTests d)) testmodes
   where
 	testmodes = catMaybes
-		[ canadjust ("v7 adjusted unlocked branch", (testMode opts (RepoVersion 7)) { adjustedUnlockedBranch = True })
-		, unlesscrippled ("v7 unlocked", (testMode opts (RepoVersion 7)) { unlockedFiles = True })
-		, unlesscrippled ("v7 locked", testMode opts (RepoVersion 7))
+		[ canadjust ("v8 adjusted unlocked branch", (testMode opts (RepoVersion 8)) { adjustedUnlockedBranch = True })
+		, unlesscrippled ("v8 unlocked", (testMode opts (RepoVersion 8)) { unlockedFiles = True })
+		, unlesscrippled ("v8 locked", testMode opts (RepoVersion 8))
 		]
 	unlesscrippled v
 		| crippledfilesystem = Nothing
diff --git a/doc/todo/sqlite_database_improvements.mdwn b/doc/todo/sqlite_database_improvements.mdwn
index 0ccbbb3b1b..aee3bf6633 100644
--- a/doc/todo/sqlite_database_improvements.mdwn
+++ b/doc/todo/sqlite_database_improvements.mdwn
@@ -65,8 +65,6 @@ process.
 
 remaining todo:
 
-* test all changed types in Database.Types serialize and deserialize
-  correctly
 * migration
 
 > Investigated this in more detail, and I can't find a way to