Clean up new ExternalServices during tests
Add basic external_services_controller (sso)