patched up server unit tests