Simplified the discovery service and removed tests on protected/private methods
Reorganized and completed the discovery service unit tests