Manage service update

And fix some tests