subunit: Support formatting compatible with upstream subunit, for consistency.

Upstream subunit makes a ":" after commands optional, so I've fixed any
places where we might trigger commands accidently. I've filed a bug
about this in subunit.

14 files changed, 104 insertions, 104 deletions

diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c
index c3a992b05f..3b165b57ce 100644
--- a/source4/torture/rpc/alter_context.c
+++ b/source4/torture/rpc/alter_context.c
@@ -65,7 +65,7 @@ bool torture_rpc_alter_context(struct torture_context *torture)
 	torture_assert_ntstatus_equal(torture, status, NT_STATUS_RPC_UNSUPPORTED_NAME_SYNTAX,
 				      "dcerpc_alter_context with wrong version should fail");
 
-	torture_comment(torture, "testing DSSETUP pipe operations\n");
+	torture_comment(torture, "Testing DSSETUP pipe operations\n");
 	ret &= test_DsRoleGetPrimaryDomainInformation(torture, p2);
 
 	if (handle) {
@@ -97,7 +97,7 @@ bool torture_rpc_alter_context(struct torture_context *torture)
 	}
 	torture_assert_ntstatus_ok(torture, status, "dcerpc_alter_context failed");
 
-	torture_comment(torture, "testing DSSETUP pipe operations - should fault\n");
+	torture_comment(torture, "Testing DSSETUP pipe operations - should fault\n");
 	ret &= test_DsRoleGetPrimaryDomainInformation_ext(torture, p, NT_STATUS_NET_WRITE_FAULT);
 
 	ret &= test_lsa_OpenPolicy2(p->binding_handle, torture, &handle);
@@ -106,7 +106,7 @@ bool torture_rpc_alter_context(struct torture_context *torture)
 		ret &= test_lsa_Close(p->binding_handle, torture, handle);
 	}
 
-	torture_comment(torture, "testing DSSETUP pipe operations\n");
+	torture_comment(torture, "Testing DSSETUP pipe operations\n");
 
 	ret &= test_DsRoleGetPrimaryDomainInformation(torture, p2);
 
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 42d2d1280a..9ecd30bf17 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -76,7 +76,7 @@ bool test_DsBind(struct dcerpc_pipe *p,
 	r.in.bind_info = &bind_info_ctr;
 	r.out.bind_handle = &priv->bind_handle;
 
-	torture_comment(tctx, "testing DsBind\n");
+	torture_comment(tctx, "Testing DsBind\n");
 
 	status = dcerpc_drsuapi_DsBind_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsBind");
@@ -137,7 +137,7 @@ static bool test_DsGetDomainControllerInfo(struct torture_context *tctx,
 			r.out.level_out = &level_out;
 			
 			torture_comment(tctx,
-				   "testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
+				   "Testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
 			       r.in.req->req1.level, r.in.req->req1.domain_name);
 		
 			status = dcerpc_drsuapi_DsGetDomainControllerInfo_r(p->binding_handle, tctx, &r);
@@ -191,7 +191,7 @@ static bool test_DsGetDomainControllerInfo(struct torture_context *tctx,
 	r.in.req->req1.domain_name = "__UNKNOWN_DOMAIN__"; /* This is clearly ignored for this level */
 	r.in.req->req1.level = -1;
 	
-	torture_comment(tctx, "testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
+	torture_comment(tctx, "Testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
 			r.in.req->req1.level, r.in.req->req1.domain_name);
 	
 	status = dcerpc_drsuapi_DsGetDomainControllerInfo_r(p->binding_handle, tctx, &r);
@@ -236,7 +236,7 @@ static bool test_DsWriteAccountSpn(struct torture_context *tctx,
 	r.in.level			= 1;
 	r.in.req			= &req;
 
-	torture_comment(tctx, "testing DsWriteAccountSpn\n");
+	torture_comment(tctx, "Testing DsWriteAccountSpn\n");
 
 	r.in.req->req1.operation	= DRSUAPI_DS_SPN_OPERATION_ADD;
 	r.in.req->req1.unknown1	= 0;
@@ -350,7 +350,7 @@ static bool test_DsReplicaGetInfo(struct torture_context *tctx,
 	for (i=0; i < ARRAY_SIZE(array); i++) {
 		const char *object_dn;
 
-		torture_comment(tctx, "testing DsReplicaGetInfo level %d infotype %d\n",
+		torture_comment(tctx, "Testing DsReplicaGetInfo level %d infotype %d\n",
 				array[i].level, array[i].infotype);
 
 		object_dn = (array[i].obj_dn ? array[i].obj_dn : priv->domain_obj_dn);
@@ -425,7 +425,7 @@ static bool test_DsReplicaSync(struct torture_context *tctx,
 	r.in.bind_handle	= &priv->bind_handle;
 
 	for (i=0; i < ARRAY_SIZE(array); i++) {
-		torture_comment(tctx, "testing DsReplicaSync level %d\n",
+		torture_comment(tctx, "Testing DsReplicaSync level %d\n",
 				array[i].level);
 
 		r.in.level = array[i].level;
@@ -552,7 +552,7 @@ static bool test_DsGetNCChanges(struct torture_context *tctx,
 
 	for (i=0; i < ARRAY_SIZE(array); i++) {
 		torture_comment(tctx,
-				"testing DsGetNCChanges level %d\n",
+				"Testing DsGetNCChanges level %d\n",
 				array[i].level);
 
 		r.in.bind_handle	= &priv->bind_handle;
@@ -685,7 +685,7 @@ bool test_DsUnbind(struct dcerpc_pipe *p,
 	r.in.bind_handle = &priv->bind_handle;
 	r.out.bind_handle = &priv->bind_handle;
 
-	torture_comment(tctx, "testing DsUnbind\n");
+	torture_comment(tctx, "Testing DsUnbind\n");
 
 	status = dcerpc_drsuapi_DsUnbind_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsUnbind");
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index 2a49fb37f7..7078dde0bc 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -279,7 +279,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 	
 	names[0].str = dom_sid;
 
-	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
+	torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
 	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
@@ -304,7 +304,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 
 	r.in.req->req1.format_desired	= DRSUAPI_DS_NAME_FORMAT_GUID;
 
-	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
+	torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
 	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
@@ -330,7 +330,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 
 	r.in.req->req1.format_desired	= DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
 
-	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
+	torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
 	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
@@ -378,7 +378,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 	r.in.req->req1.format_desired	= DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
 	names[0].str = nt4_domain;
 
-	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
+	torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
 	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
@@ -404,7 +404,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 	r.in.req->req1.format_desired	= DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
 	names[0].str = talloc_asprintf(mem_ctx, "%s%s$", nt4_domain, test_dc);
 
-	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
+	torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
 	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
@@ -430,7 +430,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 	r.in.req->req1.format_desired	= DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
 	names[0].str = priv->domain_guid_str;
 
-	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
+	torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
 	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c
index 7fdbdc470a..b01dd773a6 100644
--- a/source4/torture/rpc/dsgetinfo.c
+++ b/source4/torture/rpc/dsgetinfo.c
@@ -302,7 +302,7 @@ static bool test_getinfo(struct torture_context *tctx,
 	for (i=0; i < ARRAY_SIZE(array); i++) {
 		const char *object_dn;
 
-		torture_comment(tctx, "testing DsReplicaGetInfo level %d infotype %d\n",
+		torture_comment(tctx, "Testing DsReplicaGetInfo level %d infotype %d\n",
 				array[i].level, array[i].infotype);
 
 		if (array[i].obj_dn) {
diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index 337f5e322a..793ab14dbf 100644
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -806,7 +806,7 @@ static bool test_FetchData(struct torture_context *tctx, struct DsSyncTest *ctx)
 	}
 
 	for (i=0; i < ARRAY_SIZE(array); i++) {
-		printf("testing DsGetNCChanges level %d\n",
+		printf("Testing DsGetNCChanges level %d\n",
 			array[i].level);
 
 		r.in.bind_handle	= &ctx->new_dc.drsuapi.bind_handle;
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 2323920581..7dd2cef19f 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -2962,7 +2962,7 @@ static bool testcase_TrustedDomains(struct torture_context *tctx,
 		talloc_get_type_abort(data, struct lsa_trustdom_state);
 	struct dcerpc_binding_handle *b = p->binding_handle;
 
-	torture_comment(tctx, "testing %d domains\n", state->num_trusts);
+	torture_comment(tctx, "Testing %d domains\n", state->num_trusts);
 
 	if (!test_OpenPolicy(b, tctx)) {
 		ret = false;
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 0034cdcf57..c469de9ec9 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -1693,7 +1693,7 @@ static bool test_LogonControl(struct torture_context *tctx,
 		secure_channel_type = cli_credentials_get_secure_channel_type(machine_credentials);
 	}
 
-	torture_comment(tctx, "testing LogonControl with secure channel type: %d\n",
+	torture_comment(tctx, "Testing LogonControl with secure channel type: %d\n",
 		secure_channel_type);
 
 	r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index baf4501469..274ddd9ea8 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -1970,7 +1970,7 @@ static bool test_NetShareGetInfo(struct torture_context *tctx,
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		r.in.level = levels[i];
 
-		torture_comment(tctx, "testing NetShareGetInfo level %u on share '%s'\n",
+		torture_comment(tctx, "Testing NetShareGetInfo level %u on share '%s'\n",
 		       r.in.level, r.in.share_name);
 
 		status = dcerpc_srvsvc_NetShareGetInfo_r(b, tctx, &r);
@@ -2066,7 +2066,7 @@ static bool test_NetShareEnum(struct torture_context *tctx,
 			break;
 		}
 
-		torture_comment(tctx, "testing NetShareEnum level %u\n", info_ctr.level);
+		torture_comment(tctx, "Testing NetShareEnum level %u\n", info_ctr.level);
 
 		status = dcerpc_srvsvc_NetShareEnum_r(b, tctx, &r);
 		if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 1ccbd3e05e..7282750c97 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -1358,7 +1358,7 @@ static bool test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	ZERO_STRUCT(logon);
 
-	d_printf("testing netr_LogonSamLogon and netr_LogonSamLogonWithFlags\n");
+	d_printf("Testing netr_LogonSamLogon and netr_LogonSamLogonWithFlags\n");
 	
 	samlogon_state.comment = comment;
 	samlogon_state.account_name = account_name;
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index d40d162934..a0a5e5f6d9 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -130,7 +130,7 @@ static bool test_Shutdown(struct dcerpc_binding_handle *b,
 
 	r.in.connect_handle = handle;
 
-	torture_comment(tctx, "testing samr_Shutdown\n");
+	torture_comment(tctx, "Testing samr_Shutdown\n");
 
 	torture_assert_ntstatus_ok(tctx, dcerpc_samr_Shutdown_r(b, tctx, &r),
 		"Shutdown failed");
@@ -159,7 +159,7 @@ static bool test_SetDsrmPassword(struct dcerpc_binding_handle *b,
 	r.in.unknown = 0;
 	r.in.hash = &hash;
 
-	torture_comment(tctx, "testing samr_SetDsrmPassword\n");
+	torture_comment(tctx, "Testing samr_SetDsrmPassword\n");
 
 	torture_assert_ntstatus_ok(tctx, dcerpc_samr_SetDsrmPassword_r(b, tctx, &r),
 		"SetDsrmPassword failed");
@@ -1411,7 +1411,7 @@ static bool test_GetGroupsForUser(struct dcerpc_binding_handle *b,
 	struct samr_GetGroupsForUser r;
 	struct samr_RidWithAttributeArray *rids = NULL;
 
-	torture_comment(tctx, "testing GetGroupsForUser\n");
+	torture_comment(tctx, "Testing GetGroupsForUser\n");
 
 	r.in.user_handle = user_handle;
 	r.out.rids = &rids;
@@ -2633,7 +2633,7 @@ static bool test_AddMemberToAlias(struct dcerpc_binding_handle *b,
 
 	sid = dom_sid_add_rid(tctx, domain_sid, 512);
 
-	torture_comment(tctx, "testing AddAliasMember\n");
+	torture_comment(tctx, "Testing AddAliasMember\n");
 	r.in.alias_handle = alias_handle;
 	r.in.sid = sid;
 
@@ -2659,7 +2659,7 @@ static bool test_AddMultipleMembersToAlias(struct dcerpc_binding_handle *b,
 	struct samr_RemoveMultipleMembersFromAlias r;
 	struct lsa_SidArray sids;
 
-	torture_comment(tctx, "testing AddMultipleMembersToAlias\n");
+	torture_comment(tctx, "Testing AddMultipleMembersToAlias\n");
 	a.in.alias_handle = alias_handle;
 	a.in.sids = &sids;
 
@@ -2675,7 +2675,7 @@ static bool test_AddMultipleMembersToAlias(struct dcerpc_binding_handle *b,
 	torture_assert_ntstatus_ok(tctx, a.out.result, "AddMultipleMembersToAlias");
 
 
-	torture_comment(tctx, "testing RemoveMultipleMembersFromAlias\n");
+	torture_comment(tctx, "Testing RemoveMultipleMembersFromAlias\n");
 	r.in.alias_handle = alias_handle;
 	r.in.sids = &sids;
 
@@ -2982,7 +2982,7 @@ static bool test_SamLogon_with_creds(struct torture_context *tctx,
 	cli_credentials_set_password(test_credentials,
 				     password, CRED_SPECIFIED);
 
-	torture_comment(tctx, "testing samlogon (%s) as %s password: %s\n",
+	torture_comment(tctx, "Testing samlogon (%s) as %s password: %s\n",
 		interactive ? "interactive" : "network", acct_name, password);
 
 	if (!test_SamLogon(tctx, p, test_credentials,
@@ -4995,7 +4995,7 @@ static bool test_DeleteAlias_byname(struct dcerpc_binding_handle *b,
 	struct policy_handle alias_handle;
 	uint32_t rid;
 
-	torture_comment(tctx, "testing DeleteAlias_byname\n");
+	torture_comment(tctx, "Testing DeleteAlias_byname\n");
 
 	status = test_LookupName(b, tctx, domain_handle, name, &rid);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -5168,7 +5168,7 @@ static bool test_ChangePassword(struct dcerpc_pipe *p,
 		r.in.level = 1;
 		r.out.info = &info;
 
-		torture_comment(tctx, "testing samr_QueryDomainInfo level 1\n");
+		torture_comment(tctx, "Testing samr_QueryDomainInfo level 1\n");
 		torture_assert_ntstatus_ok(tctx, dcerpc_samr_QueryDomainInfo_r(b, tctx, &r),
 			"QueryDomainInfo failed");
 		if (!NT_STATUS_IS_OK(r.out.result)) {
@@ -5189,7 +5189,7 @@ static bool test_ChangePassword(struct dcerpc_pipe *p,
 		min_pwd_age_old = s.in.info->info1.min_password_age;
 		s.in.info->info1.min_password_age = 0;
 
-		torture_comment(tctx, "testing samr_SetDomainInfo level 1\n");
+		torture_comment(tctx, "Testing samr_SetDomainInfo level 1\n");
 		torture_assert_ntstatus_ok(tctx, dcerpc_samr_SetDomainInfo_r(b, tctx, &s),
 			"SetDomainInfo failed");
 		if (!NT_STATUS_IS_OK(s.out.result)) {
@@ -5206,7 +5206,7 @@ static bool test_ChangePassword(struct dcerpc_pipe *p,
 		s.in.info->info1.password_properties = pwd_prop_old;
 		s.in.info->info1.min_password_age = min_pwd_age_old;
 
-		torture_comment(tctx, "testing samr_SetDomainInfo level 1\n");
+		torture_comment(tctx, "Testing samr_SetDomainInfo level 1\n");
 		torture_assert_ntstatus_ok(tctx, dcerpc_samr_SetDomainInfo_r(b, tctx, &s),
 			"SetDomainInfo failed");
 		if (!NT_STATUS_IS_OK(s.out.result)) {
@@ -7788,7 +7788,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b,
 	uint32_t level_out = 0;
 	bool ret = true, got_handle = false;
 
-	torture_comment(tctx, "testing samr_Connect\n");
+	torture_comment(tctx, "Testing samr_Connect\n");
 
 	r.in.system_name = 0;
 	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
@@ -7804,7 +7804,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b,
 		*handle = h;
 	}
 
-	torture_comment(tctx, "testing samr_Connect2\n");
+	torture_comment(tctx, "Testing samr_Connect2\n");
 
 	r2.in.system_name = NULL;
 	r2.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
@@ -7823,7 +7823,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b,
 		*handle = h;
 	}
 
-	torture_comment(tctx, "testing samr_Connect3\n");
+	torture_comment(tctx, "Testing samr_Connect3\n");
 
 	r3.in.system_name = NULL;
 	r3.in.unknown = 0;
@@ -7843,7 +7843,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b,
 		*handle = h;
 	}
 
-	torture_comment(tctx, "testing samr_Connect4\n");
+	torture_comment(tctx, "Testing samr_Connect4\n");
 
 	r4.in.system_name = "";
 	r4.in.client_version = 0;
@@ -7863,7 +7863,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b,
 		*handle = h;
 	}
 
-	torture_comment(tctx, "testing samr_Connect5\n");
+	torture_comment(tctx, "Testing samr_Connect5\n");
 
 	info.info1.client_version = 0;
 	info.info1.unknown2 = 0;
@@ -7904,7 +7904,7 @@ static bool test_samr_ValidatePassword(struct dcerpc_pipe *p,
 	int i;
 	struct dcerpc_binding_handle *b = p->binding_handle;
 
-	torture_comment(tctx, "testing samr_ValidatePassword\n");
+	torture_comment(tctx, "Testing samr_ValidatePassword\n");
 
 	ZERO_STRUCT(r);
 	r.in.level = NetValidatePasswordReset;
diff --git a/source4/torture/rpc/samr_accessmask.c b/source4/torture/rpc/samr_accessmask.c
index 7c24c5e23a..fc331e2d85 100644
--- a/source4/torture/rpc/samr_accessmask.c
+++ b/source4/torture/rpc/samr_accessmask.c
@@ -84,10 +84,10 @@ static bool test_samr_accessmask_Connect5(struct torture_context *tctx,
 	uint32_t mask;
 	struct dcerpc_binding_handle *b = p->binding_handle;
 
-	printf("testing which bits in accessmask allows us to connect\n");
+	printf("Testing which bits in accessmask allows us to connect\n");
 	mask = 1;
 	for (i=0;i<33;i++) {
-		printf("testing Connect5 with access mask 0x%08x", mask);
+		printf("Testing Connect5 with access mask 0x%08x", mask);
 		status = torture_samr_Connect5(tctx, b, mask, &h);
 		mask <<= 1;
 
@@ -159,10 +159,10 @@ static bool test_samr_accessmask_EnumDomains(struct torture_context *tctx,
 	uint32_t num_entries = 0;
 	struct dcerpc_binding_handle *b = p->binding_handle;
 
-	printf("testing which bits in Connect5 accessmask allows us to EnumDomains\n");
+	printf("Testing which bits in Connect5 accessmask allows us to EnumDomains\n");
 	mask = 1;
 	for (i=0;i<33;i++) {
-		printf("testing Connect5/EnumDomains with access mask 0x%08x", mask);
+		printf("Testing Connect5/EnumDomains with access mask 0x%08x", mask);
 		status = torture_samr_Connect5(tctx, b, mask, &ch);
 		mask <<= 1;
 
@@ -260,7 +260,7 @@ static bool test_samr_connect_user_acl(struct torture_context *tctx,
 	struct dcerpc_binding_handle *test_b;
 	const char *binding = torture_setting_string(tctx, "binding", NULL);
 
-	printf("testing ACLs to allow/prevent users to connect to SAMR");
+	printf("Testing ACLs to allow/prevent users to connect to SAMR");
 
 	/* connect to SAMR */
 	status = torture_samr_Connect5(tctx, b, SEC_FLAG_MAXIMUM_ALLOWED, &ch);
@@ -378,7 +378,7 @@ static bool test_samr_connect_user_acl_enforced(struct torture_context *tctx,
 	struct dcerpc_binding_handle *test_b;
 	const char *binding = torture_setting_string(tctx, "binding", NULL);
 
-	printf("testing if ACLs are enforced for non domain admin users when connecting to SAMR");
+	printf("Testing if ACLs are enforced for non domain admin users when connecting to SAMR");
 
 
 	status = dcerpc_pipe_connect(tctx,
@@ -425,10 +425,10 @@ static bool test_samr_accessmask_LookupDomain(struct torture_context *tctx,
 	uint32_t mask;
 	struct dcerpc_binding_handle *b = p->binding_handle;
 
-	printf("testing which bits in Connect5 accessmask allows us to LookupDomain\n");
+	printf("Testing which bits in Connect5 accessmask allows us to LookupDomain\n");
 	mask = 1;
 	for (i=0;i<33;i++) {
-		printf("testing Connect5/LookupDomain with access mask 0x%08x", mask);
+		printf("Testing Connect5/LookupDomain with access mask 0x%08x", mask);
 		status = torture_samr_Connect5(tctx, b, mask, &ch);
 		mask <<= 1;
 
@@ -538,10 +538,10 @@ static bool test_samr_accessmask_OpenDomain(struct torture_context *tctx,
 
 
 
-	printf("testing which bits in Connect5 accessmask allows us to OpenDomain\n");
+	printf("Testing which bits in Connect5 accessmask allows us to OpenDomain\n");
 	mask = 1;
 	for (i=0;i<33;i++) {
-		printf("testing Connect5/OpenDomain with access mask 0x%08x", mask);
+		printf("Testing Connect5/OpenDomain with access mask 0x%08x", mask);
 		status = torture_samr_Connect5(tctx, b, mask, &ch);
 		mask <<= 1;
 
@@ -700,7 +700,7 @@ static bool test_LookupRids(struct torture_context *tctx,
 	struct lsa_Strings names;
 	struct samr_Ids types;
 
-	torture_comment(tctx, "testing LookupRids %d\n", rid);
+	torture_comment(tctx, "Testing LookupRids %d\n", rid);
 
 	r.in.domain_handle = domain_handle;
 	r.in.num_rids = 1;
@@ -725,7 +725,7 @@ static bool test_user(struct torture_context *tctx,
 {
 	struct policy_handle user_handle;
 
-	torture_comment(tctx, "testing user %s (%d)\n", u->account_name.string, u->rid);
+	torture_comment(tctx, "Testing user %s (%d)\n", u->account_name.string, u->rid);
 
 	torture_assert(tctx, test_LookupRids(tctx, b, domain_handle, u->rid),
 		"failed to call lookuprids");
@@ -756,7 +756,7 @@ static bool test_user(struct torture_context *tctx,
 
 			r.in.level = levels[i];
 
-			torture_comment(tctx, "testing QueryUserInfo rid: %d level: %d\n",
+			torture_comment(tctx, "Testing QueryUserInfo rid: %d level: %d\n",
 				u->rid, r.in.level);
 
 			torture_assert_ntstatus_ok(tctx, dcerpc_samr_QueryUserInfo_r(b, tctx, &r),
@@ -793,7 +793,7 @@ static bool test_samr_group(struct torture_context *tctx,
 {
 	struct policy_handle group_handle;
 
-	torture_comment(tctx, "testing group %s (%d)\n", g->name.string, g->idx);
+	torture_comment(tctx, "Testing group %s (%d)\n", g->name.string, g->idx);
 
 	torture_assert(tctx, test_LookupRids(tctx, b, domain_handle, g->idx),
 		"failed to call lookuprids");
@@ -836,7 +836,7 @@ static bool test_samr_alias(struct torture_context *tctx,
 			    struct policy_handle *domain_handle,
 			    struct samr_SamEntry *a)
 {
-	torture_comment(tctx, "testing alias %s (%d)\n", a->name.string, a->idx);
+	torture_comment(tctx, "Testing alias %s (%d)\n", a->name.string, a->idx);
 
 	torture_assert(tctx, test_LookupRids(tctx, b, domain_handle, a->idx),
 		"failed to call lookuprids");
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 4f4e732450..19647f3acd 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -4664,7 +4664,7 @@ static bool test_SecondaryClosePrinter(struct torture_context *tctx,
 		return true;
 	}
 
-	torture_comment(tctx, "testing close on secondary pipe\n");
+	torture_comment(tctx, "Testing close on secondary pipe\n");
 
 	status = dcerpc_parse_binding(tctx, p->conn->binding_string, &b);
 	torture_assert_ntstatus_ok(tctx, status, "Failed to parse dcerpc binding");
diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c
index 0942258156..9bcc95b191 100644
--- a/source4/torture/rpc/srvsvc.c
+++ b/source4/torture/rpc/srvsvc.c
@@ -41,7 +41,7 @@ static bool test_NetCharDevGetInfo(struct dcerpc_pipe *p, struct torture_context
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		r.in.level = levels[i];
-		torture_comment(tctx, "testing NetCharDevGetInfo level %u on device '%s'\n",
+		torture_comment(tctx, "Testing NetCharDevGetInfo level %u on device '%s'\n",
 			r.in.level, r.in.device_name);
 		status = dcerpc_srvsvc_NetCharDevGetInfo_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetCharDevGetInfo failed");
@@ -66,7 +66,7 @@ static bool test_NetCharDevControl(struct dcerpc_pipe *p, struct torture_context
 	for (i=0;i<ARRAY_SIZE(opcodes);i++) {
 		ZERO_STRUCT(r.out);
 		r.in.opcode = opcodes[i];
-		torture_comment(tctx, "testing NetCharDevControl opcode %u on device '%s'\n", 
+		torture_comment(tctx, "Testing NetCharDevControl opcode %u on device '%s'\n", 
 			r.in.opcode, r.in.device_name);
 		status = dcerpc_srvsvc_NetCharDevControl_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetCharDevControl failed");
@@ -114,7 +114,7 @@ static bool test_NetCharDevEnum(struct torture_context *tctx,
 			break;
 		}
 
-		torture_comment(tctx, "testing NetCharDevEnum level %u\n", info_ctr.level);
+		torture_comment(tctx, "Testing NetCharDevEnum level %u\n", info_ctr.level);
 		status = dcerpc_srvsvc_NetCharDevEnum_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetCharDevEnum failed");
 		if (!W_ERROR_IS_OK(r.out.result)) {
@@ -160,7 +160,7 @@ static bool test_NetCharDevQGetInfo(struct dcerpc_pipe *p, struct torture_contex
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		r.in.level = levels[i];
-		torture_comment(tctx, "testing NetCharDevQGetInfo level %u on devicequeue '%s'\n",
+		torture_comment(tctx, "Testing NetCharDevQGetInfo level %u on devicequeue '%s'\n",
 			r.in.level, r.in.queue_name);
 		status = dcerpc_srvsvc_NetCharDevQGetInfo_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetCharDevQGetInfo failed");
@@ -264,7 +264,7 @@ static bool test_NetCharDevQEnum(struct torture_context *tctx,
 			info_ctr.ctr.ctr1 = &c1;
 			break;
 		}
-		torture_comment(tctx, "testing NetCharDevQEnum level %u\n", info_ctr.level);
+		torture_comment(tctx, "Testing NetCharDevQEnum level %u\n", info_ctr.level);
 		status = dcerpc_srvsvc_NetCharDevQEnum_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetCharDevQEnum failed");
 		if (!W_ERROR_IS_OK(r.out.result)) {
@@ -327,7 +327,7 @@ static bool test_NetConnEnum(struct torture_context *tctx,
 			break;
 		}
 
-		torture_comment(tctx, "testing NetConnEnum level %u\n", info_ctr.level);
+		torture_comment(tctx, "Testing NetConnEnum level %u\n", info_ctr.level);
 		status = dcerpc_srvsvc_NetConnEnum_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetConnEnum failed");
 		if (!W_ERROR_IS_OK(r.out.result)) {
@@ -378,7 +378,7 @@ static bool test_NetFileEnum(struct torture_context *tctx,
 			info_ctr.ctr.ctr3 = &c3;
 			break;
 		}
-		torture_comment(tctx, "testing NetFileEnum level %u\n", info_ctr.level);
+		torture_comment(tctx, "Testing NetFileEnum level %u\n", info_ctr.level);
 		status = dcerpc_srvsvc_NetFileEnum_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetFileEnum failed");
 		if (!W_ERROR_IS_OK(r.out.result)) {
@@ -445,7 +445,7 @@ static bool test_NetSessEnum(struct torture_context *tctx,
 			break;
 		}
 
-		torture_comment(tctx, "testing NetSessEnum level %u\n", info_ctr.level);
+		torture_comment(tctx, "Testing NetSessEnum level %u\n", info_ctr.level);
 		status = dcerpc_srvsvc_NetSessEnum_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetSessEnum failed");
 		if (!W_ERROR_IS_OK(r.out.result)) {
@@ -472,7 +472,7 @@ static bool test_NetShareCheck(struct dcerpc_pipe *p, struct torture_context *tc
 	r.out.type = &type;
 
 	torture_comment(tctx, 
-			"testing NetShareCheck on device '%s'\n", r.in.device_name);
+			"Testing NetShareCheck on device '%s'\n", r.in.device_name);
 
 	status = dcerpc_srvsvc_NetShareCheck_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status, "dcerpc_srvsvc_NetShareCheck failed");
@@ -514,7 +514,7 @@ static bool test_NetShareGetInfo(struct torture_context *tctx,
 		expected = levels[i].anon_status;
 		if (admin) expected = levels[i].admin_status;
 
-		torture_comment(tctx, "testing NetShareGetInfo level %u on share '%s'\n", 
+		torture_comment(tctx, "Testing NetShareGetInfo level %u on share '%s'\n", 
 		       r.in.level, r.in.share_name);
 
 		status = dcerpc_srvsvc_NetShareGetInfo_r(b, tctx, &r);
@@ -602,7 +602,7 @@ static bool test_NetShareAddSetDel(struct torture_context *tctx,
 		r.in.level = levels[i].level;
 		ZERO_STRUCT(r.out);
 
-		torture_comment(tctx, "testing NetShareSetInfo level %u on share '%s'\n", 
+		torture_comment(tctx, "Testing NetShareSetInfo level %u on share '%s'\n", 
 		       r.in.level, r.in.share_name);
 
 		switch (levels[i].level) {
@@ -808,7 +808,7 @@ static bool test_NetShareEnumAll(struct torture_context *tctx,
 
 		resume_handle = 0;
 
-		torture_comment(tctx, "testing NetShareEnumAll level %u\n", info_ctr.level);
+		torture_comment(tctx, "Testing NetShareEnumAll level %u\n", info_ctr.level);
 		status = dcerpc_srvsvc_NetShareEnumAll_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetShareEnumAll failed");
 		torture_assert_werr_equal(tctx, r.out.result, expected, "NetShareEnumAll failed");
@@ -904,7 +904,7 @@ static bool test_NetShareEnum(struct torture_context *tctx,
 		expected = levels[i].anon_status;
 		if (admin) expected = levels[i].admin_status;
 
-		torture_comment(tctx, "testing NetShareEnum level %u\n", info_ctr.level);
+		torture_comment(tctx, "Testing NetShareEnum level %u\n", info_ctr.level);
 		status = dcerpc_srvsvc_NetShareEnum_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetShareEnum failed");
 		torture_assert_werr_equal(tctx, r.out.result, expected, "NetShareEnum failed");
@@ -943,7 +943,7 @@ static bool test_NetSrvGetInfo(struct torture_context *tctx,
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		r.in.level = levels[i];
 		r.out.info = &info;
-		torture_comment(tctx, "testing NetSrvGetInfo level %u\n", r.in.level);
+		torture_comment(tctx, "Testing NetSrvGetInfo level %u\n", r.in.level);
 		status = dcerpc_srvsvc_NetSrvGetInfo_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetSrvGetInfo failed");
 		if (!W_ERROR_IS_OK(r.out.result)) {
@@ -981,7 +981,7 @@ static bool test_NetDiskEnum(struct torture_context *tctx,
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		ZERO_STRUCTP(r.out.info);
 		r.in.level = levels[i];
-		torture_comment(tctx, "testing NetDiskEnum level %u\n", r.in.level);
+		torture_comment(tctx, "Testing NetDiskEnum level %u\n", r.in.level);
 		status = dcerpc_srvsvc_NetDiskEnum_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetDiskEnum failed");
 		torture_assert_werr_ok(tctx, r.out.result, "NetDiskEnum failed");
@@ -1028,7 +1028,7 @@ static bool test_NetTransportEnum(struct torture_context *tctx,
 			transports.ctr.ctr1 = &ctr1;
 			break;
 		}
-		torture_comment(tctx, "testing NetTransportEnum level %u\n", transports.level);
+		torture_comment(tctx, "Testing NetTransportEnum level %u\n", transports.level);
 		status = dcerpc_srvsvc_NetTransportEnum_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "NetTransportEnum failed");
 		if (!W_ERROR_IS_OK(r.out.result)) {
@@ -1053,7 +1053,7 @@ static bool test_NetRemoteTOD(struct torture_context *tctx,
 	r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
 	r.out.info = &info;
 
-	torture_comment(tctx, "testing NetRemoteTOD\n");
+	torture_comment(tctx, "Testing NetRemoteTOD\n");
 	status = dcerpc_srvsvc_NetRemoteTOD_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status, "NetRemoteTOD failed");
 	torture_assert_werr_ok(tctx, r.out.result, "NetRemoteTOD failed");
@@ -1078,7 +1078,7 @@ static bool test_NetNameValidate(struct torture_context *tctx,
 	r.in.server_unc = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.flags = 0x0;
 
-	d_printf("testing NetNameValidate\n");
+	d_printf("Testing NetNameValidate\n");
 
 	/* valid path types only between 1 and 13 */
 	for (i = 1; i < 14; i++) {
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index d589d4bd33..33789941bc 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -49,7 +49,7 @@ static bool test_NetWkstaGetInfo(struct torture_context *tctx,
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		r.in.level = levels[i];
-		torture_comment(tctx, "testing NetWkstaGetInfo level %u\n",
+		torture_comment(tctx, "Testing NetWkstaGetInfo level %u\n",
 				r.in.level);
 		status = dcerpc_wkssvc_NetWkstaGetInfo_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status,
@@ -89,7 +89,7 @@ static bool test_NetWkstaTransportEnum(struct torture_context *tctx,
 	r.out.info = &info;
 	r.out.resume_handle = &resume_handle;
 
-	torture_comment(tctx, "testing NetWkstaTransportEnum level 0\n");
+	torture_comment(tctx, "Testing NetWkstaTransportEnum level 0\n");
 
 	status = dcerpc_wkssvc_NetWkstaTransportEnum_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -123,7 +123,7 @@ static bool test_NetrWkstaTransportAdd(struct torture_context *tctx,
 	r.in.info0 = &info0;
 	r.in.parm_err = r.out.parm_err = &parm_err;
 
-	torture_comment(tctx, "testing NetrWkstaTransportAdd level 0\n");
+	torture_comment(tctx, "Testing NetrWkstaTransportAdd level 0\n");
 
 	status = dcerpc_wkssvc_NetrWkstaTransportAdd_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -146,7 +146,7 @@ static bool test_NetrWkstaTransportDel(struct torture_context *tctx,
 	r.in.transport_name = SMBTORTURE_TRANSPORT_NAME;
 	r.in.unknown3 = 0;
 
-	torture_comment(tctx, "testing NetrWkstaTransportDel\n");
+	torture_comment(tctx, "Testing NetrWkstaTransportDel\n");
 
 	status = dcerpc_wkssvc_NetrWkstaTransportDel_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -198,7 +198,7 @@ static bool test_NetWkstaEnumUsers(struct torture_context *tctx,
 
 		r.out.entries_read = &entries_read;
 
-		torture_comment(tctx, "testing NetWkstaEnumUsers level %u\n",
+		torture_comment(tctx, "Testing NetWkstaEnumUsers level %u\n",
 				levels[i]);
 
 		status = dcerpc_wkssvc_NetWkstaEnumUsers_r(b, tctx, &r);
@@ -244,7 +244,7 @@ static bool test_NetrWkstaUserGetInfo(struct torture_context *tctx,
 		r.in.level = tests[i].level;
 		r.out.info = &info;
 
-		torture_comment(tctx, "testing NetrWkstaUserGetInfo level %u\n",
+		torture_comment(tctx, "Testing NetrWkstaUserGetInfo level %u\n",
 				r.in.level);
 
 		status = dcerpc_wkssvc_NetrWkstaUserGetInfo_r(b, tctx, &r);
@@ -302,7 +302,7 @@ static bool test_NetrUseEnum(struct torture_context *tctx,
 
 		r.out.entries_read = &entries_read;
 
-		torture_comment(tctx, "testing NetrUseEnum level %u\n",
+		torture_comment(tctx, "Testing NetrUseEnum level %u\n",
 				levels[i]);
 
 		status = dcerpc_wkssvc_NetrUseEnum_r(b, tctx, &r);
@@ -340,7 +340,7 @@ static bool test_NetrUseAdd(struct torture_context *tctx,
 	r.in.ctr = ctr;
 	r.in.parm_err = r.out.parm_err = &parm_err;
 
-	torture_comment(tctx, "testing NetrUseAdd level %u\n",
+	torture_comment(tctx, "Testing NetrUseAdd level %u\n",
 			r.in.level);
 
 	status = dcerpc_wkssvc_NetrUseAdd_r(b, tctx, &r);
@@ -363,7 +363,7 @@ static bool test_NetrUseAdd(struct torture_context *tctx,
 	r.in.ctr = ctr;
 	r.in.parm_err = r.out.parm_err = &parm_err;
 
-	torture_comment(tctx, "testing NetrUseAdd level %u\n",
+	torture_comment(tctx, "Testing NetrUseAdd level %u\n",
 			r.in.level);
 
 	status = dcerpc_wkssvc_NetrUseAdd_r(b, tctx, &r);
@@ -386,7 +386,7 @@ static bool test_NetrUseDel(struct torture_context *tctx,
 	r.in.use_name = SMBTORTURE_USE_NAME;
 	r.in.force_cond = 0;
 
-	torture_comment(tctx, "testing NetrUseDel\n");
+	torture_comment(tctx, "Testing NetrUseDel\n");
 
 	status = dcerpc_wkssvc_NetrUseDel_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -497,7 +497,7 @@ static bool test_NetrLogonDomainNameAdd(struct torture_context *tctx,
 
 	r.in.domain_name = lp_workgroup(tctx->lp_ctx);
 
-	torture_comment(tctx, "testing NetrLogonDomainNameAdd\n");
+	torture_comment(tctx, "Testing NetrLogonDomainNameAdd\n");
 
 	status = dcerpc_wkssvc_NetrLogonDomainNameAdd_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -516,7 +516,7 @@ static bool test_NetrLogonDomainNameDel(struct torture_context *tctx,
 
 	r.in.domain_name = lp_workgroup(tctx->lp_ctx);
 
-	torture_comment(tctx, "testing NetrLogonDomainNameDel\n");
+	torture_comment(tctx, "Testing NetrLogonDomainNameDel\n");
 
 	status = dcerpc_wkssvc_NetrLogonDomainNameDel_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -545,7 +545,7 @@ static bool test_NetrEnumerateComputerNames_level(struct torture_context *tctx,
 	r.in.Reserved = 0;
 	r.out.ctr = &ctr;
 
-	torture_comment(tctx, "testing NetrEnumerateComputerNames level %u\n",
+	torture_comment(tctx, "Testing NetrEnumerateComputerNames level %u\n",
 			r.in.name_type);
 
 	status = dcerpc_wkssvc_NetrEnumerateComputerNames_r(b, tctx, &r);
@@ -615,7 +615,7 @@ static bool test_NetrValidateName(struct torture_context *tctx,
 		r.in.Password = NULL;
 		r.in.name_type = levels[i];
 
-		torture_comment(tctx, "testing NetrValidateName level %u\n",
+		torture_comment(tctx, "Testing NetrValidateName level %u\n",
 				r.in.name_type);
 
 		status = dcerpc_wkssvc_NetrValidateName_r(b, tctx, &r);
@@ -646,7 +646,7 @@ static bool test_NetrValidateName2(struct torture_context *tctx,
 		r.in.EncryptedPassword = NULL;
 		r.in.name_type = levels[i];
 
-		torture_comment(tctx, "testing NetrValidateName2 level %u\n",
+		torture_comment(tctx, "Testing NetrValidateName2 level %u\n",
 				r.in.name_type);
 
 		status = dcerpc_wkssvc_NetrValidateName2_r(b, tctx, &r);
@@ -676,7 +676,7 @@ static bool test_NetrAddAlternateComputerName(struct torture_context *tctx,
 	r.in.EncryptedPassword = NULL;
 	r.in.Reserved = 0;
 
-	torture_comment(tctx, "testing NetrAddAlternateComputerName\n");
+	torture_comment(tctx, "Testing NetrAddAlternateComputerName\n");
 
 	status = dcerpc_wkssvc_NetrAddAlternateComputerName_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -718,7 +718,7 @@ static bool test_NetrRemoveAlternateComputerName(struct torture_context *tctx,
 	r.in.EncryptedPassword = NULL;
 	r.in.Reserved = 0;
 
-	torture_comment(tctx, "testing NetrRemoveAlternateComputerName\n");
+	torture_comment(tctx, "Testing NetrRemoveAlternateComputerName\n");
 
 	status = dcerpc_wkssvc_NetrRemoveAlternateComputerName_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -783,7 +783,7 @@ static bool test_NetrSetPrimaryComputername(struct torture_context *tctx,
 	const char **names_o = NULL, **names = NULL;
 	int num_names_o = 0, num_names = 0;
 
-	torture_comment(tctx, "testing NetrSetPrimaryComputername\n");
+	torture_comment(tctx, "Testing NetrSetPrimaryComputername\n");
 
 	if (!test_NetrAddAlternateComputerName(tctx, p)) {
 		return false;
@@ -851,7 +851,7 @@ static bool test_NetrRenameMachineInDomain(struct torture_context *tctx,
 	r.in.password = NULL;
 	r.in.RenameOptions = 0;
 
-	torture_comment(tctx, "testing NetrRenameMachineInDomain\n");
+	torture_comment(tctx, "Testing NetrRenameMachineInDomain\n");
 
 	status = dcerpc_wkssvc_NetrRenameMachineInDomain_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -889,7 +889,7 @@ static bool test_NetrRenameMachineInDomain2(struct torture_context *tctx,
 	const char **names_o = NULL, **names = NULL;
 	int num_names_o = 0, num_names = 0;
 
-	torture_comment(tctx, "testing NetrRenameMachineInDomain2\n");
+	torture_comment(tctx, "Testing NetrRenameMachineInDomain2\n");
 
 	if (!test_NetrEnumerateComputerNames_level(tctx, p,
 						   NetPrimaryComputerName,
@@ -967,7 +967,7 @@ static bool test_NetrWorkstationStatisticsGet(struct torture_context *tctx,
 	r.in.server_name = dcerpc_server_name(p);
 	r.out.info = &info;
 
-	torture_comment(tctx, "testing NetrWorkstationStatisticsGet\n");
+	torture_comment(tctx, "Testing NetrWorkstationStatisticsGet\n");
 
 	status = dcerpc_wkssvc_NetrWorkstationStatisticsGet_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -999,7 +999,7 @@ static bool test_NetrMessageBufferSend(struct torture_context *tctx,
 	r.in.message_buffer = (uint8_t *)msg;
 	r.in.message_size = size;
 
-	torture_comment(tctx, "testing NetrMessageBufferSend\n");
+	torture_comment(tctx, "Testing NetrMessageBufferSend\n");
 
 	status = dcerpc_wkssvc_NetrMessageBufferSend_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -1022,7 +1022,7 @@ static bool test_NetrGetJoinInformation(struct torture_context *tctx,
 	r.in.name_buffer = r.out.name_buffer = &name_buffer;
 	r.out.name_type = &join_status;
 
-	torture_comment(tctx, "testing NetrGetJoinInformation\n");
+	torture_comment(tctx, "Testing NetrGetJoinInformation\n");
 
 	status = dcerpc_wkssvc_NetrGetJoinInformation_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -1081,7 +1081,7 @@ static bool test_NetrGetJoinableOus(struct torture_context *tctx,
 	r.in.num_ous = r.out.num_ous = &num_ous;
 	r.out.ous = &ous;
 
-	torture_comment(tctx, "testing NetrGetJoinableOus\n");
+	torture_comment(tctx, "Testing NetrGetJoinableOus\n");
 
 	status = dcerpc_wkssvc_NetrGetJoinableOus_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status, "NetrGetJoinableOus failed");
@@ -1108,7 +1108,7 @@ static bool test_NetrGetJoinableOus2(struct torture_context *tctx,
 	r.in.num_ous = r.out.num_ous = &num_ous;
 	r.out.ous = &ous;
 
-	torture_comment(tctx, "testing NetrGetJoinableOus2\n");
+	torture_comment(tctx, "Testing NetrGetJoinableOus2\n");
 
 	status = dcerpc_wkssvc_NetrGetJoinableOus2_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status, "NetrGetJoinableOus2 failed");
@@ -1138,7 +1138,7 @@ static bool test_NetrUnjoinDomain(struct torture_context *tctx,
 	r.in.password = NULL;
 	r.in.unjoin_flags = 0;
 
-	torture_comment(tctx, "testing NetrUnjoinDomain\n");
+	torture_comment(tctx, "Testing NetrUnjoinDomain\n");
 
 	status = dcerpc_wkssvc_NetrUnjoinDomain_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -1169,7 +1169,7 @@ static bool test_NetrJoinDomain(struct torture_context *tctx,
 	r.in.password = NULL;
 	r.in.join_flags = 0;
 
-	torture_comment(tctx, "testing NetrJoinDomain\n");
+	torture_comment(tctx, "Testing NetrJoinDomain\n");
 
 	status = dcerpc_wkssvc_NetrJoinDomain_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -1252,7 +1252,7 @@ static bool test_NetrJoinDomain2(struct torture_context *tctx,
 	r.in.join_flags = WKSSVC_JOIN_FLAGS_JOIN_TYPE |
 			  WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE;
 
-	torture_comment(tctx, "testing NetrJoinDomain2 (assuming non-DC)\n");
+	torture_comment(tctx, "Testing NetrJoinDomain2 (assuming non-DC)\n");
 
 	status = dcerpc_wkssvc_NetrJoinDomain2_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,
@@ -1331,7 +1331,7 @@ static bool test_NetrUnjoinDomain2(struct torture_context *tctx,
 	r.in.encrypted_password = pwd_buf;
 	r.in.unjoin_flags = 0;
 
-	torture_comment(tctx, "testing NetrUnjoinDomain2 (assuming non-DC)\n");
+	torture_comment(tctx, "Testing NetrUnjoinDomain2 (assuming non-DC)\n");
 
 	status = dcerpc_wkssvc_NetrUnjoinDomain2_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status,