Added fixupDelete. Renamed fixup to fixupPut. More tests for deletion (but not complete yet)