Adding discovery service and tests.