Fixed the skipped test + usage of variables in Yaml tests

Author: ezimuel

util/ActionTest.php

@@ -419,9 +419,10 @@ private function convertResponseField(string $field): string
     private function convertDollarValueInVariable(string $value): string
     {
         foreach ($this->variables as $var) {
+            
             $value = str_replace("\${{$var}}", "\$$var", $value);
             $value = str_replace("'\$$var'", "\$$var", $value);
-            if (preg_match("/'[^']*\\\${$var}[^']*'/", $value)) {
+            if (preg_match("/'[^']*\\\${$var}[^']*',/", $value)) {
                 $value = str_replace("\$$var", "' . \$$var . '", $value);
             }
         }

util/YamlTests.php

@@ -151,7 +151,9 @@ public function build(): array
                             $alreadyAssignedNames[] = $functionName;
 
                             $skippedTest = sprintf("%s\\%s::%s", $namespace, $testName, $functionName);
-                            $skip = self::$testSuite === 'oss' ? self::SKIPPED_TEST_OSS : self::SKIPPED_TEST_XPACK;
+                            $skip = strtolower(self::$testSuite) === 'oss' 
+                                ? self::SKIPPED_TEST_OSS 
+                                : self::SKIPPED_TEST_XPACK;
                             if (isset($skip[$skippedTest])) {
                                 $functions .= self::render(
                                     self::TEMPLATE_FUNCTION_SKIPPED,