Tests: update wrt service typing