agent: remove special case of consul service, adjust tests