Cleanup delete form & fix some tests