added server-id method
adjusted tests and docs
only fill version when defined