diff --git a/test/testenv/appframework_utils.go b/test/testenv/appframework_utils.go
index a60554bd6..a1806d657 100644
--- a/test/testenv/appframework_utils.go
+++ b/test/testenv/appframework_utils.go
@@ -430,7 +430,9 @@ func GenerateAppFrameworkSpec(ctx context.Context, testenvInstance *TestCaseEnv,
 // WaitforPhaseChange Wait for timeout or when phase change is seen on a CR for any particular app
 // Deprecated: Use WaitForAppPhaseChange instead for better timeout control
 func WaitforPhaseChange(ctx context.Context, deployment *Deployment, testenvInstance *TestCaseEnv, name string, crKind string, appSourceName string, appList []string) {
-	_ = WaitForAppPhaseChange(ctx, deployment, testenvInstance, name, crKind, appSourceName, appList, 2*time.Minute)
+	if err := WaitForAppPhaseChange(ctx, deployment, testenvInstance, name, crKind, appSourceName, appList, 2*time.Minute); err != nil {
+		testenvInstance.Log.Error(err, "WaitforPhaseChange did not observe a phase transition within timeout", "cr", name, "kind", crKind, "appSource", appSourceName)
+	}
 }
 
 // WaitForAppPhaseChange waits for any app in the list to change from PhaseInstall to another phase
diff --git a/test/testenv/testcaseenv.go b/test/testenv/testcaseenv.go
index 4e0ccb3c4..5399e56b4 100644
--- a/test/testenv/testcaseenv.go
+++ b/test/testenv/testcaseenv.go
@@ -72,10 +72,8 @@ func NewDefaultTestCaseEnv(kubeClient client.Client, name string) (*TestCaseEnv,
 
 // NewTestCaseEnv creates a new test environment to run tests againsts
 func NewTestCaseEnv(kubeClient client.Client, name string, operatorImage string, splunkImage string, licenseFilePath string) (*TestCaseEnv, error) {
-	var envName string
-
 	// The name are used in various resource label and there is a 63 char limit. Do our part to make sure we do not exceed that limit
-	if len(envName) > 24 {
+	if len(name) > 24 {
 		return nil, fmt.Errorf("name %s has exceeded 24 chars", name)
 	}
 
diff --git a/test/testenv/util.go b/test/testenv/util.go
index 90460849b..dbd849450 100644
--- a/test/testenv/util.go
+++ b/test/testenv/util.go
@@ -328,7 +328,7 @@ func newClusterMasterWithGivenIndexes(name, ns, licenseManagerName, ansibleConfi
 
 	new := enterpriseApiV3.ClusterMaster{
 		TypeMeta: metav1.TypeMeta{
-			Kind: "ClusterManager",
+			Kind: "ClusterMaster",
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:       name,