Remove underscore from tests' service methods