Fixing merge conflict

api/web_socket_test.go

@@ -116,12 +116,3 @@ func TestSocket(t *testing.T) {
 
 	time.Sleep(2 * time.Second)
 }
-
-func TestZZWebSocketTearDown(t *testing.T) {
-	// *IMPORTANT* - Kind of hacky
-	// This should be the last function in any test file
-	// that calls Setup()
-	// Should be in the last file too sorted by name
-	time.Sleep(2 * time.Second)
-	TearDown()
-}