fix some test server cleanups