Fix some of the DB unit tests