Update test coverage

Cover deletion and tree-to-tree diffs
Remarshal and rename flags
braces everywhere