improved server metadata and tests

Change-Id: I8d69c68a83aec32c03d15fceb3b6a2a204730ff7

Signed-off-by: Michael Bolz <michael.bolz@sap.com>