Adapt Unittests to reflect Xing behaviour