diff --git a/cts/cts.py b/cts/cts.py
index 5576e296..51ed6822 100644
--- a/cts/cts.py
+++ b/cts/cts.py
@@ -390,7 +390,8 @@ def apply_to_scenes(func, anari_library, anari_device = None, anari_renderer = "
                                         continue
                                 else:
                                     subtype = item["subtype"]
-                                if anariObjectName == "geometry" and parsed_json["sceneParameters"]["geometrySubtype"] != None and subtype != parsed_json["sceneParameters"]["geometrySubtype"]:
+                                if (anariObjectName == "geometry" and parsed_json["sceneParameters"]["geometrySubtype"] != None and 
+                                    parsed_json["sceneParameters"]["geometrySubtype"] != "" and subtype != parsed_json["sceneParameters"]["geometrySubtype"]):
                                     # If geometrySubtype is not the same as subtype ignore the generic anari object
                                     continue
                                 ctsType = ""
diff --git a/cts/header/TextureGenerator.h b/cts/header/TextureGenerator.h
index 1b2b988d..b391899e 100644
--- a/cts/header/TextureGenerator.h
+++ b/cts/header/TextureGenerator.h
@@ -20,7 +20,7 @@ class TextureGenerator
   static std::vector<anari::math::float4> generateCheckerBoardNormalMap(
       size_t resolution);
 
-  static std::vector<anari::math::float4> generateCheckerBoardHDR(
+  static std::vector<anari::math::float3> generateCheckerBoardHDR(
       size_t resolution);
 
   static anari::math::float3 convertColorToNormal(anari::math::float3 color);
diff --git a/cts/src/TextureGenerator.cpp b/cts/src/TextureGenerator.cpp
index 57de6f49..3b31d778 100644
--- a/cts/src/TextureGenerator.cpp
+++ b/cts/src/TextureGenerator.cpp
@@ -40,11 +40,11 @@ std::vector<anari::math::float4> TextureGenerator::generateCheckerBoard(
   return checkerBoard;
 }
 
-std::vector<anari::math::float4> TextureGenerator::generateCheckerBoardHDR(size_t resolution)
+std::vector<anari::math::float3> TextureGenerator::generateCheckerBoardHDR(size_t resolution)
 {
   PrimitiveGenerator generator(0);
   size_t counter = 0;
-  std::vector<anari::math::float4> checkerBoard(resolution * resolution);
+  std::vector<anari::math::float3> checkerBoard(resolution * resolution);
   for (size_t i = 0; i < 8; ++i) {
     size_t offset = resolution * i * resolution / 8;
     if (i % 2 == 0) {
@@ -57,7 +57,7 @@ std::vector<anari::math::float4> TextureGenerator::generateCheckerBoardHDR(size_
       for (size_t x = 0; x < resolution / 8; ++x) {
         for (size_t y = 0; y < resolution / 8; ++y) {
           checkerBoard[y + j * resolution / 8 + x * resolution + offset] =
-              anari::math::float4(color, 1.0f);
+              color;
         }
       }
       ++counter;
diff --git a/cts/test_scenes/geometry/isosurface/isosurface.json b/cts/test_scenes/geometry/isosurface/isosurface.json
index 4014b6fa..7fa743da 100644
--- a/cts/test_scenes/geometry/isosurface/isosurface.json
+++ b/cts/test_scenes/geometry/isosurface/isosurface.json
@@ -24,6 +24,12 @@
           {
             "subtype": "structuredRegular"
           }
+        ],
+        "material": [
+          {
+            "subtype": "matte",
+            "color": "color"
+          }
         ]
       }
     },
diff --git a/cts/test_scenes/light/hdri.json b/cts/test_scenes/light/hdri.json
index cb989f76..b6b89932 100644
--- a/cts/test_scenes/light/hdri.json
+++ b/cts/test_scenes/light/hdri.json
@@ -39,8 +39,8 @@
       null,
       [
         0.0,
-        0.0,
-        -1.0
+        -1.0,
+        0.0
       ]
     ],
     "/anari_objects/light/0/scale": [