Fix server unit tests