Fix tests and implementation for not implemented servus

Ok, got it.