improving Loading of plugins (+tests)