More serverTester test cleanup