diff --git a/sandbox/tests/test scenes/basis modifiers/04 - bump mapping - disney material.appleseed b/sandbox/tests/test scenes/basis modifiers/04 - bump mapping - disney material.appleseed
deleted file mode 100644
index b993d01557..0000000000
--- a/sandbox/tests/test scenes/basis modifiers/04 - bump mapping - disney material.appleseed
+++ /dev/null
@@ -1,191 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 0.00000004470348000 0.92387944459915206 -0.38268360495567300 -165.30822753906250000
- 0.00000001490115900 0.38268354535102800 0.92387950420379605 409.44357299804687500
- 1.00000000000000000 -0.00000004470349400 0.00000005960464500 4.49973630905151367
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
- 1.000000000 1.000000000 1.000000000
-
-
- 1.000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.00000000000000000 0.00000000000000000 0.00000000000000000 302.13778686523437500
- 0.00000000000000000 0.00000000000000000 1.00000000000000000 79.73422241210937500
- -0.00000000000000000 -1.00000000000000000 -0.00000000000000000 -185.60510253906250000
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.00000000000000000 0.00000000000000000 0.00000000000000000 11.89337158203125000
- 0.00000000000000000 0.00000000000000000 1.00000000000000000 0.00000000000000000
- 0.00000000000000000 -1.00000000000000000 0.00000000000000000 8.73403930664062500
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sandbox/tests/test scenes/basis modifiers/ref/04 - bump mapping - disney material.png b/sandbox/tests/test scenes/basis modifiers/ref/04 - bump mapping - disney material.png
deleted file mode 100644
index 5d5959dc99..0000000000
Binary files a/sandbox/tests/test scenes/basis modifiers/ref/04 - bump mapping - disney material.png and /dev/null differ
diff --git a/sandbox/tests/test scenes/bssrdf/063 - shadow - gaussian.appleseed b/sandbox/tests/test scenes/bssrdf/063 - shadow - gaussian.appleseed
index 893397b141..f26ce98187 100644
--- a/sandbox/tests/test scenes/bssrdf/063 - shadow - gaussian.appleseed
+++ b/sandbox/tests/test scenes/bssrdf/063 - shadow - gaussian.appleseed
@@ -35,6 +35,10 @@
1.000000000
+
+
+
+
@@ -51,24 +55,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/sandbox/tests/test scenes/bssrdf/064 - shadow - stddipole.appleseed b/sandbox/tests/test scenes/bssrdf/064 - shadow - stddipole.appleseed
index e05a92c5ae..f29a65266e 100644
--- a/sandbox/tests/test scenes/bssrdf/064 - shadow - stddipole.appleseed
+++ b/sandbox/tests/test scenes/bssrdf/064 - shadow - stddipole.appleseed
@@ -35,6 +35,10 @@
1.000000000
+
+
+
+
@@ -51,24 +55,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/sandbox/tests/test scenes/bssrdf/065 - shadow - betterdipole.appleseed b/sandbox/tests/test scenes/bssrdf/065 - shadow - betterdipole.appleseed
index ef4168136b..651027b2aa 100644
--- a/sandbox/tests/test scenes/bssrdf/065 - shadow - betterdipole.appleseed
+++ b/sandbox/tests/test scenes/bssrdf/065 - shadow - betterdipole.appleseed
@@ -35,6 +35,10 @@
1.000000000
+
+
+
+
@@ -51,24 +55,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/sandbox/tests/test scenes/bssrdf/066 - shadow - directionaldipole.appleseed b/sandbox/tests/test scenes/bssrdf/066 - shadow - directionaldipole.appleseed
index 5ccac4bf91..348a71f8b6 100644
--- a/sandbox/tests/test scenes/bssrdf/066 - shadow - directionaldipole.appleseed
+++ b/sandbox/tests/test scenes/bssrdf/066 - shadow - directionaldipole.appleseed
@@ -35,6 +35,10 @@
1.000000000
+
+
+
+
@@ -51,24 +55,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/sandbox/tests/test scenes/bssrdf/067 - shadow - normalizeddiff.appleseed b/sandbox/tests/test scenes/bssrdf/067 - shadow - normalizeddiff.appleseed
index 5ad3ff513b..f4b46aba09 100644
--- a/sandbox/tests/test scenes/bssrdf/067 - shadow - normalizeddiff.appleseed
+++ b/sandbox/tests/test scenes/bssrdf/067 - shadow - normalizeddiff.appleseed
@@ -35,6 +35,10 @@
1.000000000
+
+
+
+
@@ -51,24 +55,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/sandbox/tests/test scenes/bssrdf/068 - shadow - randomwalk.appleseed b/sandbox/tests/test scenes/bssrdf/068 - shadow - randomwalk.appleseed
index afdbff7717..5ac4dc3619 100644
--- a/sandbox/tests/test scenes/bssrdf/068 - shadow - randomwalk.appleseed
+++ b/sandbox/tests/test scenes/bssrdf/068 - shadow - randomwalk.appleseed
@@ -35,6 +35,10 @@
1.000000000
+
+
+
+
@@ -52,24 +56,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/sandbox/tests/test scenes/curves/01 - single strand shadows.appleseed b/sandbox/tests/test scenes/curves/01 - single strand shadows.appleseed
index 1e9d910430..ec50705023 100644
--- a/sandbox/tests/test scenes/curves/01 - single strand shadows.appleseed
+++ b/sandbox/tests/test scenes/curves/01 - single strand shadows.appleseed
@@ -51,46 +51,28 @@
1.000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 1.000000000 0.33 0.000000000
+
+
+ 1.000000000
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/sandbox/tests/test scenes/curves/03 - single strand interpolated color.appleseed b/sandbox/tests/test scenes/curves/03 - single strand interpolated color.appleseed
index 730c3772e8..1748efc9a7 100644
--- a/sandbox/tests/test scenes/curves/03 - single strand interpolated color.appleseed
+++ b/sandbox/tests/test scenes/curves/03 - single strand interpolated color.appleseed
@@ -57,6 +57,10 @@
1.000000000
+
+
+
+
@@ -64,24 +68,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/sandbox/tests/test scenes/disney material/01 - disney material.appleseed b/sandbox/tests/test scenes/disney material/01 - disney material.appleseed
deleted file mode 100644
index 9ec29c432b..0000000000
--- a/sandbox/tests/test scenes/disney material/01 - disney material.appleseed
+++ /dev/null
@@ -1,251 +0,0 @@
-
-
-
-
-
- _geometry
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0.97511452341935101 -0.03338836172704100 0.21917318156616700 6.22265139716141391
- 0.00000000000000000 0.98859472682772698 0.15060035221875101 5.56234279172101509
- -0.22170175059446801 -0.14685259068057399 0.96399307590550198 27.06596053262170187
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
-
-
- 0.525489986 0.611765027 0.772548974
-
-
- 1.000000000
-
-
-
-
-
-
-
- 0.843137026 0.788235009 0.698038995
-
-
- 1.000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $freq = 30; # 0.010, 100.000
-$slice = 0.8; # 0.000, 1.000
-$contrast = 0.995; # 0.000, 1.000
-
-contrast(fbm([$freq * $u, $freq * $v, $slice]), $contrast)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sandbox/tests/test scenes/disney material/02 - disney material.appleseed b/sandbox/tests/test scenes/disney material/02 - disney material.appleseed
deleted file mode 100644
index 7abfdea55b..0000000000
--- a/sandbox/tests/test scenes/disney material/02 - disney material.appleseed
+++ /dev/null
@@ -1,248 +0,0 @@
-
-
-
-
-
- _geometry
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0.97511452341935101 -0.03338836172704100 0.21917318156616700 6.22265139716141391
- 0.00000000000000000 0.98859472682772698 0.15060035221875101 5.56234279172101509
- -0.22170175059446801 -0.14685259068057399 0.96399307590550198 27.06596053262170187
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
-
-
- 0.525489986 0.611765027 0.772548974
-
-
- 1.000000000
-
-
-
-
-
-
-
- 0.843137026 0.788235009 0.698038995
-
-
- 1.000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $freq = 24; # 0.000, 100.000
-$radius = 0.35; # 0.000, 1.000
-$softness = 0.005; # 0.0, 1.0
-
-$center = [0.5,0.5,0];
-$p = [fmod($u * $freq, 1), fmod($v * $freq, 1), 0.0];
-$r = length( $p - $center);
-invert(smoothstep($r, $radius - ($softness * $freq), $radius + ($softness * $freq)))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sandbox/tests/test scenes/disney material/03 - disney material.appleseed b/sandbox/tests/test scenes/disney material/03 - disney material.appleseed
deleted file mode 100644
index 4767c52d8b..0000000000
--- a/sandbox/tests/test scenes/disney material/03 - disney material.appleseed
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-
-
-
- _geometry
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0.97511452341935101 -0.03338836172704100 0.21917318156616700 6.22265139716141391
- 0.00000000000000000 0.98859472682772698 0.15060035221875101 5.56234279172101509
- -0.22170175059446801 -0.14685259068057399 0.96399307590550198 27.06596053262170187
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
-
-
- 0.525489986 0.611765027 0.772548974
-
-
- 1.000000000
-
-
-
-
-
-
-
- 0.843137026 0.788235009 0.698038995
-
-
- 1.000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $freq = 25; # 0.0 100.0
-$saturation = 0.7; # 0.0 1.0
-$contrast = 0.45; # 0.0 1.0
-
-$p = [$u, $v, 0.0] * $freq;
-
-$x = fbm( $p + fbm( $p + fbm($p)));
-$cc = ccurve(sin($x),0,[0.0823529,0.203922,0.223529],4,1,[0.737255,0.545098,1],4,0.680052,[0.101961,0.141176,0.262745],4,0.317536,[0.768627,0.921569,0.933333],4);
-$cc = saturate($cc, $saturation);
-contrast($cc, $contrast) * 0.75
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sandbox/tests/test scenes/disney material/04 - disney material.appleseed b/sandbox/tests/test scenes/disney material/04 - disney material.appleseed
deleted file mode 100644
index 4ac19881d8..0000000000
--- a/sandbox/tests/test scenes/disney material/04 - disney material.appleseed
+++ /dev/null
@@ -1,277 +0,0 @@
-
-
-
-
-
- _geometry
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0.97511452341935101 -0.03338836172704100 0.21917318156616700 6.22265139716141391
- 0.00000000000000000 0.98859472682772698 0.15060035221875101 5.56234279172101509
- -0.22170175059446801 -0.14685259068057399 0.96399307590550198 27.06596053262170187
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
-
-
- 0.525489986 0.611765027 0.772548974
-
-
- 1.000000000
-
-
-
-
-
-
-
- 0.843137026 0.788235009 0.698038995
-
-
- 1.000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $freq = 25; # 0.0 100.0
-$saturation = 0.7; # 0.0 1.0
-$contrast = 0.45; # 0.0 1.0
-
-$p = [$u, $v, 0.0] * $freq;
-
-$x = fbm( $p + fbm( $p + fbm($p)));
-$cc = ccurve(sin($x),0,[0.0823529,0.203922,0.223529],4,1,[0.737255,0.545098,1],4,0.680052,[0.101961,0.141176,0.262745],4,0.317536,[0.768627,0.921569,0.933333],4);
-$cc = saturate($cc, $saturation);
-contrast($cc, $contrast) * 0.75
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $freq = 5; # 0.010, 100.000
-$slice = 0.5; # 0.000, 1.000
-$contrast = 0.4; # 0.000, 1.000
-
-$x = contrast(fbm([$freq * $u, $freq * $v, $slice]), $contrast);
-$xx = ccurve($x,0,[0,0,0],4,1,[0,0,0],4,0.210674,[0.141176,0.662745,0.0823529],4,0.525281,[0.243137,0.00392157,0.164706],4,0.730337,[0.733333,0.403922,0.184314],4);
-$xx
-
-
-
-
-
-
-
-
- $freq = 4.09122; # 0.010, 100.000
-$slice = 0.5; # 0.000, 1.000
-$octaves = 6; # 1 8
-$lacunarity = 2; # 1.0 4.0
-$gain = 0.5; # 0.0 1.0
-$contrast = 0.93197; # 0.000, 1.000
-
-$x = contrast(turbulence([$freq * $u, $freq * $v, $slice], $octaves, $lacunarity, $gain), $contrast);
-$x * 0.85
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sandbox/tests/test scenes/disney material/05 - disney material.appleseed b/sandbox/tests/test scenes/disney material/05 - disney material.appleseed
deleted file mode 100644
index dabe2f9d85..0000000000
--- a/sandbox/tests/test scenes/disney material/05 - disney material.appleseed
+++ /dev/null
@@ -1,262 +0,0 @@
-
-
-
-
-
- _geometry
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0.97511452341935101 -0.03338836172704100 0.21917318156616700 6.22265139716141391
- 0.00000000000000000 0.98859472682772698 0.15060035221875101 5.56234279172101509
- -0.22170175059446801 -0.14685259068057399 0.96399307590550198 27.06596053262170187
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
-
-
- 0.525489986 0.611765027 0.772548974
-
-
- 1.000000000
-
-
-
-
-
-
-
- 0.843137026 0.788235009 0.698038995
-
-
- 1.000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $p = [$u, $v, 0.5];
-$p = $p + 0.05 * turbulence($p, 4);
-$var0 = ccurve( $p[1],0.651852,[1,0.0509804,0.0196078],4,0.325926,[0.623529,0,0],4,1,[1,0.694118,0.0745098],4);
-$var0
-
-
-
-
-
-
-
- $freq = 120; # 1 500
-$p = [$u, $v, 0.0];
-$p = $p + fbm( $p) + 0.5 * fbm(2 * $p);
-
-(cos($freq * $p[0]) + tan($freq * $p[1]) + sin($freq * $u))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $p = [$u, $v, 0.5];
-$x = voronoi(30 * $p, 4, 0.5, 0.3);
-$var3 = ccurve($x,0,[0.0980392,0.0980392,0.0980392],4,1,[1,1,1],4,0.37037,[0.0235294,0.0588235,0.521569],4);
-
-$var3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sandbox/tests/test scenes/disney material/06 - disney material with edf.appleseed b/sandbox/tests/test scenes/disney material/06 - disney material with edf.appleseed
deleted file mode 100644
index b205bcd488..0000000000
--- a/sandbox/tests/test scenes/disney material/06 - disney material with edf.appleseed
+++ /dev/null
@@ -1,252 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 0.65360482437505096 0.44268553754207801 -0.61386500829151402 -48.20614600609511768
- 0.00000000000000000 0.81109382596417201 0.58491606704107602 55.10517210225853546
- 0.75683600175576904 -0.38230396327252902 0.53013483767100100 42.49056286995142528
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
-
-
- 1.000000000 0.847059011 0.937255025
-
-
- 1.000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.00000000000000000 0.00000000000000000 0.00000000000000000 0.00000000000000000
- 0.00000000000000000 1.00000000000000000 -0.00000016292068500 10.00000000000000000
- 0.00000000000000000 0.00000016292068500 1.00000000000000000 -10.00000000000000000
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.00000000000000000 0.00000000000000000 0.00000000000000000 0.00000000000000000
- 0.00000000000000000 0.00000000000000000 2.00000000000000000 0.00000000000000000
- -0.00000000000000000 -2.00000000000000000 -0.00000000000000000 -0.00000000000000000
- 0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sandbox/tests/test scenes/disney material/Box001.binarymesh b/sandbox/tests/test scenes/disney material/Box001.binarymesh
deleted file mode 100644
index 003f8587e1..0000000000
Binary files a/sandbox/tests/test scenes/disney material/Box001.binarymesh and /dev/null differ
diff --git a/sandbox/tests/test scenes/disney material/Plane001.binarymesh b/sandbox/tests/test scenes/disney material/Plane001.binarymesh
deleted file mode 100644
index 6d92180c7d..0000000000
Binary files a/sandbox/tests/test scenes/disney material/Plane001.binarymesh and /dev/null differ
diff --git a/sandbox/tests/test scenes/disney material/_geometry/studio_teapot.binarymesh b/sandbox/tests/test scenes/disney material/_geometry/studio_teapot.binarymesh
deleted file mode 100644
index a255181e60..0000000000
Binary files a/sandbox/tests/test scenes/disney material/_geometry/studio_teapot.binarymesh and /dev/null differ
diff --git a/sandbox/tests/test scenes/disney material/ref/01 - disney material.png b/sandbox/tests/test scenes/disney material/ref/01 - disney material.png
deleted file mode 100644
index 9d77651df8..0000000000
Binary files a/sandbox/tests/test scenes/disney material/ref/01 - disney material.png and /dev/null differ
diff --git a/sandbox/tests/test scenes/disney material/ref/02 - disney material.png b/sandbox/tests/test scenes/disney material/ref/02 - disney material.png
deleted file mode 100644
index 74b6c4fd32..0000000000
Binary files a/sandbox/tests/test scenes/disney material/ref/02 - disney material.png and /dev/null differ
diff --git a/sandbox/tests/test scenes/disney material/ref/03 - disney material.png b/sandbox/tests/test scenes/disney material/ref/03 - disney material.png
deleted file mode 100644
index 53f31d0157..0000000000
Binary files a/sandbox/tests/test scenes/disney material/ref/03 - disney material.png and /dev/null differ
diff --git a/sandbox/tests/test scenes/disney material/ref/04 - disney material.png b/sandbox/tests/test scenes/disney material/ref/04 - disney material.png
deleted file mode 100644
index 8258d2a840..0000000000
Binary files a/sandbox/tests/test scenes/disney material/ref/04 - disney material.png and /dev/null differ
diff --git a/sandbox/tests/test scenes/disney material/ref/05 - disney material.png b/sandbox/tests/test scenes/disney material/ref/05 - disney material.png
deleted file mode 100644
index 8130531a61..0000000000
Binary files a/sandbox/tests/test scenes/disney material/ref/05 - disney material.png and /dev/null differ
diff --git a/sandbox/tests/test scenes/disney material/ref/06 - disney material with edf.png b/sandbox/tests/test scenes/disney material/ref/06 - disney material with edf.png
deleted file mode 100644
index 2cf1c9b8ed..0000000000
Binary files a/sandbox/tests/test scenes/disney material/ref/06 - disney material with edf.png and /dev/null differ
diff --git a/sandbox/tests/test scenes/disney material/studio_lighting_teapot.blend b/sandbox/tests/test scenes/disney material/studio_lighting_teapot.blend
deleted file mode 100644
index 9052f424d0..0000000000
Binary files a/sandbox/tests/test scenes/disney material/studio_lighting_teapot.blend and /dev/null differ
diff --git a/sandbox/tests/test scenes/many light sampling/01 - 4 colored point lights.appleseed b/sandbox/tests/test scenes/many light sampling/01 - 4 colored point lights.appleseed
index cc049c427a..478921c69d 100644
--- a/sandbox/tests/test scenes/many light sampling/01 - 4 colored point lights.appleseed
+++ b/sandbox/tests/test scenes/many light sampling/01 - 4 colored point lights.appleseed
@@ -67,24 +67,12 @@
1.000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/sandbox/tests/test scenes/many light sampling/02 - 400 colored point lights.appleseed b/sandbox/tests/test scenes/many light sampling/02 - 400 colored point lights.appleseed
index 6518589308..7e65f79770 100644
--- a/sandbox/tests/test scenes/many light sampling/02 - 400 colored point lights.appleseed
+++ b/sandbox/tests/test scenes/many light sampling/02 - 400 colored point lights.appleseed
@@ -1,6 +1,6 @@
-
-
+
+
data
@@ -4027,24 +4027,17 @@
1.000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -8893,6 +8886,9 @@
+
+
+
@@ -8904,6 +8900,9 @@
+
+
+
diff --git a/sandbox/tests/test scenes/many light sampling/03 - 25 emitting triangles.appleseed b/sandbox/tests/test scenes/many light sampling/03 - 25 emitting triangles.appleseed
index 8f0f534feb..816327f269 100644
--- a/sandbox/tests/test scenes/many light sampling/03 - 25 emitting triangles.appleseed
+++ b/sandbox/tests/test scenes/many light sampling/03 - 25 emitting triangles.appleseed
@@ -1,6 +1,6 @@
-
-
+
+
data
@@ -38,6 +38,10 @@
1.000000000
+
+
+
+
@@ -45,24 +49,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -686,6 +679,9 @@
+
+
+
@@ -697,6 +693,9 @@
+
+
+