Batch inserts
Clean tests + improve update