Fix tests, allow removal of current widget.

[#55215004]