More tests - making sure deletions dont mess up id of commitments
fixed merge conflicts