diff --git a/test/image/baselines/gl3d_surface-heatmap-treemap_transparent-colorscale.png b/test/image/baselines/gl3d_surface-heatmap-treemap_transparent-colorscale.png
index 5e961685774..cc9d130b545 100644
Binary files a/test/image/baselines/gl3d_surface-heatmap-treemap_transparent-colorscale.png and b/test/image/baselines/gl3d_surface-heatmap-treemap_transparent-colorscale.png differ
diff --git a/test/image/mocks/gl3d_surface-heatmap-treemap_transparent-colorscale.json b/test/image/mocks/gl3d_surface-heatmap-treemap_transparent-colorscale.json
index ae2ab8d8540..4e493d35c73 100644
--- a/test/image/mocks/gl3d_surface-heatmap-treemap_transparent-colorscale.json
+++ b/test/image/mocks/gl3d_surface-heatmap-treemap_transparent-colorscale.json
@@ -59,7 +59,37 @@
                 "Uniform",
                 "Uniform"
             ],
-            "level": "Juliet",
+            "branchvalues": "total",
+            "values": [
+                40000,
+                2000,
+                38000,
+                1500,
+                2500,
+                34000,
+                1000,
+                2000,
+                3000,
+                28000,
+                1250,
+                1750,
+                2250,
+                2750,
+                20000,
+                1000,
+                1500,
+                2000,
+                2500,
+                3000,
+                10000,
+                1000,
+                1500,
+                2000,
+                2500,
+                3000
+            ],
+            "sort": false,
+            "level": "Oscar",
             "count": "leaves+branches",
             "textinfo": "label",
             "insidetextorientation": "horizontal",
@@ -69,7 +99,7 @@
                 },
                 "colorscale": [
                     [0, "rgba(0,0,255,1)"],
-                    [0.5, "rgba(0,255,0,0.0)"],
+                    [0.5, "rgba(0,255,0,0.25)"],
                     [1, "rgba(255,0,0,1)"]
                 ],
                 "showscale": false
@@ -87,13 +117,13 @@
                     "show": true
                 }
             },
-            "x": [0, 0.25, 0.5, 0.75, 1],
-            "y": [0, 0.25, 0.5, 0.75, 1],
+            "x": [0, 2000, 4000, 6000, 8000],
+            "y": [0, 2000, 4000, 6000, 8000],
             "z": [
                 [0, 0, 0, 0, 0],
-                [0, 0.1, 0.8, 0.7, 0],
-                [0, 0.2, 0, 0.6, 0],
-                [0, 0.3, 0.4, 0.5, 0],
+                [0, 500, 4000, 3500, 0],
+                [0, 1000, 0, 3000, 0],
+                [0, 1500, 2000, 2500, 0],
                 [0, 0, 0, 0, 0]
             ]
         },
@@ -105,13 +135,13 @@
                     "show": true
                 }
             },
-            "x": [0, 0.25, 0.5, 0.75, 1],
-            "y": [0, 0.25, 0.5, 0.75, 1],
+            "x": [0, 2000, 4000, 6000, 8000],
+            "y": [0, 2000, 4000, 6000, 8000],
             "z": [
                 [0, 0, 0, 0, 0],
-                [0, 0.1, 0.8, 0.7, 0],
-                [0, 0.2, 0, 0.6, 0],
-                [0, 0.3, 0.4, 0.5, 0],
+                [0, 500, 4000, 3500, 0],
+                [0, 1000, 0, 3000, 0],
+                [0, 1500, 2000, 2500, 0],
                 [0, 0, 0, 0, 0]
             ]
         }
@@ -120,14 +150,17 @@
         "width": 1000,
         "height": 350,
         "title": {
-            "text": "treemap, heatmap & surface plots with transparent colorscale"
+            "text": "treemap, heatmap & surface plots with transparent colorscale and engineering formatting"
         },
         "coloraxis": {
             "colorscale": [
                 [0, "rgba(0,0,255,1)"],
-                [0.5, "rgba(0,255,0,0.0)"],
+                [0.5, "rgba(0,255,0,0.25)"],
                 [1, "rgba(255,0,0,1)"]
-            ]
+            ],
+            "colorbar": {
+                "minexponent": 0
+            }
         },
         "margin": {
             "t": 75,
@@ -136,9 +169,27 @@
             "b": 25
         },
         "xaxis": {
-            "domain": [0.35, 0.65]
+            "domain": [0.35, 0.65],
+            "minexponent": 0,
+            "dtick": 2000
+        },
+        "yaxis": {
+            "minexponent": 0,
+            "dtick": 2000
         },
         "scene": {
+            "xaxis": {
+                "minexponent": 0,
+                "dtick": 2000
+            },
+            "yaxis": {
+                "minexponent": 0,
+                "dtick": 2000
+            },
+            "zaxis": {
+                "minexponent": 0,
+                "dtick": 2000
+            },
             "domain": {
                 "x": [0.7, 1]
             },
@@ -146,7 +197,7 @@
                 "eye": {
                     "x": 0,
                     "y": 0,
-                    "z": 2
+                    "z": 2.1
                 },
                 "up": {
                     "x": 0,