Fix tests for not implemented servus

More fixes are needed
I feel better to use the standard as much as I can do.