Test and fix delete