Fix test related to finding the API url via the Query; in these test we're testing the Lookup, not the Query so remove it and create a Lookup then find the url
Fix use of query#url in Cli class; find the selected service and use this to create a Lookup rather than relying on the Query