Fix soft_delete bugs and update one buddy test