Fix bugs in tests and in server config.