Prevent circular imports
Refactor plugin reset to fix unit tests

setting_changed was being connected to too late, and missing the signal