From 97b7578ccd783b893917c17f002719fd1313ba7c Mon Sep 17 00:00:00 2001
From: Frank Schroeder <frank.schroeder@gmail.com>
Date: Fri, 30 Jun 2017 22:58:55 +0200
Subject: [PATCH] api: refactor: prefix all API tests with API_

---
 api/acl_test.go                | 10 ++++-----
 api/agent_test.go              | 40 +++++++++++++++++-----------------
 api/api_test.go                | 14 ++++++------
 api/catalog_test.go            | 20 ++++++++---------
 api/coordinate_test.go         |  4 ++--
 api/event_test.go              |  2 +-
 api/health_test.go             | 16 +++++++-------
 api/kv_test.go                 | 18 +++++++--------
 api/lock_test.go               | 18 +++++++--------
 api/operator_autopilot_test.go |  6 ++---
 api/operator_keyring_test.go   |  2 +-
 api/operator_raft_test.go      |  4 ++--
 api/prepared_query_test.go     |  2 +-
 api/semaphore_test.go          | 18 +++++++--------
 api/session_test.go            | 14 ++++++------
 api/snapshot_test.go           |  4 ++--
 api/status_test.go             |  4 ++--
 17 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/api/acl_test.go b/api/acl_test.go
index e8a3e6d87..e88040995 100644
--- a/api/acl_test.go
+++ b/api/acl_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-func TestACL_CreateDestroy(t *testing.T) {
+func TestAPI_ACL_CreateDestroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeACLClient(t)
 	defer s.Stop()
@@ -49,7 +49,7 @@ func TestACL_CreateDestroy(t *testing.T) {
 	}
 }
 
-func TestACL_CloneDestroy(t *testing.T) {
+func TestAPI_ACL_CloneDestroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeACLClient(t)
 	defer s.Stop()
@@ -79,7 +79,7 @@ func TestACL_CloneDestroy(t *testing.T) {
 	}
 }
 
-func TestACL_Info(t *testing.T) {
+func TestAPI_ACL_Info(t *testing.T) {
 	t.Parallel()
 	c, s := makeACLClient(t)
 	defer s.Stop()
@@ -103,7 +103,7 @@ func TestACL_Info(t *testing.T) {
 	}
 }
 
-func TestACL_List(t *testing.T) {
+func TestAPI_ACL_List(t *testing.T) {
 	t.Parallel()
 	c, s := makeACLClient(t)
 	defer s.Stop()
@@ -127,7 +127,7 @@ func TestACL_List(t *testing.T) {
 	}
 }
 
-func TestACL_Replication(t *testing.T) {
+func TestAPI_ACL_Replication(t *testing.T) {
 	t.Parallel()
 	c, s := makeACLClient(t)
 	defer s.Stop()
diff --git a/api/agent_test.go b/api/agent_test.go
index c0997e58b..c57da2e63 100644
--- a/api/agent_test.go
+++ b/api/agent_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/serf/serf"
 )
 
-func TestAgent_Self(t *testing.T) {
+func TestAPI_Agent_Self(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -28,7 +28,7 @@ func TestAgent_Self(t *testing.T) {
 	}
 }
 
-func TestAgent_Reload(t *testing.T) {
+func TestAPI_Agent_Reload(t *testing.T) {
 	t.Parallel()
 
 	// Create our initial empty config file, to be overwritten later
@@ -70,7 +70,7 @@ func TestAgent_Reload(t *testing.T) {
 	}
 }
 
-func TestAgent_Members(t *testing.T) {
+func TestAPI_Agent_Members(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -87,7 +87,7 @@ func TestAgent_Members(t *testing.T) {
 	}
 }
 
-func TestAgent_Services(t *testing.T) {
+func TestAPI_Agent_Services(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -132,7 +132,7 @@ func TestAgent_Services(t *testing.T) {
 	}
 }
 
-func TestAgent_Services_CheckPassing(t *testing.T) {
+func TestAPI_Agent_Services_CheckPassing(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -176,7 +176,7 @@ func TestAgent_Services_CheckPassing(t *testing.T) {
 	}
 }
 
-func TestAgent_Services_CheckBadStatus(t *testing.T) {
+func TestAPI_Agent_Services_CheckBadStatus(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -196,7 +196,7 @@ func TestAgent_Services_CheckBadStatus(t *testing.T) {
 	}
 }
 
-func TestAgent_ServiceAddress(t *testing.T) {
+func TestAPI_Agent_ServiceAddress(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -243,7 +243,7 @@ func TestAgent_ServiceAddress(t *testing.T) {
 	}
 }
 
-func TestAgent_EnableTagOverride(t *testing.T) {
+func TestAPI_Agent_EnableTagOverride(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -286,7 +286,7 @@ func TestAgent_EnableTagOverride(t *testing.T) {
 	}
 }
 
-func TestAgent_Services_MultipleChecks(t *testing.T) {
+func TestAPI_Agent_Services_MultipleChecks(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -330,7 +330,7 @@ func TestAgent_Services_MultipleChecks(t *testing.T) {
 	}
 }
 
-func TestAgent_SetTTLStatus(t *testing.T) {
+func TestAPI_Agent_SetTTLStatus(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -414,7 +414,7 @@ func TestAgent_SetTTLStatus(t *testing.T) {
 	}
 }
 
-func TestAgent_Checks(t *testing.T) {
+func TestAPI_Agent_Checks(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -446,7 +446,7 @@ func TestAgent_Checks(t *testing.T) {
 	}
 }
 
-func TestAgent_CheckStartPassing(t *testing.T) {
+func TestAPI_Agent_CheckStartPassing(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -481,7 +481,7 @@ func TestAgent_CheckStartPassing(t *testing.T) {
 	}
 }
 
-func TestAgent_Checks_serviceBound(t *testing.T) {
+func TestAPI_Agent_Checks_serviceBound(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -527,7 +527,7 @@ func TestAgent_Checks_serviceBound(t *testing.T) {
 	}
 }
 
-func TestAgent_Checks_Docker(t *testing.T) {
+func TestAPI_Agent_Checks_Docker(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -571,7 +571,7 @@ func TestAgent_Checks_Docker(t *testing.T) {
 	}
 }
 
-func TestAgent_Join(t *testing.T) {
+func TestAPI_Agent_Join(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -591,7 +591,7 @@ func TestAgent_Join(t *testing.T) {
 	}
 }
 
-func TestAgent_Leave(t *testing.T) {
+func TestAPI_Agent_Leave(t *testing.T) {
 	t.Parallel()
 	c1, s1 := makeClient(t)
 	defer s1.Stop()
@@ -626,7 +626,7 @@ func TestAgent_Leave(t *testing.T) {
 	}
 }
 
-func TestAgent_ForceLeave(t *testing.T) {
+func TestAPI_Agent_ForceLeave(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -640,7 +640,7 @@ func TestAgent_ForceLeave(t *testing.T) {
 	}
 }
 
-func TestAgent_Monitor(t *testing.T) {
+func TestAPI_Agent_Monitor(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -663,7 +663,7 @@ func TestAgent_Monitor(t *testing.T) {
 	}
 }
 
-func TestServiceMaintenance(t *testing.T) {
+func TestAPI_ServiceMaintenance(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -718,7 +718,7 @@ func TestServiceMaintenance(t *testing.T) {
 	}
 }
 
-func TestNodeMaintenance(t *testing.T) {
+func TestAPI_NodeMaintenance(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/api_test.go b/api/api_test.go
index a7a9445ca..341956c4f 100644
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -72,7 +72,7 @@ func testKey() string {
 		buf[10:16])
 }
 
-func TestDefaultConfig_env(t *testing.T) {
+func TestAPI_DefaultConfig_env(t *testing.T) {
 	t.Parallel()
 	addr := "1.2.3.4:5678"
 	token := "abcd1234"
@@ -150,7 +150,7 @@ func TestDefaultConfig_env(t *testing.T) {
 	}
 }
 
-func TestSetupTLSConfig(t *testing.T) {
+func TestAPI_SetupTLSConfig(t *testing.T) {
 	// A default config should result in a clean default client config.
 	tlsConfig := &TLSConfig{}
 	cc, err := SetupTLSConfig(tlsConfig)
@@ -253,7 +253,7 @@ func TestSetupTLSConfig(t *testing.T) {
 	}
 }
 
-func TestClientTLSOptions(t *testing.T) {
+func TestAPI_ClientTLSOptions(t *testing.T) {
 	t.Parallel()
 	// Start a server that verifies incoming HTTPS connections
 	_, srvVerify := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
@@ -362,7 +362,7 @@ func TestClientTLSOptions(t *testing.T) {
 	})
 }
 
-func TestSetQueryOptions(t *testing.T) {
+func TestAPI_SetQueryOptions(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -402,7 +402,7 @@ func TestSetQueryOptions(t *testing.T) {
 	}
 }
 
-func TestSetWriteOptions(t *testing.T) {
+func TestAPI_SetWriteOptions(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -422,7 +422,7 @@ func TestSetWriteOptions(t *testing.T) {
 	}
 }
 
-func TestRequestToHTTP(t *testing.T) {
+func TestAPI_RequestToHTTP(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -445,7 +445,7 @@ func TestRequestToHTTP(t *testing.T) {
 	}
 }
 
-func TestParseQueryMeta(t *testing.T) {
+func TestAPI_ParseQueryMeta(t *testing.T) {
 	t.Parallel()
 	resp := &http.Response{
 		Header: make(map[string][]string),
diff --git a/api/catalog_test.go b/api/catalog_test.go
index 29a357880..45f3ed15a 100644
--- a/api/catalog_test.go
+++ b/api/catalog_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pascaldekloe/goe/verify"
 )
 
-func TestCatalog_Datacenters(t *testing.T) {
+func TestAPI_Catalog_Datacenters(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -25,7 +25,7 @@ func TestCatalog_Datacenters(t *testing.T) {
 	})
 }
 
-func TestCatalog_Nodes(t *testing.T) {
+func TestAPI_Catalog_Nodes(t *testing.T) {
 	c, s := makeClient(t)
 	defer s.Stop()
 
@@ -59,7 +59,7 @@ func TestCatalog_Nodes(t *testing.T) {
 	})
 }
 
-func TestCatalog_Nodes_MetaFilter(t *testing.T) {
+func TestAPI_Catalog_Nodes_MetaFilter(t *testing.T) {
 	meta := map[string]string{"somekey": "somevalue"}
 	c, s := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
 		conf.NodeMeta = meta
@@ -112,7 +112,7 @@ func TestCatalog_Nodes_MetaFilter(t *testing.T) {
 	})
 }
 
-func TestCatalog_Services(t *testing.T) {
+func TestAPI_Catalog_Services(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -134,7 +134,7 @@ func TestCatalog_Services(t *testing.T) {
 	})
 }
 
-func TestCatalog_Services_NodeMetaFilter(t *testing.T) {
+func TestAPI_Catalog_Services_NodeMetaFilter(t *testing.T) {
 	meta := map[string]string{"somekey": "somevalue"}
 	c, s := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
 		conf.NodeMeta = meta
@@ -175,7 +175,7 @@ func TestCatalog_Services_NodeMetaFilter(t *testing.T) {
 	})
 }
 
-func TestCatalog_Service(t *testing.T) {
+func TestAPI_Catalog_Service(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -201,7 +201,7 @@ func TestCatalog_Service(t *testing.T) {
 	})
 }
 
-func TestCatalog_Service_NodeMetaFilter(t *testing.T) {
+func TestAPI_Catalog_Service_NodeMetaFilter(t *testing.T) {
 	t.Parallel()
 	meta := map[string]string{"somekey": "somevalue"}
 	c, s := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
@@ -230,7 +230,7 @@ func TestCatalog_Service_NodeMetaFilter(t *testing.T) {
 	})
 }
 
-func TestCatalog_Node(t *testing.T) {
+func TestAPI_Catalog_Node(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -261,7 +261,7 @@ func TestCatalog_Node(t *testing.T) {
 	})
 }
 
-func TestCatalog_Registration(t *testing.T) {
+func TestAPI_Catalog_Registration(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -389,7 +389,7 @@ func TestCatalog_Registration(t *testing.T) {
 	})
 }
 
-func TestCatalog_EnableTagOverride(t *testing.T) {
+func TestAPI_Catalog_EnableTagOverride(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/coordinate_test.go b/api/coordinate_test.go
index 0b03d40a3..874dd6278 100644
--- a/api/coordinate_test.go
+++ b/api/coordinate_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/consul/testutil/retry"
 )
 
-func TestCoordinate_Datacenters(t *testing.T) {
+func TestAPI_Coordinate_Datacenters(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -24,7 +24,7 @@ func TestCoordinate_Datacenters(t *testing.T) {
 	})
 }
 
-func TestCoordinate_Nodes(t *testing.T) {
+func TestAPI_Coordinate_Nodes(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/event_test.go b/api/event_test.go
index 894241374..038a6875f 100644
--- a/api/event_test.go
+++ b/api/event_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/consul/testutil/retry"
 )
 
-func TestEvent_FireList(t *testing.T) {
+func TestAPI_Event_FireList(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/health_test.go b/api/health_test.go
index bad3bd7d8..208f1aa3c 100644
--- a/api/health_test.go
+++ b/api/health_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pascaldekloe/goe/verify"
 )
 
-func TestHealth_Node(t *testing.T) {
+func TestAPI_Health_Node(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -36,7 +36,7 @@ func TestHealth_Node(t *testing.T) {
 	})
 }
 
-func TestHealthChecks_AggregatedStatus(t *testing.T) {
+func TestAPI_HealthChecks_AggregatedStatus(t *testing.T) {
 	t.Parallel()
 
 	cases := []struct {
@@ -169,7 +169,7 @@ func TestHealthChecks_AggregatedStatus(t *testing.T) {
 	}
 }
 
-func TestHealth_Checks(t *testing.T) {
+func TestAPI_Health_Checks(t *testing.T) {
 	t.Parallel()
 	c, s := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
 		conf.NodeName = "node123"
@@ -218,7 +218,7 @@ func TestHealth_Checks(t *testing.T) {
 	})
 }
 
-func TestHealth_Checks_NodeMetaFilter(t *testing.T) {
+func TestAPI_Health_Checks_NodeMetaFilter(t *testing.T) {
 	t.Parallel()
 	meta := map[string]string{"somekey": "somevalue"}
 	c, s := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
@@ -255,7 +255,7 @@ func TestHealth_Checks_NodeMetaFilter(t *testing.T) {
 	})
 }
 
-func TestHealth_Service(t *testing.T) {
+func TestAPI_Health_Service(t *testing.T) {
 	c, s := makeClient(t)
 	defer s.Stop()
 
@@ -281,7 +281,7 @@ func TestHealth_Service(t *testing.T) {
 	})
 }
 
-func TestHealth_Service_NodeMetaFilter(t *testing.T) {
+func TestAPI_Health_Service_NodeMetaFilter(t *testing.T) {
 	meta := map[string]string{"somekey": "somevalue"}
 	c, s := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
 		conf.NodeMeta = meta
@@ -310,7 +310,7 @@ func TestHealth_Service_NodeMetaFilter(t *testing.T) {
 	})
 }
 
-func TestHealth_State(t *testing.T) {
+func TestAPI_Health_State(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -330,7 +330,7 @@ func TestHealth_State(t *testing.T) {
 	})
 }
 
-func TestHealth_State_NodeMetaFilter(t *testing.T) {
+func TestAPI_Health_State_NodeMetaFilter(t *testing.T) {
 	t.Parallel()
 	meta := map[string]string{"somekey": "somevalue"}
 	c, s := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
diff --git a/api/kv_test.go b/api/kv_test.go
index 148bcc986..1e103875a 100644
--- a/api/kv_test.go
+++ b/api/kv_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 )
 
-func TestClientPutGetDelete(t *testing.T) {
+func TestAPI_ClientPutGetDelete(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -73,7 +73,7 @@ func TestClientPutGetDelete(t *testing.T) {
 	}
 }
 
-func TestClient_List_DeleteRecurse(t *testing.T) {
+func TestAPI_Client_List_DeleteRecurse(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -128,7 +128,7 @@ func TestClient_List_DeleteRecurse(t *testing.T) {
 	}
 }
 
-func TestClient_DeleteCAS(t *testing.T) {
+func TestAPI_Client_DeleteCAS(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -174,7 +174,7 @@ func TestClient_DeleteCAS(t *testing.T) {
 	}
 }
 
-func TestClient_CAS(t *testing.T) {
+func TestAPI_Client_CAS(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -222,7 +222,7 @@ func TestClient_CAS(t *testing.T) {
 	}
 }
 
-func TestClient_WatchGet(t *testing.T) {
+func TestAPI_Client_WatchGet(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -279,7 +279,7 @@ func TestClient_WatchGet(t *testing.T) {
 	<-doneCh
 }
 
-func TestClient_WatchList(t *testing.T) {
+func TestAPI_Client_WatchList(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -337,7 +337,7 @@ func TestClient_WatchList(t *testing.T) {
 	<-doneCh
 }
 
-func TestClient_Keys_DeleteRecurse(t *testing.T) {
+func TestAPI_Client_Keys_DeleteRecurse(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -387,7 +387,7 @@ func TestClient_Keys_DeleteRecurse(t *testing.T) {
 	}
 }
 
-func TestClient_AcquireRelease(t *testing.T) {
+func TestAPI_Client_AcquireRelease(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -456,7 +456,7 @@ func TestClient_AcquireRelease(t *testing.T) {
 	}
 }
 
-func TestClient_Txn(t *testing.T) {
+func TestAPI_Client_Txn(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/lock_test.go b/api/lock_test.go
index f7c00f58e..3e2ec2391 100644
--- a/api/lock_test.go
+++ b/api/lock_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 )
 
-func TestLock_LockUnlock(t *testing.T) {
+func TestAPI_Lock_LockUnlock(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -69,7 +69,7 @@ func TestLock_LockUnlock(t *testing.T) {
 	}
 }
 
-func TestLock_ForceInvalidate(t *testing.T) {
+func TestAPI_Lock_ForceInvalidate(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -104,7 +104,7 @@ func TestLock_ForceInvalidate(t *testing.T) {
 	}
 }
 
-func TestLock_DeleteKey(t *testing.T) {
+func TestAPI_Lock_DeleteKey(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -146,7 +146,7 @@ func TestLock_DeleteKey(t *testing.T) {
 	}
 }
 
-func TestLock_Contend(t *testing.T) {
+func TestAPI_Lock_Contend(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -199,7 +199,7 @@ func TestLock_Contend(t *testing.T) {
 	}
 }
 
-func TestLock_Destroy(t *testing.T) {
+func TestAPI_Lock_Destroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -268,7 +268,7 @@ func TestLock_Destroy(t *testing.T) {
 	}
 }
 
-func TestLock_Conflict(t *testing.T) {
+func TestAPI_Lock_Conflict(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -306,7 +306,7 @@ func TestLock_Conflict(t *testing.T) {
 	}
 }
 
-func TestLock_ReclaimLock(t *testing.T) {
+func TestAPI_Lock_ReclaimLock(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -374,7 +374,7 @@ func TestLock_ReclaimLock(t *testing.T) {
 	}
 }
 
-func TestLock_MonitorRetry(t *testing.T) {
+func TestAPI_Lock_MonitorRetry(t *testing.T) {
 	t.Parallel()
 	raw, s := makeClient(t)
 	defer s.Stop()
@@ -489,7 +489,7 @@ func TestLock_MonitorRetry(t *testing.T) {
 	}
 }
 
-func TestLock_OneShot(t *testing.T) {
+func TestAPI_Lock_OneShot(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/operator_autopilot_test.go b/api/operator_autopilot_test.go
index 4b476de51..0c95621fb 100644
--- a/api/operator_autopilot_test.go
+++ b/api/operator_autopilot_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/consul/testutil/retry"
 )
 
-func TestOperator_AutopilotGetSetConfiguration(t *testing.T) {
+func TestAPI_Operator_AutopilotGetSetConfiguration(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -36,7 +36,7 @@ func TestOperator_AutopilotGetSetConfiguration(t *testing.T) {
 	}
 }
 
-func TestOperator_AutopilotCASConfiguration(t *testing.T) {
+func TestAPI_Operator_AutopilotCASConfiguration(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -81,7 +81,7 @@ func TestOperator_AutopilotCASConfiguration(t *testing.T) {
 	}
 }
 
-func TestOperator_AutopilotServerHealth(t *testing.T) {
+func TestAPI_Operator_AutopilotServerHealth(t *testing.T) {
 	t.Parallel()
 	c, s := makeClientWithConfig(t, nil, func(c *testutil.TestServerConfig) {
 		c.RaftProtocol = 3
diff --git a/api/operator_keyring_test.go b/api/operator_keyring_test.go
index cec6511f8..d8efd2666 100644
--- a/api/operator_keyring_test.go
+++ b/api/operator_keyring_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/consul/testutil"
 )
 
-func TestOperator_KeyringInstallListPutRemove(t *testing.T) {
+func TestAPI_Operator_KeyringInstallListPutRemove(t *testing.T) {
 	oldKey := "d8wu8CSUrqgtjVsvcBPmhQ=="
 	newKey := "qxycTi/SsePj/TZzCBmNXw=="
 	t.Parallel()
diff --git a/api/operator_raft_test.go b/api/operator_raft_test.go
index f9d242b81..c54fced6f 100644
--- a/api/operator_raft_test.go
+++ b/api/operator_raft_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 )
 
-func TestOperator_RaftGetConfiguration(t *testing.T) {
+func TestAPI_Operator_RaftGetConfiguration(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -22,7 +22,7 @@ func TestOperator_RaftGetConfiguration(t *testing.T) {
 	}
 }
 
-func TestOperator_RaftRemovePeerByAddress(t *testing.T) {
+func TestAPI_Operator_RaftRemovePeerByAddress(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/prepared_query_test.go b/api/prepared_query_test.go
index 703b277a6..f06218001 100644
--- a/api/prepared_query_test.go
+++ b/api/prepared_query_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/consul/testutil/retry"
 )
 
-func TestPreparedQuery(t *testing.T) {
+func TestAPI_PreparedQuery(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/semaphore_test.go b/api/semaphore_test.go
index 1802ab2a0..8a1522678 100644
--- a/api/semaphore_test.go
+++ b/api/semaphore_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 )
 
-func TestSemaphore_AcquireRelease(t *testing.T) {
+func TestAPI_Semaphore_AcquireRelease(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -69,7 +69,7 @@ func TestSemaphore_AcquireRelease(t *testing.T) {
 	}
 }
 
-func TestSemaphore_ForceInvalidate(t *testing.T) {
+func TestAPI_Semaphore_ForceInvalidate(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -104,7 +104,7 @@ func TestSemaphore_ForceInvalidate(t *testing.T) {
 	}
 }
 
-func TestSemaphore_DeleteKey(t *testing.T) {
+func TestAPI_Semaphore_DeleteKey(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -138,7 +138,7 @@ func TestSemaphore_DeleteKey(t *testing.T) {
 	}
 }
 
-func TestSemaphore_Contend(t *testing.T) {
+func TestAPI_Semaphore_Contend(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -191,7 +191,7 @@ func TestSemaphore_Contend(t *testing.T) {
 	}
 }
 
-func TestSemaphore_BadLimit(t *testing.T) {
+func TestAPI_Semaphore_BadLimit(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -222,7 +222,7 @@ func TestSemaphore_BadLimit(t *testing.T) {
 	}
 }
 
-func TestSemaphore_Destroy(t *testing.T) {
+func TestAPI_Semaphore_Destroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -278,7 +278,7 @@ func TestSemaphore_Destroy(t *testing.T) {
 	}
 }
 
-func TestSemaphore_Conflict(t *testing.T) {
+func TestAPI_Semaphore_Conflict(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -316,7 +316,7 @@ func TestSemaphore_Conflict(t *testing.T) {
 	}
 }
 
-func TestSemaphore_MonitorRetry(t *testing.T) {
+func TestAPI_Semaphore_MonitorRetry(t *testing.T) {
 	t.Parallel()
 	raw, s := makeClient(t)
 	defer s.Stop()
@@ -433,7 +433,7 @@ func TestSemaphore_MonitorRetry(t *testing.T) {
 	}
 }
 
-func TestSemaphore_OneShot(t *testing.T) {
+func TestAPI_Semaphore_OneShot(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/session_test.go b/api/session_test.go
index 85bea228e..cb465a05c 100644
--- a/api/session_test.go
+++ b/api/session_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 )
 
-func TestSession_CreateDestroy(t *testing.T) {
+func TestAPI_Session_CreateDestroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -35,7 +35,7 @@ func TestSession_CreateDestroy(t *testing.T) {
 	}
 }
 
-func TestSession_CreateRenewDestroy(t *testing.T) {
+func TestAPI_Session_CreateRenewDestroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -86,7 +86,7 @@ func TestSession_CreateRenewDestroy(t *testing.T) {
 	}
 }
 
-func TestSession_CreateRenewDestroyRenew(t *testing.T) {
+func TestAPI_Session_CreateRenewDestroyRenew(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -140,7 +140,7 @@ func TestSession_CreateRenewDestroyRenew(t *testing.T) {
 	}
 }
 
-func TestSession_CreateDestroyRenewPeriodic(t *testing.T) {
+func TestAPI_Session_CreateDestroyRenewPeriodic(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -194,7 +194,7 @@ func TestSession_CreateDestroyRenewPeriodic(t *testing.T) {
 	}
 }
 
-func TestSession_Info(t *testing.T) {
+func TestAPI_Session_Info(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -248,7 +248,7 @@ func TestSession_Info(t *testing.T) {
 	}
 }
 
-func TestSession_Node(t *testing.T) {
+func TestAPI_Session_Node(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -283,7 +283,7 @@ func TestSession_Node(t *testing.T) {
 	}
 }
 
-func TestSession_List(t *testing.T) {
+func TestAPI_Session_List(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/snapshot_test.go b/api/snapshot_test.go
index 7d639f891..ba371d4e4 100644
--- a/api/snapshot_test.go
+++ b/api/snapshot_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 )
 
-func TestSnapshot(t *testing.T) {
+func TestAPI_Snapshot(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -80,7 +80,7 @@ func TestSnapshot(t *testing.T) {
 	}
 }
 
-func TestSnapshot_Options(t *testing.T) {
+func TestAPI_Snapshot_Options(t *testing.T) {
 	t.Parallel()
 	c, s := makeACLClient(t)
 	defer s.Stop()
diff --git a/api/status_test.go b/api/status_test.go
index 62dc1550f..f1ad3bf42 100644
--- a/api/status_test.go
+++ b/api/status_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-func TestStatusLeader(t *testing.T) {
+func TestAPI_StatusLeader(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -20,7 +20,7 @@ func TestStatusLeader(t *testing.T) {
 	}
 }
 
-func TestStatusPeers(t *testing.T) {
+func TestAPI_StatusPeers(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()