Update tests for the resolution disablement settings and for plugin deps.
Minor refactoring.