Updated Db tests