Reformat all services and related tests