Fix tests for not implemented servus

More fixes are needed
Yes, I forgot to say that explicitly