diff --git a/resources/Materials/TestSuite/stdlib/adjustment/adjustment.mtlx b/resources/Materials/TestSuite/stdlib/adjustment/adjustment.mtlx
deleted file mode 100644
index 83c4b95e9b..0000000000
--- a/resources/Materials/TestSuite/stdlib/adjustment/adjustment.mtlx
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0"?>
-<materialx version="1.39">
-  <!--
-  Basic adjustment function tests each test is in a separate graph for each variation in input type.
-  - remap
-  - range
-  - smoothstep
-  - luminance
-  - contrast
-  - hsvadjust
-  - saturate
-  -->
-  <nodegraph name="remap_float">
-    <remap name="remap1" type="float">
-      <input name="in" type="float" value="0.2000" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-    </remap>
-    <output name="remap_float_out" type="float" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="remap_color3">
-    <remap name="remap1" type="color3">
-      <input name="in" type="color3" value="0.2000, 0.6000, 0.8000" />
-      <input name="inlow" type="color3" value="0.1000, -0.2000, 0.4000" />
-      <input name="inhigh" type="color3" value="0.9000, 1.2000, 0.6000" />
-      <input name="outlow" type="color3" value="0.4000, 0.2000, 0.3000" />
-      <input name="outhigh" type="color3" value="0.6000, 0.8000, 0.7000" />
-    </remap>
-    <output name="remap_color3_out" type="color3" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="remap_color3FA">
-    <remap name="remap1" type="color3">
-      <input name="in" type="color3" value="0.2000, 0.6000, 0.8000" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-    </remap>
-    <output name="remap_color3FA_out" type="color3" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="remap_color4">
-    <remap name="remap1" type="color4">
-      <input name="in" type="color4" value="0.2000, 0.6000, 0.8000, 1.0" />
-      <input name="inlow" type="color4" value="0.1000, -0.2000, 0.4000, 0.0" />
-      <input name="inhigh" type="color4" value="0.9000, 1.2000, 0.6000, 1.0" />
-      <input name="outlow" type="color4" value="0.4000, 0.2000, 0.3000, 0.0" />
-      <input name="outhigh" type="color4" value="0.6000, 0.8000, 0.7000, 1.0" />
-    </remap>
-    <output name="remap_color4_out" type="color4" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="remap_color4FA">
-    <remap name="remap1" type="color4">
-      <input name="in" type="color4" value="0.2000, 0.6000, 0.8000, 1.0000" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-    </remap>
-    <output name="remap_color4FA_out" type="color4" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="remap_vector2">
-    <remap name="remap1" type="vector2">
-      <input name="in" type="vector2" value="0.2000, 0.5000" />
-      <input name="inlow" type="vector2" value="0.1000, -0.2000" />
-      <input name="inhigh" type="vector2" value="0.9000, 1.2000" />
-      <input name="outlow" type="vector2" value="0.4000, 0.2000" />
-      <input name="outhigh" type="vector2" value="0.6000, 0.8000" />
-    </remap>
-    <output name="remap_vector2_out" type="vector2" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="remap_vector2FA">
-    <remap name="remap1" type="vector2">
-      <input name="in" type="vector2" value="0.2000, 0.5000" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-    </remap>
-    <output name="remap_vector2FA_out" type="vector2" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="remap_vector3">
-    <remap name="remap1" type="vector3">
-      <input name="in" type="vector3" value="0.2000, 0.6000, 0.8000" />
-      <input name="inlow" type="vector3" value="0.1000, -0.2000, 0.4000" />
-      <input name="inhigh" type="vector3" value="0.9000, 1.2000, 0.6000" />
-      <input name="outlow" type="vector3" value="0.4000, 0.2000, 0.3000" />
-      <input name="outhigh" type="vector3" value="0.6000, 0.8000, 0.7000" />
-    </remap>
-    <output name="remap_vector3_out" type="vector3" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="remap_vector3FA">
-    <remap name="remap1" type="vector3">
-      <input name="in" type="vector3" value="0.2000, 0.6000, 0.8000" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-    </remap>
-    <output name="remap_vector3FA_out" type="vector3" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="remap_vector4">
-    <remap name="remap1" type="vector4">
-      <input name="in" type="vector4" value="0.2000, 0.6000, 0.8000, 1.0" />
-      <input name="inlow" type="vector4" value="0.1000, -0.2000, 0.4000, 0.0" />
-      <input name="inhigh" type="vector4" value="0.9000, 1.2000, 0.6000, 1.0" />
-      <input name="outlow" type="vector4" value="0.4000, 0.2000, 0.3000, 0.0" />
-      <input name="outhigh" type="vector4" value="0.6000, 0.8000, 0.7000, 1.0" />
-    </remap>
-    <output name="remap_vector4_out" type="vector4" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="remap_vector4FA">
-    <remap name="remap1" type="vector4">
-      <input name="in" type="vector4" value="0.2000, 0.6000, 0.8000, 1.0" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-    </remap>
-    <output name="remap_vector4FA_out" type="vector4" nodename="remap1" />
-  </nodegraph>
-  <nodegraph name="luminance_color3">
-    <luminance name="luminance1" type="color3">
-      <input name="in" type="color3" value="1.0000, 0.7500, 0.5000" />
-    </luminance>
-    <output name="luminance_color3_out" type="color3" nodename="luminance1" />
-  </nodegraph>
-  <nodegraph name="luminance_color4">
-    <luminance name="luminance1" type="color4">
-      <input name="in" type="color4" value="1.0000, 0.7500, 0.5000, 0.2500" />
-    </luminance>
-    <output name="luminance_color4_out" type="color4" nodename="luminance1" />
-  </nodegraph>
-  <nodegraph name="contrast_float">
-    <contrast name="contrast1" type="float">
-      <input name="in" type="float" value="1.0000" />
-      <input name="amount" type="float" value="0.0000" />
-      <input name="pivot" type="float" value="0.5" />
-    </contrast>
-    <output name="contrast_float_out" type="float" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="contrast_color3">
-    <contrast name="contrast1" type="color3">
-      <input name="in" type="color3" value="1.0000, 0.5000, 0.2000" />
-      <input name="amount" type="color3" value="0.0000, 0.5000, 1.0000" />
-      <input name="pivot" type="color3" value="0.5, 0.5, 0.5" />
-    </contrast>
-    <output name="contrast_color3_out" type="color3" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="contrast_color3FA">
-    <contrast name="contrast1" type="color3">
-      <input name="in" type="color3" value="1.0000, 0.5000, 0.2000" />
-      <input name="amount" type="float" value="1.0000" />
-      <input name="pivot" type="float" value="0.5" />
-    </contrast>
-    <output name="contrast_color3FA_out" type="color3" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="contrast_color4">
-    <contrast name="contrast1" type="color4">
-      <input name="in" type="color4" value="1.0000, 0.5000, 0.2000, 1.0" />
-      <input name="amount" type="color4" value="0.0, 0.5000, 1.0000, 1.0" />
-      <input name="pivot" type="color4" value="0.5, 0.5, 0.5, 0.5" />
-    </contrast>
-    <output name="contrast_color4_out" type="color4" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="contrast_color4FA">
-    <contrast name="contrast1" type="color4">
-      <input name="in" type="color4" value="1.0000, 0.5000, 0.2000, 1.0" />
-      <input name="amount" type="float" value="1.0000" />
-      <input name="pivot" type="float" value="0.5" />
-    </contrast>
-    <output name="contrast_color4FA_out" type="color4" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="contrast_vector2">
-    <contrast name="contrast1" type="vector2">
-      <input name="in" type="vector2" value="1.0000, 0.5000" />
-      <input name="amount" type="vector2" value="0.0000, 0.5000" />
-      <input name="pivot" type="vector2" value="0.5, 0.5" />
-    </contrast>
-    <output name="contrast_vector2_out" type="vector2" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="contrast_vector2FA">
-    <contrast name="contrast1" type="vector2">
-      <input name="in" type="vector2" value="1.0000, 0.5000" />
-      <input name="amount" type="float" value="1.0000" />
-      <input name="pivot" type="float" value="0.5" />
-    </contrast>
-    <output name="contrast_vector2FA_out" type="vector2" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="contrast_vector3">
-    <contrast name="contrast1" type="vector3">
-      <input name="in" type="vector3" value="1.0000, 0.5000, 0.2000" />
-      <input name="amount" type="vector3" value="0.0, 0.5000, 1.0000" />
-      <input name="pivot" type="vector3" value="0.5, 0.5, 0.5" />
-    </contrast>
-    <output name="contrast_vector3_out" type="vector3" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="constrast_vector3FA">
-    <contrast name="contrast1" type="vector3">
-      <input name="in" type="vector3" value="1.0000, 0.5000, 0.2000" />
-      <input name="amount" type="float" value="1.0000" />
-      <input name="pivot" type="float" value="0.5" />
-    </contrast>
-    <output name="constrast_vector3FA_out" type="vector3" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="contrast_vector4">
-    <contrast name="contrast1" type="vector4">
-      <input name="in" type="vector4" value="1.0000, 0.5000, 0.2000, 1.0" />
-      <input name="amount" type="vector4" value="0.0, 0.5000, 1.0000, 1.0" />
-      <input name="pivot" type="vector4" value="0.5, 0.5, 0.5, 0.5" />
-    </contrast>
-    <output name="contrast_vector4_out" type="vector4" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="contrast_vector4FA">
-    <contrast name="contrast1" type="vector4">
-      <input name="in" type="vector4" value="1.0000, 0.5000, 0.2000, 1.0" />
-      <input name="amount" type="float" value="1.0000" />
-      <input name="pivot" type="float" value="0.5" />
-    </contrast>
-    <output name="contrast_vector4FA_out" type="vector4" nodename="contrast1" />
-  </nodegraph>
-  <nodegraph name="range_float">
-    <range name="range1" type="float">
-      <input name="in" type="float" value="0.2000" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="gamma" type="float" value="2.0000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_float_out" type="float" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="range_color3">
-    <range name="range1" type="color3">
-      <input name="in" type="color3" value="0.2000, 0.6000, 0.8000" />
-      <input name="inlow" type="color3" value="0.1000, -0.2000, 0.4000" />
-      <input name="inhigh" type="color3" value="0.9000, 1.2000, 0.6000" />
-      <input name="gamma" type="color3" value="2.0000, 2.0000, 2.0000" />
-      <input name="outlow" type="color3" value="0.4000, 0.2000, 0.3000" />
-      <input name="outhigh" type="color3" value="0.6000, 0.8000, 0.7000" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_color3_out" type="color3" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="range_color3FA">
-    <range name="range1" type="color3">
-      <input name="in" type="color3" value="0.2000, 0.6000, 0.8000" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="gamma" type="float" value="2.0000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_color3FA_out" type="color3" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="range_color4">
-    <range name="range1" type="color4">
-      <input name="in" type="color4" value="0.2000, 0.6000, 0.8000, 1.0" />
-      <input name="inlow" type="color4" value="0.1000, -0.2000, 0.4000, 0.0" />
-      <input name="inhigh" type="color4" value="0.9000, 1.2000, 0.6000, 1.0" />
-      <input name="gamma" type="color4" value="2.0000, 2.0000, 2.0000, 2.0000" />
-      <input name="outlow" type="color4" value="0.4000, 0.2000, 0.3000, 0.0" />
-      <input name="outhigh" type="color4" value="0.6000, 0.8000, 0.7000, 1.0" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_color4_out" type="color4" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="range_color4FA">
-    <range name="range1" type="color4">
-      <input name="in" type="color4" value="0.2000, 0.6000, 0.8000, 1.0" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="gamma" type="float" value="2.0000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_color4FA_out" type="color4" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="range_vector2">
-    <range name="range1" type="vector2">
-      <input name="in" type="vector2" value="0.2000, 0.5000" />
-      <input name="inlow" type="vector2" value="0.1000, -0.2000" />
-      <input name="inhigh" type="vector2" value="0.9000, 1.2000" />
-      <input name="gamma" type="vector2" value="2.0000, 2.0000" />
-      <input name="outlow" type="vector2" value="0.4000, 0.2000" />
-      <input name="outhigh" type="vector2" value="0.6000, 0.8000" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_vector2_out" type="vector2" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="range_vector2FA">
-    <range name="range1" type="vector2">
-      <input name="in" type="vector2" value="0.2000, 0.5000" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="gamma" type="float" value="2.0000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_vector2FA_out" type="vector2" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="range_vector3">
-    <range name="range1" type="vector3">
-      <input name="in" type="vector3" value="0.2000, 0.6000, 0.8000" />
-      <input name="inlow" type="vector3" value="0.1000, -0.2000, 0.4000" />
-      <input name="inhigh" type="vector3" value="0.9000, 1.2000, 0.6000" />
-      <input name="gamma" type="vector3" value="2.0000, 2.0000, 2.0000" />
-      <input name="outlow" type="vector3" value="0.4000, 0.2000, 0.3000" />
-      <input name="outhigh" type="vector3" value="0.6000, 0.8000, 0.7000" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_vector3_out" type="vector3" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="range_vector3FA">
-    <range name="range1" type="vector3">
-      <input name="in" type="vector3" value="0.2000, 0.6000, 0.8000" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="gamma" type="float" value="2.0000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_vector3FA_out" type="vector3" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="range_vector4">
-    <range name="range1" type="vector4">
-      <input name="in" type="vector4" value="0.2000, 0.6000, 0.8000, 1.0" />
-      <input name="inlow" type="vector4" value="0.1000, -0.2000, 0.4000, 0.0" />
-      <input name="inhigh" type="vector4" value="0.9000, 1.2000, 0.6000, 1.0" />
-      <input name="gamma" type="vector4" value="2.0000, 2.0000, 2.0000, 2.0000" />
-      <input name="outlow" type="vector4" value="0.4000, 0.2000, 0.3000, 0.0" />
-      <input name="outhigh" type="vector4" value="0.6000, 0.8000, 0.7000, 1.0" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_vector4_out" type="vector4" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="range_vector4FA">
-    <range name="range1" type="vector4">
-      <input name="in" type="vector4" value="0.2000, 0.6000, 0.8000, 1.0" />
-      <input name="inlow" type="float" value="0.1000" />
-      <input name="inhigh" type="float" value="0.9000" />
-      <input name="gamma" type="float" value="2.0000" />
-      <input name="outlow" type="float" value="0.4000" />
-      <input name="outhigh" type="float" value="0.6000" />
-      <input name="doclamp" type="boolean" value="false" />
-    </range>
-    <output name="range_vector4FA_out" type="vector4" nodename="range1" />
-  </nodegraph>
-  <nodegraph name="hsvadjust_color3">
-    <hsvadjust name="hsvadjust1" type="color3">
-      <input name="in" type="color3" value="0.5000, 0.5000, 0.5000" />
-      <input name="amount" type="vector3" value="1.0000, 0.7500, 0.5000" />
-    </hsvadjust>
-    <output name="hsvadjust_color3_out" type="color3" nodename="hsvadjust1" />
-  </nodegraph>
-  <nodegraph name="hsvadjust_color4">
-    <hsvadjust name="hsvadjust1" type="color4">
-      <input name="in" type="color4" value="0.5000, 0.5000, 0.5000, 0.5000" />
-      <input name="amount" type="vector3" value="1.0000, 0.7500, 0.5000" />
-    </hsvadjust>
-    <output name="hsvadjust_color4_out" type="color4" nodename="hsvadjust1" />
-  </nodegraph>
-  <nodegraph name="saturate_color3">
-    <saturate name="saturate1" type="color3">
-      <input name="in" type="color3" value="1.0000, 0.5000, 0.2500" />
-      <input name="amount" type="float" value="0.5000" />
-    </saturate>
-    <output name="saturate_color3_out" type="color3" nodename="saturate1" />
-  </nodegraph>
-  <nodegraph name="saturate_color4">
-    <saturate name="saturate1" type="color4">
-      <input name="in" type="color4" value="1.0000, 0.5000, 0.2500, 1.0" />
-      <input name="amount" type="float" value="0.5000" />
-    </saturate>
-    <output name="saturate_color4_out" type="color4" nodename="saturate1" />
-  </nodegraph>
-</materialx>
diff --git a/resources/Materials/TestSuite/stdlib/adjustment/luminance.mtlx b/resources/Materials/TestSuite/stdlib/adjustment/luminance.mtlx
new file mode 100644
index 0000000000..6260df8c57
--- /dev/null
+++ b/resources/Materials/TestSuite/stdlib/adjustment/luminance.mtlx
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<materialx version="1.39">
+  <nodegraph name="luminance_color3">
+    <luminance name="luminance1" type="color3">
+      <input name="in" type="color3" value="1.0000, 0.7500, 0.5000" />
+    </luminance>
+    <output name="luminance_color3_out" type="color3" nodename="luminance1" />
+  </nodegraph>
+  <nodegraph name="luminance_color4">
+    <luminance name="luminance1" type="color4">
+      <input name="in" type="color4" value="1.0000, 0.7500, 0.5000, 0.2500" />
+    </luminance>
+    <output name="luminance_color4_out" type="color4" nodename="luminance1" />
+  </nodegraph>
+</materialx>
diff --git a/resources/Materials/TestSuite/stdlib/adjustment/remap.mtlx b/resources/Materials/TestSuite/stdlib/adjustment/remap.mtlx
new file mode 100644
index 0000000000..9175411a5d
--- /dev/null
+++ b/resources/Materials/TestSuite/stdlib/adjustment/remap.mtlx
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<materialx version="1.39">
+  <nodegraph name="remap_float">
+    <remap name="remap1" type="float">
+      <input name="in" type="float" value="0.2000" />
+      <input name="inlow" type="float" value="0.1000" />
+      <input name="inhigh" type="float" value="0.9000" />
+      <input name="outlow" type="float" value="0.4000" />
+      <input name="outhigh" type="float" value="0.6000" />
+    </remap>
+    <output name="remap_float_out" type="float" nodename="remap1" />
+  </nodegraph>
+  <nodegraph name="remap_color3">
+    <remap name="remap1" type="color3">
+      <input name="in" type="color3" value="0.2000, 0.6000, 0.8000" />
+      <input name="inlow" type="color3" value="0.1000, -0.2000, 0.4000" />
+      <input name="inhigh" type="color3" value="0.9000, 1.2000, 0.6000" />
+      <input name="outlow" type="color3" value="0.4000, 0.2000, 0.3000" />
+      <input name="outhigh" type="color3" value="0.6000, 0.8000, 0.7000" />
+    </remap>
+    <output name="remap_color3_out" type="color3" nodename="remap1" />
+  </nodegraph>
+  <nodegraph name="remap_color3FA">
+    <remap name="remap1" type="color3">
+      <input name="in" type="color3" value="0.2000, 0.6000, 0.8000" />
+      <input name="inlow" type="float" value="0.1000" />
+      <input name="inhigh" type="float" value="0.9000" />
+      <input name="outlow" type="float" value="0.4000" />
+      <input name="outhigh" type="float" value="0.6000" />
+    </remap>
+    <output name="remap_color3FA_out" type="color3" nodename="remap1" />
+  </nodegraph>
+  <nodegraph name="remap_color4">
+    <remap name="remap1" type="color4">
+      <input name="in" type="color4" value="0.2000, 0.6000, 0.8000, 1.0" />
+      <input name="inlow" type="color4" value="0.1000, -0.2000, 0.4000, 0.0" />
+      <input name="inhigh" type="color4" value="0.9000, 1.2000, 0.6000, 1.0" />
+      <input name="outlow" type="color4" value="0.4000, 0.2000, 0.3000, 0.0" />
+      <input name="outhigh" type="color4" value="0.6000, 0.8000, 0.7000, 1.0" />
+    </remap>
+    <output name="remap_color4_out" type="color4" nodename="remap1" />
+  </nodegraph>
+  <nodegraph name="remap_color4FA">
+    <remap name="remap1" type="color4">
+      <input name="in" type="color4" value="0.2000, 0.6000, 0.8000, 1.0000" />
+      <input name="inlow" type="float" value="0.1000" />
+      <input name="inhigh" type="float" value="0.9000" />
+      <input name="outlow" type="float" value="0.4000" />
+      <input name="outhigh" type="float" value="0.6000" />
+    </remap>
+    <output name="remap_color4FA_out" type="color4" nodename="remap1" />
+  </nodegraph>
+  <nodegraph name="remap_vector2">
+    <remap name="remap1" type="vector2">
+      <input name="in" type="vector2" value="0.2000, 0.5000" />
+      <input name="inlow" type="vector2" value="0.1000, -0.2000" />
+      <input name="inhigh" type="vector2" value="0.9000, 1.2000" />
+      <input name="outlow" type="vector2" value="0.4000, 0.2000" />
+      <input name="outhigh" type="vector2" value="0.6000, 0.8000" />
+    </remap>
+    <output name="remap_vector2_out" type="vector2" nodename="remap1" />
+  </nodegraph>
+  <nodegraph name="remap_vector2FA">
+    <remap name="remap1" type="vector2">
+      <input name="in" type="vector2" value="0.2000, 0.5000" />
+      <input name="inlow" type="float" value="0.1000" />
+      <input name="inhigh" type="float" value="0.9000" />
+      <input name="outlow" type="float" value="0.4000" />
+      <input name="outhigh" type="float" value="0.6000" />
+    </remap>
+    <output name="remap_vector2FA_out" type="vector2" nodename="remap1" />
+  </nodegraph>
+  <nodegraph name="remap_vector3">
+    <remap name="remap1" type="vector3">
+      <input name="in" type="vector3" value="0.2000, 0.6000, 0.8000" />
+      <input name="inlow" type="vector3" value="0.1000, -0.2000, 0.4000" />
+      <input name="inhigh" type="vector3" value="0.9000, 1.2000, 0.6000" />
+      <input name="outlow" type="vector3" value="0.4000, 0.2000, 0.3000" />
+      <input name="outhigh" type="vector3" value="0.6000, 0.8000, 0.7000" />
+    </remap>
+    <output name="remap_vector3_out" type="vector3" nodename="remap1" />
+  </nodegraph>
+  <nodegraph name="remap_vector3FA">
+    <remap name="remap1" type="vector3">
+      <input name="in" type="vector3" value="0.2000, 0.6000, 0.8000" />
+      <input name="inlow" type="float" value="0.1000" />
+      <input name="inhigh" type="float" value="0.9000" />
+      <input name="outlow" type="float" value="0.4000" />
+      <input name="outhigh" type="float" value="0.6000" />
+    </remap>
+    <output name="remap_vector3FA_out" type="vector3" nodename="remap1" />
+  </nodegraph>
+  <nodegraph name="remap_vector4">
+    <remap name="remap1" type="vector4">
+      <input name="in" type="vector4" value="0.2000, 0.6000, 0.8000, 1.0" />
+      <input name="inlow" type="vector4" value="0.1000, -0.2000, 0.4000, 0.0" />
+      <input name="inhigh" type="vector4" value="0.9000, 1.2000, 0.6000, 1.0" />
+      <input name="outlow" type="vector4" value="0.4000, 0.2000, 0.3000, 0.0" />
+      <input name="outhigh" type="vector4" value="0.6000, 0.8000, 0.7000, 1.0" />
+    </remap>
+    <output name="remap_vector4_out" type="vector4" nodename="remap1" />
+  </nodegraph>
+  <nodegraph name="remap_vector4FA">
+    <remap name="remap1" type="vector4">
+      <input name="in" type="vector4" value="0.2000, 0.6000, 0.8000, 1.0" />
+      <input name="inlow" type="float" value="0.1000" />
+      <input name="inhigh" type="float" value="0.9000" />
+      <input name="outlow" type="float" value="0.4000" />
+      <input name="outhigh" type="float" value="0.6000" />
+    </remap>
+    <output name="remap_vector4FA_out" type="vector4" nodename="remap1" />
+  </nodegraph>
+</materialx>
diff --git a/resources/Materials/TestSuite/stdlib/channel/channel.mtlx b/resources/Materials/TestSuite/stdlib/channel/channel.mtlx
index 59dbd160eb..57e90acf45 100644
--- a/resources/Materials/TestSuite/stdlib/channel/channel.mtlx
+++ b/resources/Materials/TestSuite/stdlib/channel/channel.mtlx
@@ -97,60 +97,4 @@
     </extract>
     <output name="out" type="float" nodename="extract1" />
   </nodegraph>
-  <nodegraph name="separate_color3" type="color3">
-    <separate3 name="separate1" type="multioutput">
-      <input name="in" type="color3" value="0.42, 0.77, 0.93" />
-    </separate3>
-    <combine3 name="combine1" type="color3">
-      <input name="in1" type="float" nodename="separate1" output="outb" />
-      <input name="in2" type="float" nodename="separate1" output="outg" />
-      <input name="in3" type="float" nodename="separate1" output="outr" />
-    </combine3>
-    <output name="out" type="color3" nodename="combine1" />
-  </nodegraph>
-  <nodegraph name="separate_color4" type="color4">
-    <separate4 name="separate1" type="multioutput">
-      <input name="in" type="color4" value="0.42, 0.77, 0.93, 1.0" />
-    </separate4>
-    <combine4 name="combine1" type="color4">
-      <input name="in1" type="float" nodename="separate1" output="outa" />
-      <input name="in2" type="float" nodename="separate1" output="outb" />
-      <input name="in3" type="float" nodename="separate1" output="outg" />
-      <input name="in4" type="float" nodename="separate1" output="outr" />
-    </combine4>
-    <output name="out" type="color4" nodename="combine1" />
-  </nodegraph>
-  <nodegraph name="separate_vector2" type="vector2">
-    <separate2 name="separate1" type="multioutput">
-      <input name="in" type="vector2" value="0.42, 0.77" />
-    </separate2>
-    <combine2 name="combine1" type="vector2">
-      <input name="in1" type="float" nodename="separate1" output="outy" />
-      <input name="in2" type="float" nodename="separate1" output="outx" />
-    </combine2>
-    <output name="out" type="vector2" nodename="combine1" />
-  </nodegraph>
-  <nodegraph name="separate_vector3" type="vector3">
-    <separate3 name="separate1" type="multioutput">
-      <input name="in" type="vector3" value="0.42, 0.77, 0.93" />
-    </separate3>
-    <combine3 name="combine1" type="vector3">
-      <input name="in1" type="float" nodename="separate1" output="outz" />
-      <input name="in2" type="float" nodename="separate1" output="outy" />
-      <input name="in3" type="float" nodename="separate1" output="outx" />
-    </combine3>
-    <output name="out" type="vector3" nodename="combine1" />
-  </nodegraph>
-  <nodegraph name="separate_vector4" type="vector4">
-    <separate4 name="separate1" type="multioutput">
-      <input name="in" type="vector4" value="0.42, 0.77, 0.93, 1.0" />
-    </separate4>
-    <combine4 name="combine1" type="vector4">
-      <input name="in1" type="float" nodename="separate1" output="outw" />
-      <input name="in2" type="float" nodename="separate1" output="outz" />
-      <input name="in3" type="float" nodename="separate1" output="outy" />
-      <input name="in4" type="float" nodename="separate1" output="outx" />
-    </combine4>
-    <output name="out" type="vector4" nodename="combine1" />
-  </nodegraph>
 </materialx>
diff --git a/resources/Materials/TestSuite/stdlib/conditional/conditional_switch.mtlx b/resources/Materials/TestSuite/stdlib/conditional/conditional_switch.mtlx
deleted file mode 100644
index 38f36a7290..0000000000
--- a/resources/Materials/TestSuite/stdlib/conditional/conditional_switch.mtlx
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0"?>
-<materialx version="1.39">
-  <!--
-  Basic switch conditional function tests each test is in a separate graph for each variation in input type.
-  -->
-  <nodegraph name="switch_float">
-    <switch name="switch1" type="float">
-      <input name="in1" type="float" value="0.0000" />
-      <input name="in2" type="float" value="0.3000" />
-      <input name="in3" type="float" value="0.5000" />
-      <input name="in4" type="float" value="0.7000" />
-      <input name="in5" type="float" value="1.0000" />
-      <input name="which" type="float" value="0.0000" />
-    </switch>
-    <output name="out" type="float" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_color3">
-    <switch name="switch1" type="color3">
-      <input name="in1" type="color3" value="0.0, 0.0, 0.0" />
-      <input name="in2" type="color3" value="0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="color3" value="0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="color3" value="0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="color3" value="1.0000, 1.0000, 1.0000" />
-      <input name="which" type="float" value="2.0000" />
-    </switch>
-    <output name="out" type="color3" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_color4">
-    <switch name="switch1" type="color4">
-      <input name="in1" type="color4" value="0.0, 0.0, 0.0, 0.0000" />
-      <input name="in2" type="color4" value="0.3000, 0.3000, 0.3000, 0.5000" />
-      <input name="in3" type="color4" value="0.5000, 0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="color4" value="0.7000, 0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="color4" value="1.0000, 1.0000, 1.0000, 1.0000" />
-      <input name="which" type="float" value="3.0000" />
-    </switch>
-    <output name="out" type="color4" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_vector2">
-    <switch name="switch1" type="vector2">
-      <input name="in1" type="vector2" value="0.0, 0.0" />
-      <input name="in2" type="vector2" value="0.3000, 0.3000" />
-      <input name="in3" type="vector2" value="0.5000, 0.5000" />
-      <input name="in4" type="vector2" value="0.7000, 0.7000" />
-      <input name="in5" type="vector2" value="1.0000, 1.0000" />
-      <input name="which" type="float" value="1.0000" />
-    </switch>
-    <output name="out" type="vector2" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_vector3">
-    <switch name="switch1" type="vector3">
-      <input name="in1" type="vector3" value="0.0, 0.0, 0.0" />
-      <input name="in2" type="vector3" value="0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="vector3" value="0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="vector3" value="0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="vector3" value="1.0000, 1.0000, 1.0000" />
-      <input name="which" type="float" value="2.0000" />
-    </switch>
-    <output name="out" type="vector3" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_vector4">
-    <switch name="switch1" type="vector4">
-      <input name="in1" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
-      <input name="in2" type="vector4" value="0.3000, 0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="vector4" value="0.5000, 0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="vector4" value="0.7000, 0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="vector4" value="1.0000, 1.0000, 1.0000, 1.0000" />
-      <input name="which" type="float" value="3.0000" />
-    </switch>
-    <output name="out" type="vector4" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_matrix33">
-    <switch name="switch1" type="matrix33">
-      <input name="in1" type="matrix33" value="0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0" />
-      <input name="in2" type="matrix33" value="0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="matrix33" value="0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="matrix33" value="0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="matrix33" value="1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000" />
-      <input name="which" type="float" value="3.0000" />
-    </switch>
-    <output name="out" type="matrix33" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_matrix44">
-    <switch name="switch1" type="matrix44">
-      <input name="in1" type="matrix44" value="0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0" />
-      <input name="in2" type="matrix44" value="0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="matrix44" value="0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="matrix44" value="0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="matrix44" value="1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000" />
-      <input name="which" type="float" value="3.0000" />
-    </switch>
-    <output name="out" type="matrix44" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_floatI">
-    <switch name="switch1" type="float">
-      <input name="in1" type="float" value="0.0" />
-      <input name="in2" type="float" value="0.3000" />
-      <input name="in3" type="float" value="0.5000" />
-      <input name="in4" type="float" value="0.7000" />
-      <input name="in5" type="float" value="1.0000" />
-      <input name="which" type="integer" value="0" />
-    </switch>
-    <output name="out" type="float" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_color3I">
-    <switch name="switch1" type="color3">
-      <input name="in1" type="color3" value="0.0, 0.0, 0.0" />
-      <input name="in2" type="color3" value="0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="color3" value="0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="color3" value="0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="color3" value="1.0000, 1.0000, 1.0000" />
-      <input name="which" type="integer" value="2" />
-    </switch>
-    <output name="out" type="color3" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="swicth_color4I">
-    <switch name="switch1" type="color4">
-      <input name="in1" type="color4" value="0.0, 0.0, 0.0, 0.0" />
-      <input name="in2" type="color4" value="0.3000, 0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="color4" value="0.5000, 0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="color4" value="0.7000, 0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="color4" value="1.0000, 1.0000, 1.0000, 1.0000" />
-      <input name="which" type="integer" value="3" />
-    </switch>
-    <output name="out" type="color4" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_vector2I">
-    <switch name="switch1" type="vector2">
-      <input name="in1" type="vector2" value="0.0, 0.0" />
-      <input name="in2" type="vector2" value="0.3000, 0.3000" />
-      <input name="in3" type="vector2" value="0.5000, 0.5000" />
-      <input name="in4" type="vector2" value="0.7000, 0.7000" />
-      <input name="in5" type="vector2" value="1.0000, 1.0000" />
-      <input name="which" type="integer" value="1" />
-    </switch>
-    <output name="out" type="vector2" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_vector3I">
-    <switch name="switch1" type="vector3">
-      <input name="in1" type="vector3" value="0.0, 0.0, 0.0" />
-      <input name="in2" type="vector3" value="0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="vector3" value="0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="vector3" value="0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="vector3" value="1.0000, 1.0000, 1.0000" />
-      <input name="which" type="integer" value="2" />
-    </switch>
-    <output name="out" type="vector3" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_vector4I">
-    <switch name="switch1" type="vector4">
-      <input name="in1" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
-      <input name="in2" type="vector4" value="0.3000, 0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="vector4" value="0.5000, 0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="vector4" value="0.7000, 0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="vector4" value="1.0000, 1.0000, 1.0000, 1.0000" />
-      <input name="which" type="integer" value="3" />
-    </switch>
-    <output name="out" type="vector4" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_matrix33I">
-    <switch name="switch1" type="matrix33">
-      <input name="in1" type="matrix33" value="0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0" />
-      <input name="in2" type="matrix33" value="0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="matrix33" value="0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="matrix33" value="0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="matrix33" value="1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000" />
-      <input name="which" type="integer" value="2" />
-    </switch>
-    <output name="out" type="matrix33" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_matrix44I">
-    <switch name="switch1" type="matrix44">
-      <input name="in1" type="matrix44" value="0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0" />
-      <input name="in2" type="matrix44" value="0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000, 0.3000" />
-      <input name="in3" type="matrix44" value="0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000, 0.5000" />
-      <input name="in4" type="matrix44" value="0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000, 0.7000" />
-      <input name="in5" type="matrix44" value="1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000" />
-      <input name="which" type="integer" value="2" />
-    </switch>
-    <output name="out" type="matrix44" nodename="switch1" />
-  </nodegraph>
-  <nodegraph name="switch_vector3_geometric">
-    <tangent name="tangent1" type="vector3" />
-    <bitangent name="bitangent1" type="vector3" />
-    <texcoord name="texcoord1" type="vector2" />
-    <splitlr name="splitlr1" type="float">
-      <input name="valuel" type="float" value="0.0" />
-      <input name="valuer" type="float" value="1.0" />
-      <input name="center" type="float" value="0.5" />
-      <input name="texcoord" type="vector2" nodename="texcoord1" />
-    </splitlr>
-    <ifgreater name="ifgreater1" type="vector3">
-      <input name="value1" type="float" nodename="splitlr1" />
-      <input name="in1" type="vector3" nodename="tangent1" />
-      <input name="in2" type="vector3" nodename="bitangent1" />
-    </ifgreater>
-    <output name="out" type="vector3" nodename="ifgreater1" />
-  </nodegraph>
-</materialx>
diff --git a/resources/Materials/TestSuite/stdlib/convert/convert.mtlx b/resources/Materials/TestSuite/stdlib/convert/convert.mtlx
deleted file mode 100644
index f29b1eaab4..0000000000
--- a/resources/Materials/TestSuite/stdlib/convert/convert.mtlx
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<materialx version="1.39">
-  <nodegraph name="convert_float_color4">
-    <constant name="constant1" type="float">
-      <input name="value" type="float" value="0.5000" />
-    </constant>
-    <convert name="convert1" type="color4">
-      <input name="in" type="float" nodename="constant1" />
-    </convert>
-    <output name="out" type="color4" nodename="convert1" />
-  </nodegraph>
-  <nodegraph name="convert_float_vector4">
-    <constant name="constant1" type="float">
-      <input name="value" type="float" value="0.5000" />
-    </constant>
-    <convert name="convert1" type="vector4">
-      <input name="in" type="float" nodename="constant1" />
-    </convert>
-    <output name="out" type="vector4" nodename="convert1" />
-  </nodegraph>
-  <nodegraph name="convert_color4_vector4">
-    <constant name="constant1" type="color4">
-      <input name="value" type="color4" value="0.2000, 0.8000, 0.5000, 1.0" />
-    </constant>
-    <convert name="convert1" type="vector4">
-      <input name="in" type="color4" nodename="constant1" />
-    </convert>
-    <output name="out" type="vector4" nodename="convert1" />
-  </nodegraph>
-</materialx>