diff --git a/src/test/java/Test1.java b/src/test/java/Test1.java
index af3d3417..28a7fd09 100644
--- a/src/test/java/Test1.java
+++ b/src/test/java/Test1.java
@@ -135,9 +135,9 @@ public void test1_element_addition_1() throws InterruptedException {
             driver.findElement(By.xpath(xpath)).click();
             Thread.sleep(500);
             test1.log(Status.PASS, "Item No. " + i + " marked completed");
-            By remainingItem = By.className("ng-binding");
+            By remainingItem = By.cssSelector("[data-testid='remaining-count']");
             String actualText = driver.findElement(remainingItem).getText();
-            String expectedText = remaining + " of " + totalCount + " tasks remaining";
+            String expectedText = remaining + " of " + totalCount + " remaining";
 
             if (!actualText.contains(expectedText)) {
                 test1.log(Status.FAIL, "Wrong Text Description");
@@ -192,9 +192,9 @@ public void test1_element_addition_2() throws InterruptedException, IOException
             driver.findElement(By.xpath(xpath)).click();
             Thread.sleep(500);
             test2.log(Status.PASS, "Item No. " + i + " marked completed");
-            By remainingItem = By.className("ng-binding");
+            By remainingItem = By.cssSelector("[data-testid='remaining-count']");
             String actualText = driver.findElement(remainingItem).getText();
-            String expectedText = remaining + " of " + totalCount + " tasks remaining";
+            String expectedText = remaining + " of " + totalCount + " remaining";
 
             if (!actualText.contains(expectedText)) {
                 test2.log(Status.FAIL, "Wrong Text Description");
diff --git a/yaml/linux/v1/testng_hyperexecute_matrix_sample_ocp.yaml b/yaml/linux/v1/testng_hyperexecute_matrix_sample_ocp.yaml
new file mode 100644
index 00000000..2e3c55b2
--- /dev/null
+++ b/yaml/linux/v1/testng_hyperexecute_matrix_sample_ocp.yaml
@@ -0,0 +1,32 @@
+---
+version: 0.1
+runson: ${matrix.os}
+
+onpremEnv: ocp-pre-prod
+
+matrix:
+  tests: ["Test_1"]
+  browser: ["Chrome"]
+  version: ["latest"]
+  os: ["linux"]
+
+runtime:
+  language: java
+  version: 11
+
+cacheKey: '{{ checksum "pom.xml" }}'
+cacheDirectories:
+  - .m2
+
+pre:
+  - mvn -Dmaven.repo.local=./.m2 dependency:resolve
+
+testSuites:
+  - mvn test -Dplatname=linux -Dmaven.repo.local=./.m2 -DselectedTests=$tests
+
+parallelism: 1
+
+retryOnFailure: true
+maxRetries: 1
+
+jobLabel: [selenium-testng, linux, matrix, ocp-pre-prod]