Merge "Unit test for asserting correct url in list_services"