fix deletions and squashing
test suite