test_plugin_resource_watcher speedups and improvements