Complete the list of DB calls
Fix test