updated with test of all the services