Type the return type of services
Update the testsuite with services typing