Tidy up the SelectServer tests a bit more.