Fix tests for not implemented servus

More fixes are needed
idem