fix expected arguments and assertions.
fix tests. missing service name