fixed races conditions found in server_test.go