some minor server-related test suite cleanups

Just some cleanups - no behavior changes.