Makes server unit tests pass again.