Update DB and add several tests