Fixed unit tests and classloader return value
Added switch to disable/enable discovery
Merge branch 'UnitTests' into ProvidersSupport
Added provider handling methods + unit tests