diff --git a/.golangci.yml b/.golangci.yml
index e2e2194f5..0533451f3 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -12,6 +12,7 @@ linters-settings:
     line-length: 135
   wsl:
     strict-append: false
+    allow-assign-and-anything: true
   gocognit:
     min-complexity: 36
   gofmt:
diff --git a/tests/operator/operator.test b/tests/operator/operator.test
deleted file mode 100755
index d6f998d71..000000000
Binary files a/tests/operator/operator.test and /dev/null differ
diff --git a/tests/operator/tests/operator_single_or_multi_namespaced_allowed_in_tenant_namespaces.go b/tests/operator/tests/operator_single_or_multi_namespaced_allowed_in_tenant_namespaces.go
index 38d67085a..1e62e5eff 100644
--- a/tests/operator/tests/operator_single_or_multi_namespaced_allowed_in_tenant_namespaces.go
+++ b/tests/operator/tests/operator_single_or_multi_namespaced_allowed_in_tenant_namespaces.go
@@ -27,9 +27,11 @@ var _ = Describe("Operator single-or-multi-namespaced-allowed-in-tenant-namespac
 				tsparams.OperatorNamespace)
 
 		randomTargetingNamespace = randomNamespace + "-targeting"
+
 		createTestOperatorGroup(randomTargetingNamespace, tsparams.SingleOrMultiNamespacedOperatorGroup, []string{randomNamespace})
 
 		DeferCleanup(func() {
+
 			err := globalhelper.DeleteNamespaceAndWait(randomTargetingNamespace, tsparams.Timeout)
 			Expect(err).ToNot(HaveOccurred(), "Error deleting namespace "+randomTargetingNamespace)
 		})
@@ -41,6 +43,7 @@ var _ = Describe("Operator single-or-multi-namespaced-allowed-in-tenant-namespac
 			[]string{tsparams.CertsuiteTargetOperatorLabels},
 			[]string{},
 			[]string{}, randomCertsuiteConfigDir)
+
 		Expect(err).ToNot(HaveOccurred())
 	})
 
@@ -60,12 +63,14 @@ var _ = Describe("Operator single-or-multi-namespaced-allowed-in-tenant-namespac
 			globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()),
 			randomReportDir,
 			randomCertsuiteConfigDir)
+
 		Expect(err).ToNot(HaveOccurred())
 
 		By("Verify test case status in Claim report")
 		err = globalhelper.ValidateIfReportsAreValid(
 			tsparams.CertsuiteOperatorSingleOrMultiNamespacedAllowedInTenantNamespaces,
 			globalparameters.TestCasePassed, randomReportDir)
+
 		Expect(err).ToNot(HaveOccurred())
 	})
 
@@ -73,6 +78,7 @@ var _ = Describe("Operator single-or-multi-namespaced-allowed-in-tenant-namespac
 	It("operator namespace contains own-namespaced namespace operator", func() {
 		By("Deploy operator group")
 		err := tshelper.DeployTestOperatorGroup(randomNamespace, false)
+
 		Expect(err).ToNot(HaveOccurred(), "Error deploying operator group")
 
 		installAndLabelOperator(randomNamespace)
@@ -83,12 +89,14 @@ var _ = Describe("Operator single-or-multi-namespaced-allowed-in-tenant-namespac
 			globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()),
 			randomReportDir,
 			randomCertsuiteConfigDir)
+
 		Expect(err).ToNot(HaveOccurred())
 
 		By("Verify test case status in Claim report")
 		err = globalhelper.ValidateIfReportsAreValid(
 			tsparams.CertsuiteOperatorSingleOrMultiNamespacedAllowedInTenantNamespaces,
 			globalparameters.TestCaseFailed, randomReportDir)
+
 		Expect(err).ToNot(HaveOccurred())
 	})
 
@@ -106,12 +114,14 @@ var _ = Describe("Operator single-or-multi-namespaced-allowed-in-tenant-namespac
 			globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()),
 			randomReportDir,
 			randomCertsuiteConfigDir)
+
 		Expect(err).ToNot(HaveOccurred())
 
 		By("Verify test case status in Claim report")
 		err = globalhelper.ValidateIfReportsAreValid(
 			tsparams.CertsuiteOperatorSingleOrMultiNamespacedAllowedInTenantNamespaces,
 			globalparameters.TestCasePassed, randomReportDir)
+
 		Expect(err).ToNot(HaveOccurred())
 	})
 
@@ -154,12 +164,14 @@ var _ = Describe("Operator single-or-multi-namespaced-allowed-in-tenant-namespac
 			globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()),
 			randomReportDir,
 			randomCertsuiteConfigDir)
+
 		Expect(err).ToNot(HaveOccurred())
 
 		By("Verify test case status in Claim report")
 		err = globalhelper.ValidateIfReportsAreValid(
 			tsparams.CertsuiteOperatorSingleOrMultiNamespacedAllowedInTenantNamespaces,
 			globalparameters.TestCaseFailed, randomReportDir)
+
 		Expect(err).ToNot(HaveOccurred())
 	})
 
@@ -225,7 +237,6 @@ var _ = Describe("Operator single-or-multi-namespaced-allowed-in-tenant-namespac
 		installAndLabelOperator(randomNamespace)
 
 		By("Deploy anchore-engine operator for testing")
-		createTestOperatorGroup(randomNamespace, tsparams.SingleOrMultiNamespacedOperatorGroup, []string{randomNamespace})
 		err := tshelper.DeployOperatorSubscription(
 			tsparams.OperatorPrefixAnchore,
 			tsparams.OperatorPrefixAnchore,
@@ -239,18 +250,24 @@ var _ = Describe("Operator single-or-multi-namespaced-allowed-in-tenant-namespac
 		Expect(err).ToNot(HaveOccurred(), ErrorDeployOperatorStr+
 			tsparams.OperatorPrefixAnchore)
 
+		err = waitUntilOperatorIsReady(tsparams.OperatorPrefixAnchore, randomNamespace)
+		Expect(err).ToNot(HaveOccurred(), "Operator "+tsparams.OperatorPrefixAnchore+
+			" is not ready")
+
 		By("Start test")
 		err = globalhelper.LaunchTests(
 			tsparams.CertsuiteOperatorSingleOrMultiNamespacedAllowedInTenantNamespaces,
 			globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()),
 			randomReportDir,
 			randomCertsuiteConfigDir)
+
 		Expect(err).ToNot(HaveOccurred())
 
 		By("Verify test case status in Claim report")
 		err = globalhelper.ValidateIfReportsAreValid(
 			tsparams.CertsuiteOperatorSingleOrMultiNamespacedAllowedInTenantNamespaces,
 			globalparameters.TestCaseFailed, randomReportDir)
+
 		Expect(err).ToNot(HaveOccurred())
 	})
 })
@@ -262,31 +279,26 @@ func installClusterWideOperator() {
 	)
 
 	By("Create openshift-logging namespace")
-
 	err := globalhelper.CreateNamespace(openshiftLoggingNamespace)
 	Expect(err).ToNot(HaveOccurred())
 
 	By("Create fake operator group for cluster-logging operator")
-
 	err = tshelper.DeployTestOperatorGroup(openshiftLoggingNamespace, true)
 	Expect(err).ToNot(HaveOccurred(), "Error deploying operator group")
 
 	By("Query the packagemanifest for defaultChannel for " + clusterLoggingOperatorName)
-
 	channel, err := globalhelper.QueryPackageManifestForDefaultChannel(clusterLoggingOperatorName, openshiftLoggingNamespace)
 	Expect(err).ToNot(HaveOccurred(), "Error querying package manifest for "+clusterLoggingOperatorName)
 
 	fmt.Printf("CHANNEL FOUND: %s\n", channel)
 
 	By("Query the packagemanifest for the " + clusterLoggingOperatorName)
-
 	version, err := globalhelper.QueryPackageManifestForVersion(clusterLoggingOperatorName, openshiftLoggingNamespace, channel)
 	Expect(err).ToNot(HaveOccurred(), "Error querying package manifest for "+clusterLoggingOperatorName)
 
 	fmt.Printf("VERSION FOUND: %s\n", version)
 
 	By("Deploy cluster-logging operator for testing")
-
 	err = tshelper.DeployOperatorSubscription(
 		clusterLoggingOperatorName,
 		clusterLoggingOperatorName,
@@ -300,7 +312,6 @@ func installClusterWideOperator() {
 	Expect(err).ToNot(HaveOccurred(), ErrorDeployOperatorStr+clusterLoggingOperatorName)
 
 	By("Wait until operator is ready")
-
 	err = tshelper.WaitUntilOperatorIsReady(clusterLoggingOperatorName, openshiftLoggingNamespace)
 	Expect(err).ToNot(HaveOccurred(), "Operator "+clusterLoggingOperatorName+" is not ready")
 
@@ -321,12 +332,13 @@ func createTestOperatorGroup(namespace, operatorGroupName string, targetNamespac
 	By("Create target namespaces")
 	for _, targetNamespace := range targetNamespaces {
 		err := globalhelper.CreateNamespace(targetNamespace)
+
 		Expect(err).ToNot(HaveOccurred(), "Error creating namespace "+targetNamespace)
 	}
 
 	DeferCleanup(func() {
-
 		for _, targetNamespace := range targetNamespaces {
+
 			err := globalhelper.DeleteNamespaceAndWait(targetNamespace, tsparams.Timeout)
 			Expect(err).ToNot(HaveOccurred(), "Error deleting namespace "+targetNamespace)
 		}
@@ -339,7 +351,7 @@ func createTestOperatorGroup(namespace, operatorGroupName string, targetNamespac
 
 func installAndLabelOperator(operatorNamespace string) {
 	By("Query the packagemanifest for the default channel")
-	channel, err := globalhelper.QueryPackageManifestForDefaultChannel(
+	channel, err := globalhelper.QueryPackageManifestForDefaultChannel( //nolint:wsl
 		tsparams.CertifiedOperatorPrefixNginx,
 		operatorNamespace,
 	)