Update tests
Avoid nil if service returns it