Fix server discovery tests.

Fix some mistakes made when merging.