 
     // MARK: - CGRect
     lazy var cg_rectValues: [Int : CGRect] = {
-        // FIXME: Comment the tests back in once rdar://problem/33363218 is in the SDK.
         var values = [
             #line : CGRect.zero,
-            // #line : CGRect.null,
+            #line : CGRect.null,
             #line : CGRect(x: 10, y: 20, width: 30, height: 40)
         ]
 
         if #available(OSX 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *) {
             // Limit on magnitude in JSON. See rdar://problem/12717407
-            // values[#line] = CGRect.infinite
+            values[#line] = CGRect.infinite
         }
 
         return values

class TestCodable : TestCodableSuper {
    // MARK: - AffineTransform
#if os(OSX)
    // FIXME: Comment the tests back in once rdar://problem/33363218 is in the SDK.
    lazy var affineTransformValues: [Int : AffineTransform] = [
        #line : AffineTransform.identity,
        #line : AffineTransform(),


    // MARK: - CGVector
    lazy var cg_vectorValues: [Int : CGVector] = {
        var values = [
            #line : CGVector.zero,
            #line : CGVector(dx: 0.0, dy: -9.81)
        ]

        if #available(OSX 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *) {
