Fixing the service finder
Adding tests for Services API