Temporary fix for server test suite.
wip...
wip...
wip...
wip...