diff --git a/Tests/MapboxMapsTests/Annotations/Generated/CircleAnnotationTests.swift b/Tests/MapboxMapsTests/Annotations/Generated/CircleAnnotationTests.swift
index abdc8695d1cf..73d1e381f3d1 100644
--- a/Tests/MapboxMapsTests/Annotations/Generated/CircleAnnotationTests.swift
+++ b/Tests/MapboxMapsTests/Annotations/Generated/CircleAnnotationTests.swift
@@ -13,7 +13,7 @@ final class CircleAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(circleSortKey) = layerProperties["circle-sort-key"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(circle-sort-key) should be set to a number.")
         }
         XCTAssertEqual(circleSortKey, annotation.circleSortKey)
     }
@@ -27,7 +27,7 @@ final class CircleAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(circleBlur) = layerProperties["circle-blur"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(circle-blur) should be set to a number.")
         }
         XCTAssertEqual(circleBlur, annotation.circleBlur)
     }
@@ -41,7 +41,7 @@ final class CircleAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(circleColor) = layerProperties["circle-color"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(circle-color) should be set to a string.")
         }
         XCTAssertEqual(circleColor, annotation.circleColor.flatMap { $0.rgbaString })
     }
@@ -55,7 +55,7 @@ final class CircleAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(circleOpacity) = layerProperties["circle-opacity"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(circle-opacity) should be set to a number.")
         }
         XCTAssertEqual(circleOpacity, annotation.circleOpacity)
     }
@@ -69,7 +69,7 @@ final class CircleAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(circleRadius) = layerProperties["circle-radius"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(circle-radius) should be set to a number.")
         }
         XCTAssertEqual(circleRadius, annotation.circleRadius)
     }
@@ -83,7 +83,7 @@ final class CircleAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(circleStrokeColor) = layerProperties["circle-stroke-color"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(circle-stroke-color) should be set to a string.")
         }
         XCTAssertEqual(circleStrokeColor, annotation.circleStrokeColor.flatMap { $0.rgbaString })
     }
@@ -97,7 +97,7 @@ final class CircleAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(circleStrokeOpacity) = layerProperties["circle-stroke-opacity"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(circle-stroke-opacity) should be set to a number.")
         }
         XCTAssertEqual(circleStrokeOpacity, annotation.circleStrokeOpacity)
     }
@@ -111,7 +111,7 @@ final class CircleAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(circleStrokeWidth) = layerProperties["circle-stroke-width"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(circle-stroke-width) should be set to a number.")
         }
         XCTAssertEqual(circleStrokeWidth, annotation.circleStrokeWidth)
     }
diff --git a/Tests/MapboxMapsTests/Annotations/Generated/PointAnnotationTests.swift b/Tests/MapboxMapsTests/Annotations/Generated/PointAnnotationTests.swift
index 1af54a06df40..4f243e2e60c5 100644
--- a/Tests/MapboxMapsTests/Annotations/Generated/PointAnnotationTests.swift
+++ b/Tests/MapboxMapsTests/Annotations/Generated/PointAnnotationTests.swift
@@ -13,7 +13,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(iconAnchor) = layerProperties["icon-anchor"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(icon-anchor) should be set to a string.")
         }
         XCTAssertEqual(iconAnchor, annotation.iconAnchor?.rawValue)
     }
@@ -27,7 +27,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(iconImage) = layerProperties["icon-image"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(icon-image) should be set to a string.")
         }
         XCTAssertEqual(iconImage, annotation.iconImage)
     }
@@ -41,7 +41,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .array(iconOffset) = layerProperties["icon-offset"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(icon-offset) should be set to a array of Doubles.")
         }
         XCTAssertEqual(iconOffset.compactMap { $0?.rawValue } as? [Double], annotation.iconOffset)
     }
@@ -55,7 +55,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(iconRotate) = layerProperties["icon-rotate"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(icon-rotate) should be set to a number.")
         }
         XCTAssertEqual(iconRotate, annotation.iconRotate)
     }
@@ -69,7 +69,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(iconSize) = layerProperties["icon-size"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(icon-size) should be set to a number.")
         }
         XCTAssertEqual(iconSize, annotation.iconSize)
     }
@@ -83,7 +83,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(symbolSortKey) = layerProperties["symbol-sort-key"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(symbol-sort-key) should be set to a number.")
         }
         XCTAssertEqual(symbolSortKey, annotation.symbolSortKey)
     }
@@ -97,7 +97,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(textAnchor) = layerProperties["text-anchor"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-anchor) should be set to a string.")
         }
         XCTAssertEqual(textAnchor, annotation.textAnchor?.rawValue)
     }
@@ -111,7 +111,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(textField) = layerProperties["text-field"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-field) should be set to a string.")
         }
         XCTAssertEqual(textField, annotation.textField)
     }
@@ -125,7 +125,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(textJustify) = layerProperties["text-justify"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-justify) should be set to a string.")
         }
         XCTAssertEqual(textJustify, annotation.textJustify?.rawValue)
     }
@@ -139,7 +139,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(textLetterSpacing) = layerProperties["text-letter-spacing"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-letter-spacing) should be set to a number.")
         }
         XCTAssertEqual(textLetterSpacing, annotation.textLetterSpacing)
     }
@@ -153,7 +153,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(textMaxWidth) = layerProperties["text-max-width"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-max-width) should be set to a number.")
         }
         XCTAssertEqual(textMaxWidth, annotation.textMaxWidth)
     }
@@ -167,7 +167,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .array(textOffset) = layerProperties["text-offset"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-offset) should be set to a array of Doubles.")
         }
         XCTAssertEqual(textOffset.compactMap { $0?.rawValue } as? [Double], annotation.textOffset)
     }
@@ -181,7 +181,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(textRadialOffset) = layerProperties["text-radial-offset"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-radial-offset) should be set to a number.")
         }
         XCTAssertEqual(textRadialOffset, annotation.textRadialOffset)
     }
@@ -195,7 +195,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(textRotate) = layerProperties["text-rotate"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-rotate) should be set to a number.")
         }
         XCTAssertEqual(textRotate, annotation.textRotate)
     }
@@ -209,7 +209,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(textSize) = layerProperties["text-size"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-size) should be set to a number.")
         }
         XCTAssertEqual(textSize, annotation.textSize)
     }
@@ -223,7 +223,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(textTransform) = layerProperties["text-transform"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-transform) should be set to a string.")
         }
         XCTAssertEqual(textTransform, annotation.textTransform?.rawValue)
     }
@@ -237,7 +237,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(iconColor) = layerProperties["icon-color"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(icon-color) should be set to a string.")
         }
         XCTAssertEqual(iconColor, annotation.iconColor.flatMap { $0.rgbaString })
     }
@@ -251,7 +251,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(iconHaloBlur) = layerProperties["icon-halo-blur"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(icon-halo-blur) should be set to a number.")
         }
         XCTAssertEqual(iconHaloBlur, annotation.iconHaloBlur)
     }
@@ -265,7 +265,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(iconHaloColor) = layerProperties["icon-halo-color"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(icon-halo-color) should be set to a string.")
         }
         XCTAssertEqual(iconHaloColor, annotation.iconHaloColor.flatMap { $0.rgbaString })
     }
@@ -279,7 +279,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(iconHaloWidth) = layerProperties["icon-halo-width"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(icon-halo-width) should be set to a number.")
         }
         XCTAssertEqual(iconHaloWidth, annotation.iconHaloWidth)
     }
@@ -293,7 +293,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(iconOpacity) = layerProperties["icon-opacity"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(icon-opacity) should be set to a number.")
         }
         XCTAssertEqual(iconOpacity, annotation.iconOpacity)
     }
@@ -307,7 +307,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(textColor) = layerProperties["text-color"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-color) should be set to a string.")
         }
         XCTAssertEqual(textColor, annotation.textColor.flatMap { $0.rgbaString })
     }
@@ -321,7 +321,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(textHaloBlur) = layerProperties["text-halo-blur"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-halo-blur) should be set to a number.")
         }
         XCTAssertEqual(textHaloBlur, annotation.textHaloBlur)
     }
@@ -335,7 +335,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(textHaloColor) = layerProperties["text-halo-color"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-halo-color) should be set to a string.")
         }
         XCTAssertEqual(textHaloColor, annotation.textHaloColor.flatMap { $0.rgbaString })
     }
@@ -349,7 +349,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(textHaloWidth) = layerProperties["text-halo-width"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-halo-width) should be set to a number.")
         }
         XCTAssertEqual(textHaloWidth, annotation.textHaloWidth)
     }
@@ -363,7 +363,7 @@ final class PointAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(textOpacity) = layerProperties["text-opacity"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(text-opacity) should be set to a number.")
         }
         XCTAssertEqual(textOpacity, annotation.textOpacity)
     }
diff --git a/Tests/MapboxMapsTests/Annotations/Generated/PolygonAnnotationTests.swift b/Tests/MapboxMapsTests/Annotations/Generated/PolygonAnnotationTests.swift
index 4f4d53b860c1..da4d6b1c3741 100644
--- a/Tests/MapboxMapsTests/Annotations/Generated/PolygonAnnotationTests.swift
+++ b/Tests/MapboxMapsTests/Annotations/Generated/PolygonAnnotationTests.swift
@@ -20,7 +20,7 @@ final class PolygonAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(fillSortKey) = layerProperties["fill-sort-key"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(fill-sort-key) should be set to a number.")
         }
         XCTAssertEqual(fillSortKey, annotation.fillSortKey)
     }
@@ -41,7 +41,7 @@ final class PolygonAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(fillColor) = layerProperties["fill-color"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(fill-color) should be set to a string.")
         }
         XCTAssertEqual(fillColor, annotation.fillColor.flatMap { $0.rgbaString })
     }
@@ -62,7 +62,7 @@ final class PolygonAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(fillOpacity) = layerProperties["fill-opacity"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(fill-opacity) should be set to a number.")
         }
         XCTAssertEqual(fillOpacity, annotation.fillOpacity)
     }
@@ -83,7 +83,7 @@ final class PolygonAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(fillOutlineColor) = layerProperties["fill-outline-color"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(fill-outline-color) should be set to a string.")
         }
         XCTAssertEqual(fillOutlineColor, annotation.fillOutlineColor.flatMap { $0.rgbaString })
     }
@@ -104,7 +104,7 @@ final class PolygonAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(fillPattern) = layerProperties["fill-pattern"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(fill-pattern) should be set to a string.")
         }
         XCTAssertEqual(fillPattern, annotation.fillPattern)
     }
diff --git a/Tests/MapboxMapsTests/Annotations/Generated/PolylineAnnotationTests.swift b/Tests/MapboxMapsTests/Annotations/Generated/PolylineAnnotationTests.swift
index eeea3e2a2fff..4799e31ebc74 100644
--- a/Tests/MapboxMapsTests/Annotations/Generated/PolylineAnnotationTests.swift
+++ b/Tests/MapboxMapsTests/Annotations/Generated/PolylineAnnotationTests.swift
@@ -14,7 +14,7 @@ final class PolylineAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(lineJoin) = layerProperties["line-join"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(line-join) should be set to a string.")
         }
         XCTAssertEqual(lineJoin, annotation.lineJoin?.rawValue)
     }
@@ -29,7 +29,7 @@ final class PolylineAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(lineSortKey) = layerProperties["line-sort-key"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(line-sort-key) should be set to a number.")
         }
         XCTAssertEqual(lineSortKey, annotation.lineSortKey)
     }
@@ -44,7 +44,7 @@ final class PolylineAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(lineBlur) = layerProperties["line-blur"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(line-blur) should be set to a number.")
         }
         XCTAssertEqual(lineBlur, annotation.lineBlur)
     }
@@ -59,7 +59,7 @@ final class PolylineAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(lineColor) = layerProperties["line-color"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(line-color) should be set to a string.")
         }
         XCTAssertEqual(lineColor, annotation.lineColor.flatMap { $0.rgbaString })
     }
@@ -74,7 +74,7 @@ final class PolylineAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(lineGapWidth) = layerProperties["line-gap-width"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(line-gap-width) should be set to a number.")
         }
         XCTAssertEqual(lineGapWidth, annotation.lineGapWidth)
     }
@@ -89,7 +89,7 @@ final class PolylineAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(lineOffset) = layerProperties["line-offset"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(line-offset) should be set to a number.")
         }
         XCTAssertEqual(lineOffset, annotation.lineOffset)
     }
@@ -104,7 +104,7 @@ final class PolylineAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(lineOpacity) = layerProperties["line-opacity"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(line-opacity) should be set to a number.")
         }
         XCTAssertEqual(lineOpacity, annotation.lineOpacity)
     }
@@ -119,7 +119,7 @@ final class PolylineAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .string(linePattern) = layerProperties["line-pattern"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(line-pattern) should be set to a string.")
         }
         XCTAssertEqual(linePattern, annotation.linePattern)
     }
@@ -134,7 +134,7 @@ final class PolylineAnnotationTests: XCTestCase {
         }
         guard case let .object(layerProperties) = featureProperties["layerProperties"],
               case let .number(lineWidth) = layerProperties["line-width"] else {
-            return XCTFail()
+            return XCTFail("Layer property \(line-width) should be set to a number.")
         }
         XCTAssertEqual(lineWidth, annotation.lineWidth)
     }