From 6a1ab1a2e0d177a42cdbc349d4fdb3032fad9f4b Mon Sep 17 00:00:00 2001
From: Frank Schroeder <frank.schroeder@gmail.com>
Date: Fri, 30 Jun 2017 23:05:02 +0200
Subject: [PATCH] api: refactor: unify naming of API tests

---
 api/acl_test.go                | 10 +++++-----
 api/agent_test.go              | 36 +++++++++++++++++-----------------
 api/catalog_test.go            | 20 +++++++++----------
 api/coordinate_test.go         |  4 ++--
 api/event_test.go              |  2 +-
 api/health_test.go             | 14 ++++++-------
 api/kv_test.go                 | 16 +++++++--------
 api/lock_test.go               | 18 ++++++++---------
 api/operator_autopilot_test.go |  6 +++---
 api/operator_keyring_test.go   |  2 +-
 api/operator_raft_test.go      |  4 ++--
 api/semaphore_test.go          | 18 ++++++++---------
 api/session_test.go            | 14 ++++++-------
 13 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/api/acl_test.go b/api/acl_test.go
index e88040995..5adc2b56f 100644
--- a/api/acl_test.go
+++ b/api/acl_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-func TestAPI_ACL_CreateDestroy(t *testing.T) {
+func TestAPI_ACLCreateDestroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeACLClient(t)
 	defer s.Stop()
@@ -49,7 +49,7 @@ func TestAPI_ACL_CreateDestroy(t *testing.T) {
 	}
 }
 
-func TestAPI_ACL_CloneDestroy(t *testing.T) {
+func TestAPI_ACLCloneDestroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeACLClient(t)
 	defer s.Stop()
@@ -79,7 +79,7 @@ func TestAPI_ACL_CloneDestroy(t *testing.T) {
 	}
 }
 
-func TestAPI_ACL_Info(t *testing.T) {
+func TestAPI_ACLInfo(t *testing.T) {
 	t.Parallel()
 	c, s := makeACLClient(t)
 	defer s.Stop()
@@ -103,7 +103,7 @@ func TestAPI_ACL_Info(t *testing.T) {
 	}
 }
 
-func TestAPI_ACL_List(t *testing.T) {
+func TestAPI_ACLList(t *testing.T) {
 	t.Parallel()
 	c, s := makeACLClient(t)
 	defer s.Stop()
@@ -127,7 +127,7 @@ func TestAPI_ACL_List(t *testing.T) {
 	}
 }
 
-func TestAPI_ACL_Replication(t *testing.T) {
+func TestAPI_ACLReplication(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 c57da2e63..01ba9f88d 100644
--- a/api/agent_test.go
+++ b/api/agent_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/serf/serf"
 )
 
-func TestAPI_Agent_Self(t *testing.T) {
+func TestAPI_AgentSelf(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -28,7 +28,7 @@ func TestAPI_Agent_Self(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Reload(t *testing.T) {
+func TestAPI_AgentReload(t *testing.T) {
 	t.Parallel()
 
 	// Create our initial empty config file, to be overwritten later
@@ -70,7 +70,7 @@ func TestAPI_Agent_Reload(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Members(t *testing.T) {
+func TestAPI_AgentMembers(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -87,7 +87,7 @@ func TestAPI_Agent_Members(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Services(t *testing.T) {
+func TestAPI_AgentServices(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -132,7 +132,7 @@ func TestAPI_Agent_Services(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Services_CheckPassing(t *testing.T) {
+func TestAPI_AgentServices_CheckPassing(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -176,7 +176,7 @@ func TestAPI_Agent_Services_CheckPassing(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Services_CheckBadStatus(t *testing.T) {
+func TestAPI_AgentServices_CheckBadStatus(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -196,7 +196,7 @@ func TestAPI_Agent_Services_CheckBadStatus(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_ServiceAddress(t *testing.T) {
+func TestAPI_AgentServiceAddress(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -243,7 +243,7 @@ func TestAPI_Agent_ServiceAddress(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_EnableTagOverride(t *testing.T) {
+func TestAPI_AgentEnableTagOverride(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -286,7 +286,7 @@ func TestAPI_Agent_EnableTagOverride(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Services_MultipleChecks(t *testing.T) {
+func TestAPI_AgentServices_MultipleChecks(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -330,7 +330,7 @@ func TestAPI_Agent_Services_MultipleChecks(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_SetTTLStatus(t *testing.T) {
+func TestAPI_AgentSetTTLStatus(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -414,7 +414,7 @@ func TestAPI_Agent_SetTTLStatus(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Checks(t *testing.T) {
+func TestAPI_AgentChecks(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -446,7 +446,7 @@ func TestAPI_Agent_Checks(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_CheckStartPassing(t *testing.T) {
+func TestAPI_AgentCheckStartPassing(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -481,7 +481,7 @@ func TestAPI_Agent_CheckStartPassing(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Checks_serviceBound(t *testing.T) {
+func TestAPI_AgentChecks_serviceBound(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -527,7 +527,7 @@ func TestAPI_Agent_Checks_serviceBound(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Checks_Docker(t *testing.T) {
+func TestAPI_AgentChecks_Docker(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -571,7 +571,7 @@ func TestAPI_Agent_Checks_Docker(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Join(t *testing.T) {
+func TestAPI_AgentJoin(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -591,7 +591,7 @@ func TestAPI_Agent_Join(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Leave(t *testing.T) {
+func TestAPI_AgentLeave(t *testing.T) {
 	t.Parallel()
 	c1, s1 := makeClient(t)
 	defer s1.Stop()
@@ -626,7 +626,7 @@ func TestAPI_Agent_Leave(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_ForceLeave(t *testing.T) {
+func TestAPI_AgentForceLeave(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -640,7 +640,7 @@ func TestAPI_Agent_ForceLeave(t *testing.T) {
 	}
 }
 
-func TestAPI_Agent_Monitor(t *testing.T) {
+func TestAPI_AgentMonitor(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
diff --git a/api/catalog_test.go b/api/catalog_test.go
index 45f3ed15a..2f49969ba 100644
--- a/api/catalog_test.go
+++ b/api/catalog_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pascaldekloe/goe/verify"
 )
 
-func TestAPI_Catalog_Datacenters(t *testing.T) {
+func TestAPI_CatalogDatacenters(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -25,7 +25,7 @@ func TestAPI_Catalog_Datacenters(t *testing.T) {
 	})
 }
 
-func TestAPI_Catalog_Nodes(t *testing.T) {
+func TestAPI_CatalogNodes(t *testing.T) {
 	c, s := makeClient(t)
 	defer s.Stop()
 
@@ -59,7 +59,7 @@ func TestAPI_Catalog_Nodes(t *testing.T) {
 	})
 }
 
-func TestAPI_Catalog_Nodes_MetaFilter(t *testing.T) {
+func TestAPI_CatalogNodes_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 TestAPI_Catalog_Nodes_MetaFilter(t *testing.T) {
 	})
 }
 
-func TestAPI_Catalog_Services(t *testing.T) {
+func TestAPI_CatalogServices(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -134,7 +134,7 @@ func TestAPI_Catalog_Services(t *testing.T) {
 	})
 }
 
-func TestAPI_Catalog_Services_NodeMetaFilter(t *testing.T) {
+func TestAPI_CatalogServices_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 TestAPI_Catalog_Services_NodeMetaFilter(t *testing.T) {
 	})
 }
 
-func TestAPI_Catalog_Service(t *testing.T) {
+func TestAPI_CatalogService(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -201,7 +201,7 @@ func TestAPI_Catalog_Service(t *testing.T) {
 	})
 }
 
-func TestAPI_Catalog_Service_NodeMetaFilter(t *testing.T) {
+func TestAPI_CatalogService_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 TestAPI_Catalog_Service_NodeMetaFilter(t *testing.T) {
 	})
 }
 
-func TestAPI_Catalog_Node(t *testing.T) {
+func TestAPI_CatalogNode(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -261,7 +261,7 @@ func TestAPI_Catalog_Node(t *testing.T) {
 	})
 }
 
-func TestAPI_Catalog_Registration(t *testing.T) {
+func TestAPI_CatalogRegistration(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -389,7 +389,7 @@ func TestAPI_Catalog_Registration(t *testing.T) {
 	})
 }
 
-func TestAPI_Catalog_EnableTagOverride(t *testing.T) {
+func TestAPI_CatalogEnableTagOverride(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 874dd6278..f41756b57 100644
--- a/api/coordinate_test.go
+++ b/api/coordinate_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/consul/testutil/retry"
 )
 
-func TestAPI_Coordinate_Datacenters(t *testing.T) {
+func TestAPI_CoordinateDatacenters(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -24,7 +24,7 @@ func TestAPI_Coordinate_Datacenters(t *testing.T) {
 	})
 }
 
-func TestAPI_Coordinate_Nodes(t *testing.T) {
+func TestAPI_CoordinateNodes(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 038a6875f..1459590e0 100644
--- a/api/event_test.go
+++ b/api/event_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/consul/testutil/retry"
 )
 
-func TestAPI_Event_FireList(t *testing.T) {
+func TestAPI_EventFireList(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 208f1aa3c..9cbb55e21 100644
--- a/api/health_test.go
+++ b/api/health_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pascaldekloe/goe/verify"
 )
 
-func TestAPI_Health_Node(t *testing.T) {
+func TestAPI_HealthNode(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -169,7 +169,7 @@ func TestAPI_HealthChecks_AggregatedStatus(t *testing.T) {
 	}
 }
 
-func TestAPI_Health_Checks(t *testing.T) {
+func TestAPI_HealthChecks(t *testing.T) {
 	t.Parallel()
 	c, s := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
 		conf.NodeName = "node123"
@@ -218,7 +218,7 @@ func TestAPI_Health_Checks(t *testing.T) {
 	})
 }
 
-func TestAPI_Health_Checks_NodeMetaFilter(t *testing.T) {
+func TestAPI_HealthChecks_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 TestAPI_Health_Checks_NodeMetaFilter(t *testing.T) {
 	})
 }
 
-func TestAPI_Health_Service(t *testing.T) {
+func TestAPI_HealthService(t *testing.T) {
 	c, s := makeClient(t)
 	defer s.Stop()
 
@@ -281,7 +281,7 @@ func TestAPI_Health_Service(t *testing.T) {
 	})
 }
 
-func TestAPI_Health_Service_NodeMetaFilter(t *testing.T) {
+func TestAPI_HealthService_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 TestAPI_Health_Service_NodeMetaFilter(t *testing.T) {
 	})
 }
 
-func TestAPI_Health_State(t *testing.T) {
+func TestAPI_HealthState(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -330,7 +330,7 @@ func TestAPI_Health_State(t *testing.T) {
 	})
 }
 
-func TestAPI_Health_State_NodeMetaFilter(t *testing.T) {
+func TestAPI_HealthState_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 1e103875a..1ca6cd794 100644
--- a/api/kv_test.go
+++ b/api/kv_test.go
@@ -73,7 +73,7 @@ func TestAPI_ClientPutGetDelete(t *testing.T) {
 	}
 }
 
-func TestAPI_Client_List_DeleteRecurse(t *testing.T) {
+func TestAPI_ClientList_DeleteRecurse(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -128,7 +128,7 @@ func TestAPI_Client_List_DeleteRecurse(t *testing.T) {
 	}
 }
 
-func TestAPI_Client_DeleteCAS(t *testing.T) {
+func TestAPI_ClientDeleteCAS(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -174,7 +174,7 @@ func TestAPI_Client_DeleteCAS(t *testing.T) {
 	}
 }
 
-func TestAPI_Client_CAS(t *testing.T) {
+func TestAPI_ClientCAS(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -222,7 +222,7 @@ func TestAPI_Client_CAS(t *testing.T) {
 	}
 }
 
-func TestAPI_Client_WatchGet(t *testing.T) {
+func TestAPI_ClientWatchGet(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -279,7 +279,7 @@ func TestAPI_Client_WatchGet(t *testing.T) {
 	<-doneCh
 }
 
-func TestAPI_Client_WatchList(t *testing.T) {
+func TestAPI_ClientWatchList(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -337,7 +337,7 @@ func TestAPI_Client_WatchList(t *testing.T) {
 	<-doneCh
 }
 
-func TestAPI_Client_Keys_DeleteRecurse(t *testing.T) {
+func TestAPI_ClientKeys_DeleteRecurse(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -387,7 +387,7 @@ func TestAPI_Client_Keys_DeleteRecurse(t *testing.T) {
 	}
 }
 
-func TestAPI_Client_AcquireRelease(t *testing.T) {
+func TestAPI_ClientAcquireRelease(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -456,7 +456,7 @@ func TestAPI_Client_AcquireRelease(t *testing.T) {
 	}
 }
 
-func TestAPI_Client_Txn(t *testing.T) {
+func TestAPI_ClientTxn(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 3e2ec2391..560209874 100644
--- a/api/lock_test.go
+++ b/api/lock_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 )
 
-func TestAPI_Lock_LockUnlock(t *testing.T) {
+func TestAPI_LockLockUnlock(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -69,7 +69,7 @@ func TestAPI_Lock_LockUnlock(t *testing.T) {
 	}
 }
 
-func TestAPI_Lock_ForceInvalidate(t *testing.T) {
+func TestAPI_LockForceInvalidate(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -104,7 +104,7 @@ func TestAPI_Lock_ForceInvalidate(t *testing.T) {
 	}
 }
 
-func TestAPI_Lock_DeleteKey(t *testing.T) {
+func TestAPI_LockDeleteKey(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -146,7 +146,7 @@ func TestAPI_Lock_DeleteKey(t *testing.T) {
 	}
 }
 
-func TestAPI_Lock_Contend(t *testing.T) {
+func TestAPI_LockContend(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -199,7 +199,7 @@ func TestAPI_Lock_Contend(t *testing.T) {
 	}
 }
 
-func TestAPI_Lock_Destroy(t *testing.T) {
+func TestAPI_LockDestroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -268,7 +268,7 @@ func TestAPI_Lock_Destroy(t *testing.T) {
 	}
 }
 
-func TestAPI_Lock_Conflict(t *testing.T) {
+func TestAPI_LockConflict(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -306,7 +306,7 @@ func TestAPI_Lock_Conflict(t *testing.T) {
 	}
 }
 
-func TestAPI_Lock_ReclaimLock(t *testing.T) {
+func TestAPI_LockReclaimLock(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -374,7 +374,7 @@ func TestAPI_Lock_ReclaimLock(t *testing.T) {
 	}
 }
 
-func TestAPI_Lock_MonitorRetry(t *testing.T) {
+func TestAPI_LockMonitorRetry(t *testing.T) {
 	t.Parallel()
 	raw, s := makeClient(t)
 	defer s.Stop()
@@ -489,7 +489,7 @@ func TestAPI_Lock_MonitorRetry(t *testing.T) {
 	}
 }
 
-func TestAPI_Lock_OneShot(t *testing.T) {
+func TestAPI_LockOneShot(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 0c95621fb..9b84b9b4e 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 TestAPI_Operator_AutopilotGetSetConfiguration(t *testing.T) {
+func TestAPI_OperatorAutopilotGetSetConfiguration(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -36,7 +36,7 @@ func TestAPI_Operator_AutopilotGetSetConfiguration(t *testing.T) {
 	}
 }
 
-func TestAPI_Operator_AutopilotCASConfiguration(t *testing.T) {
+func TestAPI_OperatorAutopilotCASConfiguration(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -81,7 +81,7 @@ func TestAPI_Operator_AutopilotCASConfiguration(t *testing.T) {
 	}
 }
 
-func TestAPI_Operator_AutopilotServerHealth(t *testing.T) {
+func TestAPI_OperatorAutopilotServerHealth(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 d8efd2666..e877170fe 100644
--- a/api/operator_keyring_test.go
+++ b/api/operator_keyring_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/consul/testutil"
 )
 
-func TestAPI_Operator_KeyringInstallListPutRemove(t *testing.T) {
+func TestAPI_OperatorKeyringInstallListPutRemove(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 c54fced6f..a6eada42c 100644
--- a/api/operator_raft_test.go
+++ b/api/operator_raft_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 )
 
-func TestAPI_Operator_RaftGetConfiguration(t *testing.T) {
+func TestAPI_OperatorRaftGetConfiguration(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -22,7 +22,7 @@ func TestAPI_Operator_RaftGetConfiguration(t *testing.T) {
 	}
 }
 
-func TestAPI_Operator_RaftRemovePeerByAddress(t *testing.T) {
+func TestAPI_OperatorRaftRemovePeerByAddress(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 8a1522678..598be024c 100644
--- a/api/semaphore_test.go
+++ b/api/semaphore_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 )
 
-func TestAPI_Semaphore_AcquireRelease(t *testing.T) {
+func TestAPI_SemaphoreAcquireRelease(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -69,7 +69,7 @@ func TestAPI_Semaphore_AcquireRelease(t *testing.T) {
 	}
 }
 
-func TestAPI_Semaphore_ForceInvalidate(t *testing.T) {
+func TestAPI_SemaphoreForceInvalidate(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -104,7 +104,7 @@ func TestAPI_Semaphore_ForceInvalidate(t *testing.T) {
 	}
 }
 
-func TestAPI_Semaphore_DeleteKey(t *testing.T) {
+func TestAPI_SemaphoreDeleteKey(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -138,7 +138,7 @@ func TestAPI_Semaphore_DeleteKey(t *testing.T) {
 	}
 }
 
-func TestAPI_Semaphore_Contend(t *testing.T) {
+func TestAPI_SemaphoreContend(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -191,7 +191,7 @@ func TestAPI_Semaphore_Contend(t *testing.T) {
 	}
 }
 
-func TestAPI_Semaphore_BadLimit(t *testing.T) {
+func TestAPI_SemaphoreBadLimit(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -222,7 +222,7 @@ func TestAPI_Semaphore_BadLimit(t *testing.T) {
 	}
 }
 
-func TestAPI_Semaphore_Destroy(t *testing.T) {
+func TestAPI_SemaphoreDestroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -278,7 +278,7 @@ func TestAPI_Semaphore_Destroy(t *testing.T) {
 	}
 }
 
-func TestAPI_Semaphore_Conflict(t *testing.T) {
+func TestAPI_SemaphoreConflict(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -316,7 +316,7 @@ func TestAPI_Semaphore_Conflict(t *testing.T) {
 	}
 }
 
-func TestAPI_Semaphore_MonitorRetry(t *testing.T) {
+func TestAPI_SemaphoreMonitorRetry(t *testing.T) {
 	t.Parallel()
 	raw, s := makeClient(t)
 	defer s.Stop()
@@ -433,7 +433,7 @@ func TestAPI_Semaphore_MonitorRetry(t *testing.T) {
 	}
 }
 
-func TestAPI_Semaphore_OneShot(t *testing.T) {
+func TestAPI_SemaphoreOneShot(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 cb465a05c..468ccc331 100644
--- a/api/session_test.go
+++ b/api/session_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 )
 
-func TestAPI_Session_CreateDestroy(t *testing.T) {
+func TestAPI_SessionCreateDestroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -35,7 +35,7 @@ func TestAPI_Session_CreateDestroy(t *testing.T) {
 	}
 }
 
-func TestAPI_Session_CreateRenewDestroy(t *testing.T) {
+func TestAPI_SessionCreateRenewDestroy(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -86,7 +86,7 @@ func TestAPI_Session_CreateRenewDestroy(t *testing.T) {
 	}
 }
 
-func TestAPI_Session_CreateRenewDestroyRenew(t *testing.T) {
+func TestAPI_SessionCreateRenewDestroyRenew(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -140,7 +140,7 @@ func TestAPI_Session_CreateRenewDestroyRenew(t *testing.T) {
 	}
 }
 
-func TestAPI_Session_CreateDestroyRenewPeriodic(t *testing.T) {
+func TestAPI_SessionCreateDestroyRenewPeriodic(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -194,7 +194,7 @@ func TestAPI_Session_CreateDestroyRenewPeriodic(t *testing.T) {
 	}
 }
 
-func TestAPI_Session_Info(t *testing.T) {
+func TestAPI_SessionInfo(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -248,7 +248,7 @@ func TestAPI_Session_Info(t *testing.T) {
 	}
 }
 
-func TestAPI_Session_Node(t *testing.T) {
+func TestAPI_SessionNode(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()
@@ -283,7 +283,7 @@ func TestAPI_Session_Node(t *testing.T) {
 	}
 }
 
-func TestAPI_Session_List(t *testing.T) {
+func TestAPI_SessionList(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
 	defer s.Stop()