Merge pull request #2 from jvandesande/UnitTests

Fixed unit tests and classloader return value
Merge pull request #3 from jvandesande/DiscoverySwitch

Added switch to disable/enable discovery
Added provider handling methods + unit tests