Fix tests and implementation for not implemented servus