Fixed server_test.go and commented out non-working code