Merge "Update/condense new RenderScript math tests."tools_r22

301 files changed, 1750 insertions, 2186 deletions

diff --git a/tests/src/android/renderscript/cts/acos_f32.rs b/tests/src/android/renderscript/cts/acos_f32.rs
index 8e46d0a9043..4bc948b8896 100644
--- a/tests/src/android/renderscript/cts/acos_f32.rs
+++ b/tests/src/android/renderscript/cts/acos_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void acos_f32_1 (const float* in, float* out) {
+    *out = acos(*in);
+}
+
+void acos_f32_2 (const float2* in, float2* out) {
+    *out = acos(*in);
+}
+
+void acos_f32_3 (const float3* in, float3* out) {
+    *out = acos(*in);
+}
+
+void acos_f32_4 (const float4* in , float4* out) {
     *out = acos(*in);
 }
diff --git a/tests/src/android/renderscript/cts/acos_f32_2.rs b/tests/src/android/renderscript/cts/acos_f32_2.rs
deleted file mode 100644
index 43fe3eea160..00000000000
--- a/tests/src/android/renderscript/cts/acos_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = acos(*in);
-}
diff --git a/tests/src/android/renderscript/cts/acos_f32_3.rs b/tests/src/android/renderscript/cts/acos_f32_3.rs
deleted file mode 100644
index a29a2f155ff..00000000000
--- a/tests/src/android/renderscript/cts/acos_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = acos(*in);
-}
diff --git a/tests/src/android/renderscript/cts/acos_f32_4.rs b/tests/src/android/renderscript/cts/acos_f32_4.rs
deleted file mode 100644
index 331bd720ac2..00000000000
--- a/tests/src/android/renderscript/cts/acos_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in , float4* out) {
-    *out = acos(*in);
-}
diff --git a/tests/src/android/renderscript/cts/acosh_f32.rs b/tests/src/android/renderscript/cts/acosh_f32.rs
index 86ff46f8b0f..8784b026b93 100644
--- a/tests/src/android/renderscript/cts/acosh_f32.rs
+++ b/tests/src/android/renderscript/cts/acosh_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void acosh_f32_1 (const float* in, float* out) {
+    *out = acosh(*in);
+}
+
+void acosh_f32_2 (const float2* in, float2* out) {
+    *out = acosh(*in);
+}
+
+void acosh_f32_3 (const float3* in, float3* out) {
+    *out = acosh(*in);
+}
+
+void acosh_f32_4 (const float4* in , float4* out) {
     *out = acosh(*in);
 }
diff --git a/tests/src/android/renderscript/cts/acosh_f32_2.rs b/tests/src/android/renderscript/cts/acosh_f32_2.rs
deleted file mode 100644
index 7a0678b6e03..00000000000
--- a/tests/src/android/renderscript/cts/acosh_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = acosh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/acosh_f32_3.rs b/tests/src/android/renderscript/cts/acosh_f32_3.rs
deleted file mode 100644
index cd88c2d70b6..00000000000
--- a/tests/src/android/renderscript/cts/acosh_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = acosh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/acosh_f32_4.rs b/tests/src/android/renderscript/cts/acosh_f32_4.rs
deleted file mode 100644
index 7965df29ed9..00000000000
--- a/tests/src/android/renderscript/cts/acosh_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in , float4* out) {
-    *out = acosh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/acospi_f32.rs b/tests/src/android/renderscript/cts/acospi_f32.rs
index 5cffe489745..66d89ebd7d2 100644
--- a/tests/src/android/renderscript/cts/acospi_f32.rs
+++ b/tests/src/android/renderscript/cts/acospi_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void acospi_f32_1 (const float* in, float* out) {
+    *out = acospi(*in);
+}
+
+void acospi_f32_2 (const float2* in, float2* out) {
+    *out = acospi(*in);
+}
+
+void acospi_f32_3 (const float3* in, float3* out) {
+    *out = acospi(*in);
+}
+
+void acospi_f32_4 (const float4* in, float4* out) {
     *out = acospi(*in);
 }
diff --git a/tests/src/android/renderscript/cts/acospi_f32_2.rs b/tests/src/android/renderscript/cts/acospi_f32_2.rs
deleted file mode 100644
index 138766f5343..00000000000
--- a/tests/src/android/renderscript/cts/acospi_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = acospi(*in);
-}
diff --git a/tests/src/android/renderscript/cts/acospi_f32_3.rs b/tests/src/android/renderscript/cts/acospi_f32_3.rs
deleted file mode 100644
index db5f7fbf258..00000000000
--- a/tests/src/android/renderscript/cts/acospi_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = acospi(*in);
-}
diff --git a/tests/src/android/renderscript/cts/acospi_f32_4.rs b/tests/src/android/renderscript/cts/acospi_f32_4.rs
deleted file mode 100644
index bbbda168edf..00000000000
--- a/tests/src/android/renderscript/cts/acospi_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = acospi(*in);
-}
diff --git a/tests/src/android/renderscript/cts/asin_f32.rs b/tests/src/android/renderscript/cts/asin_f32.rs
index eea1d6e0477..5f062f9a5e2 100644
--- a/tests/src/android/renderscript/cts/asin_f32.rs
+++ b/tests/src/android/renderscript/cts/asin_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void asin_f32_1 (const float* in, float* out) {
     *out = asin(*in);
 }
+
+void asin_f32_2 (const float2* in, float2* out) {
+    *out = asin(*in);
+}
+
+void asin_f32_3 (const float3* in, float3* out) {
+    *out = asin(*in);
+}
+
+void asin_f32_4 (const float4* in , float4* out) {
+    *out = asin (*in) ;
+}
diff --git a/tests/src/android/renderscript/cts/asin_f32_2.rs b/tests/src/android/renderscript/cts/asin_f32_2.rs
deleted file mode 100644
index c9f632a97eb..00000000000
--- a/tests/src/android/renderscript/cts/asin_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = asin(*in);
-}
diff --git a/tests/src/android/renderscript/cts/asin_f32_3.rs b/tests/src/android/renderscript/cts/asin_f32_3.rs
deleted file mode 100644
index 6b6f34d1655..00000000000
--- a/tests/src/android/renderscript/cts/asin_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = asin(*in);
-}
diff --git a/tests/src/android/renderscript/cts/asin_f32_4.rs b/tests/src/android/renderscript/cts/asin_f32_4.rs
deleted file mode 100644
index 5c22e495efc..00000000000
--- a/tests/src/android/renderscript/cts/asin_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in , float4* out) {
-    *out = asin (*in) ;
-}
diff --git a/tests/src/android/renderscript/cts/asinh_f32.rs b/tests/src/android/renderscript/cts/asinh_f32.rs
index 2d72492035c..82525074216 100644
--- a/tests/src/android/renderscript/cts/asinh_f32.rs
+++ b/tests/src/android/renderscript/cts/asinh_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void asinh_f32_1 (const float* in, float* out) {
+    *out = asinh(*in);
+}
+
+void asinh_f32_2 (const float2* in, float2* out) {
+    *out = asinh(*in);
+}
+
+void asinh_f32_3 (const float3* in, float3* out) {
+    *out = asinh(*in);
+}
+
+void asinh_f32_4 (const float4* in, float4* out) {
     *out = asinh(*in);
 }
diff --git a/tests/src/android/renderscript/cts/asinh_f32_2.rs b/tests/src/android/renderscript/cts/asinh_f32_2.rs
deleted file mode 100644
index d0f7a32d6a4..00000000000
--- a/tests/src/android/renderscript/cts/asinh_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = asinh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/asinh_f32_3.rs b/tests/src/android/renderscript/cts/asinh_f32_3.rs
deleted file mode 100644
index 9bff6540748..00000000000
--- a/tests/src/android/renderscript/cts/asinh_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = asinh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/asinh_f32_4.rs b/tests/src/android/renderscript/cts/asinh_f32_4.rs
deleted file mode 100644
index a43458d766e..00000000000
--- a/tests/src/android/renderscript/cts/asinh_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = asinh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/asinpi_f32.rs b/tests/src/android/renderscript/cts/asinpi_f32.rs
index 69ad081673b..66bf1d73414 100644
--- a/tests/src/android/renderscript/cts/asinpi_f32.rs
+++ b/tests/src/android/renderscript/cts/asinpi_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void asinpi_f32_1 (const float* in, float* out) {
+    *out = asinpi(*in);
+}
+
+void asinpi_f32_2 (const float2* in, float2* out) {
+    *out = asinpi(*in);
+}
+
+void asinpi_f32_3 (const float3* in, float3* out) {
+    *out = asinpi(*in);
+}
+
+void asinpi_f32_4 (const float4* in, float4* out) {
     *out = asinpi(*in);
 }
diff --git a/tests/src/android/renderscript/cts/asinpi_f32_2.rs b/tests/src/android/renderscript/cts/asinpi_f32_2.rs
deleted file mode 100644
index f67901997fd..00000000000
--- a/tests/src/android/renderscript/cts/asinpi_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = asinpi(*in);
-}
diff --git a/tests/src/android/renderscript/cts/asinpi_f32_3.rs b/tests/src/android/renderscript/cts/asinpi_f32_3.rs
deleted file mode 100644
index 1ad08cedf5d..00000000000
--- a/tests/src/android/renderscript/cts/asinpi_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = asinpi(*in);
-}
diff --git a/tests/src/android/renderscript/cts/asinpi_f32_4.rs b/tests/src/android/renderscript/cts/asinpi_f32_4.rs
deleted file mode 100644
index cf9978a8622..00000000000
--- a/tests/src/android/renderscript/cts/asinpi_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = asinpi(*in);
-}
diff --git a/tests/src/android/renderscript/cts/atan2_f32.rs b/tests/src/android/renderscript/cts/atan2_f32.rs
index eda410fa3b1..e1bab48584c 100644
--- a/tests/src/android/renderscript/cts/atan2_f32.rs
+++ b/tests/src/android/renderscript/cts/atan2_f32.rs
@@ -6,6 +6,33 @@ typedef struct atan2_f32_in {
     float second;
 } input;
 
-void root(const input* in, float* out){
+void atan2_f32_1(const input* in, float* out){
+    *out = atan2(in->first, in->second);
+}
+
+typedef struct atan2_f32_2_in {
+    float2 first;
+    float2 second;
+} input2;
+
+void atan2_f32_2(const input2* in, float2* out){
+    *out = atan2(in->first, in->second);
+}
+
+typedef struct atan2_f32_3_in {
+    float3 first;
+    float3 second;
+} input3;
+
+void atan2_f32_3(const input3* in, float3* out){
+    *out = atan2(in->first, in->second);
+}
+
+typedef struct atan2_f32_4_in {
+    float4 first;
+    float4 second;
+} input4;
+
+void atan2_f32_4(const input4* in, float4* out){
     *out = atan2(in->first, in->second);
 }
diff --git a/tests/src/android/renderscript/cts/atan2_f32_2.rs b/tests/src/android/renderscript/cts/atan2_f32_2.rs
deleted file mode 100644
index 9bb495bbcc4..00000000000
--- a/tests/src/android/renderscript/cts/atan2_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct atan2_f32_2_in {
-    float2 first;
-    float2 second;
-} input;
-
-void root(const input* in, float2* out){
-    *out = atan2(in->first, in->second);
-}
diff --git a/tests/src/android/renderscript/cts/atan2_f32_3.rs b/tests/src/android/renderscript/cts/atan2_f32_3.rs
deleted file mode 100644
index 713e823fe86..00000000000
--- a/tests/src/android/renderscript/cts/atan2_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct atan2_f32_3_in {
-    float3 first;
-    float3 second;
-} input;
-
-void root(const input* in, float3* out){
-    *out = atan2(in->first, in->second);
-}
diff --git a/tests/src/android/renderscript/cts/atan2_f32_4.rs b/tests/src/android/renderscript/cts/atan2_f32_4.rs
deleted file mode 100644
index cd4690c47b0..00000000000
--- a/tests/src/android/renderscript/cts/atan2_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct atan2_f32_4_in {
-    float4 first;
-    float4 second;
-} input;
-
-void root(const input* in, float4* out){
-    *out = atan2(in->first, in->second);
-}
diff --git a/tests/src/android/renderscript/cts/atan2pi_f32.rs b/tests/src/android/renderscript/cts/atan2pi_f32.rs
index 2743e57840e..2fe52d8d433 100644
--- a/tests/src/android/renderscript/cts/atan2pi_f32.rs
+++ b/tests/src/android/renderscript/cts/atan2pi_f32.rs
@@ -6,6 +6,33 @@ struct atan2pi_float_input {
     float y;
 };
 
-void root (const struct atan2pi_float_input* in, float* out) {
+void atan2pi_f32_1 (const struct atan2pi_float_input* in, float* out) {
+    *out = atan2pi(in->x, in->y);
+}
+
+struct atan2pi_float2_input {
+    float2 x;
+    float2 y;
+};
+
+void atan2pi_f32_2 (const struct atan2pi_float2_input* in, float2* out) {
+    *out = atan2pi(in->x, in->y);
+}
+
+struct atan2pi_float3_input {
+    float3 x;
+    float3 y;
+};
+
+void atan2pi_f32_3 (const struct atan2pi_float3_input* in, float3* out) {
+    *out = atan2pi(in->x, in->y);
+}
+
+struct atan2pi_float4_input {
+    float4 x;
+    float4 y;
+};
+
+void atan2pi_f32_4 (const struct atan2pi_float4_input* in, float4* out) {
     *out = atan2pi(in->x, in->y);
 }
diff --git a/tests/src/android/renderscript/cts/atan2pi_f32_2.rs b/tests/src/android/renderscript/cts/atan2pi_f32_2.rs
deleted file mode 100644
index 73db6d10918..00000000000
--- a/tests/src/android/renderscript/cts/atan2pi_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct atan2pi_float2_input {
-    float2 x;
-    float2 y;
-};
-
-void root (const struct atan2pi_float2_input* in, float2* out) {
-    *out = atan2pi(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/atan2pi_f32_3.rs b/tests/src/android/renderscript/cts/atan2pi_f32_3.rs
deleted file mode 100644
index 2b060bb60ff..00000000000
--- a/tests/src/android/renderscript/cts/atan2pi_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct atan2pi_float3_input {
-    float3 x;
-    float3 y;
-};
-
-void root (const struct atan2pi_float3_input* in, float3* out) {
-    *out = atan2pi(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/atan2pi_f32_4.rs b/tests/src/android/renderscript/cts/atan2pi_f32_4.rs
deleted file mode 100644
index 9e7e125f80f..00000000000
--- a/tests/src/android/renderscript/cts/atan2pi_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct atan2pi_float4_input {
-    float4 x;
-    float4 y;
-};
-
-void root (const struct atan2pi_float4_input* in, float4* out) {
-    *out = atan2pi(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/atan_f32.rs b/tests/src/android/renderscript/cts/atan_f32.rs
index c5050c87cf9..65a5ab514e3 100644
--- a/tests/src/android/renderscript/cts/atan_f32.rs
+++ b/tests/src/android/renderscript/cts/atan_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void atan_f32_1 (const float* in, float* out) {
     *out = atan(*in);
 }
+
+void atan_f32_2 (const float2* in, float2* out) {
+    *out = atan(*in);
+}
+
+void atan_f32_3 (const float3* in, float3* out) {
+    *out = atan(*in);
+}
+
+void atan_f32_4 (const float4* in, float4* out) {
+    *out =atan(*in);
+}
diff --git a/tests/src/android/renderscript/cts/atan_f32_2.rs b/tests/src/android/renderscript/cts/atan_f32_2.rs
deleted file mode 100644
index 4fc7e26e28d..00000000000
--- a/tests/src/android/renderscript/cts/atan_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = atan(*in);
-}
diff --git a/tests/src/android/renderscript/cts/atan_f32_3.rs b/tests/src/android/renderscript/cts/atan_f32_3.rs
deleted file mode 100644
index 1e49e8696c0..00000000000
--- a/tests/src/android/renderscript/cts/atan_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = atan(*in);
-}
diff --git a/tests/src/android/renderscript/cts/atan_f32_4.rs b/tests/src/android/renderscript/cts/atan_f32_4.rs
deleted file mode 100644
index d808a832087..00000000000
--- a/tests/src/android/renderscript/cts/atan_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out =atan(*in);
-}
diff --git a/tests/src/android/renderscript/cts/atanh_f32.rs b/tests/src/android/renderscript/cts/atanh_f32.rs
index 65c53a6e8e7..1f61e5e143f 100644
--- a/tests/src/android/renderscript/cts/atanh_f32.rs
+++ b/tests/src/android/renderscript/cts/atanh_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void atanh_f32_1 (const float* in, float* out) {
+    *out = atanh(*in);
+}
+
+void atanh_f32_2 (const float2* in, float2* out) {
+    *out = atanh(*in);
+}
+
+void atanh_f32_3 (const float3* in, float3* out) {
+    *out = atanh(*in);
+}
+
+void atanh_f32_4 (const float4* in, float4* out) {
     *out = atanh(*in);
 }
diff --git a/tests/src/android/renderscript/cts/atanh_f32_2.rs b/tests/src/android/renderscript/cts/atanh_f32_2.rs
deleted file mode 100644
index 387b4640649..00000000000
--- a/tests/src/android/renderscript/cts/atanh_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = atanh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/atanh_f32_3.rs b/tests/src/android/renderscript/cts/atanh_f32_3.rs
deleted file mode 100644
index 3d35057f298..00000000000
--- a/tests/src/android/renderscript/cts/atanh_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = atanh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/atanh_f32_4.rs b/tests/src/android/renderscript/cts/atanh_f32_4.rs
deleted file mode 100644
index 6ae342e22e8..00000000000
--- a/tests/src/android/renderscript/cts/atanh_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = atanh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/atanpi_f32.rs b/tests/src/android/renderscript/cts/atanpi_f32.rs
index 4a79b369409..182a43c8203 100644
--- a/tests/src/android/renderscript/cts/atanpi_f32.rs
+++ b/tests/src/android/renderscript/cts/atanpi_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void atanpi_f32_1 (const float* in, float* out) {
+    *out = atanpi(*in);
+}
+
+void atanpi_f32_2 (const float2* in, float2* out) {
+    *out = atanpi(*in);
+}
+
+void atanpi_f32_3 (const float3* in, float3* out) {
+    *out = atanpi(*in);
+}
+
+void atanpi_f32_4 (const float4* in, float4* out) {
     *out = atanpi(*in);
 }
diff --git a/tests/src/android/renderscript/cts/atanpi_f32_2.rs b/tests/src/android/renderscript/cts/atanpi_f32_2.rs
deleted file mode 100644
index 0a9226cf93f..00000000000
--- a/tests/src/android/renderscript/cts/atanpi_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = atanpi(*in);
-}
diff --git a/tests/src/android/renderscript/cts/atanpi_f32_3.rs b/tests/src/android/renderscript/cts/atanpi_f32_3.rs
deleted file mode 100644
index 8d96d22773d..00000000000
--- a/tests/src/android/renderscript/cts/atanpi_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = atanpi(*in);
-}
diff --git a/tests/src/android/renderscript/cts/atanpi_f32_4.rs b/tests/src/android/renderscript/cts/atanpi_f32_4.rs
deleted file mode 100644
index c1e4e8782f6..00000000000
--- a/tests/src/android/renderscript/cts/atanpi_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = atanpi(*in);
-}
diff --git a/tests/src/android/renderscript/cts/cbrt_f32.rs b/tests/src/android/renderscript/cts/cbrt_f32.rs
index e1752868b67..273e8a47e38 100644
--- a/tests/src/android/renderscript/cts/cbrt_f32.rs
+++ b/tests/src/android/renderscript/cts/cbrt_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root(const float *in, float *out) {
+void cbrt_f32_1(const float *in, float *out) {
+    *out = cbrt(*in);
+}
+
+void cbrt_f32_2(const float2 *in, float2 *out) {
+    *out = cbrt(*in);
+}
+
+void cbrt_f32_3(const float3 *in, float3 *out) {
+    *out = cbrt(*in);
+}
+
+void cbrt_f32_4(const float4 *in, float4 *out) {
     *out = cbrt(*in);
 }
diff --git a/tests/src/android/renderscript/cts/cbrt_f32_2.rs b/tests/src/android/renderscript/cts/cbrt_f32_2.rs
deleted file mode 100644
index 6f9f30313d1..00000000000
--- a/tests/src/android/renderscript/cts/cbrt_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2 *in, float2 *out) {
-    *out = cbrt(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/cbrt_f32_3.rs b/tests/src/android/renderscript/cts/cbrt_f32_3.rs
deleted file mode 100644
index 1472fb3e527..00000000000
--- a/tests/src/android/renderscript/cts/cbrt_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3 *in, float3 *out) {
-    *out = cbrt(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/cbrt_f32_4.rs b/tests/src/android/renderscript/cts/cbrt_f32_4.rs
deleted file mode 100644
index b07c68144d4..00000000000
--- a/tests/src/android/renderscript/cts/cbrt_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4 *in, float4 *out) {
-    *out = cbrt(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/ceil_f32.rs b/tests/src/android/renderscript/cts/ceil_f32.rs
index 2aac482a85a..c0817e294ff 100644
--- a/tests/src/android/renderscript/cts/ceil_f32.rs
+++ b/tests/src/android/renderscript/cts/ceil_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root(const float *in, float *out) {
+void ceil_f32_1(const float *in, float *out) {
     *out = ceil(*in);
-}
\ No newline at end of file
+}
+
+void ceil_f32_2(const float2 *in, float2 *out) {
+    *out = ceil(*in);
+}
+
+void ceil_f32_3(const float3 *in, float3 *out) {
+    *out = ceil(*in);
+}
+
+void ceil_f32_4(const float4 *in, float4 *out) {
+    *out = ceil(*in);
+}
diff --git a/tests/src/android/renderscript/cts/ceil_f32_2.rs b/tests/src/android/renderscript/cts/ceil_f32_2.rs
deleted file mode 100644
index e05e5aaac43..00000000000
--- a/tests/src/android/renderscript/cts/ceil_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2 *in, float2 *out) {
-    *out = ceil(*in);
-}
diff --git a/tests/src/android/renderscript/cts/ceil_f32_3.rs b/tests/src/android/renderscript/cts/ceil_f32_3.rs
deleted file mode 100644
index 397a9218ef3..00000000000
--- a/tests/src/android/renderscript/cts/ceil_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3 *in, float3 *out) {
-    *out = ceil(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/ceil_f32_4.rs b/tests/src/android/renderscript/cts/ceil_f32_4.rs
deleted file mode 100644
index 41cad2b0c60..00000000000
--- a/tests/src/android/renderscript/cts/ceil_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4 *in, float4 *out) {
-    *out = ceil(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/clear_object.rs b/tests/src/android/renderscript/cts/clear_object.rs
new file mode 100644
index 00000000000..0bee38b7ba5
--- /dev/null
+++ b/tests/src/android/renderscript/cts/clear_object.rs
@@ -0,0 +1,42 @@
+#pragma version(1)
+#pragma rs java_package_name(android.renderscript.cts)
+
+rs_allocation allocation;
+
+void clear_allocation(int *out)
+{
+    rsClearObject( &allocation );
+    *out = ( NULL == allocation.p ? 1 : 0 );
+}
+
+rs_element element;
+
+void clear_element(int *out)
+{
+    rsClearObject( &element );
+    *out = ( NULL == element.p ? 1 : 0 );
+}
+
+rs_sampler sampler;
+
+void clear_sampler(int *out)
+{
+    rsClearObject( &sampler );
+    *out = ( NULL == sampler.p ? 1 : 0 );
+}
+
+rs_script script;
+
+void clear_script(int *out)
+{
+    rsClearObject( &script );
+    *out = ( NULL == script.p ? 1 : 0 );
+}
+
+rs_type type;
+
+void clear_type(int *out)
+{
+    rsClearObject( &type );
+    *out = ( NULL == type.p ? 1 : 0 );
+}
diff --git a/tests/src/android/renderscript/cts/clear_object_allocation.rs b/tests/src/android/renderscript/cts/clear_object_allocation.rs
deleted file mode 100644
index 7bfe64dd941..00000000000
--- a/tests/src/android/renderscript/cts/clear_object_allocation.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_allocation allocation;
-
-void root( int *out)
-{
-    rsClearObject( &allocation );
-    *out = ( NULL == allocation.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/clear_object_element.rs b/tests/src/android/renderscript/cts/clear_object_element.rs
deleted file mode 100644
index abf3f89249a..00000000000
--- a/tests/src/android/renderscript/cts/clear_object_element.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_element element;
-
-void root( int *out)
-{
-    rsClearObject( &element );
-    *out = ( NULL == element.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/clear_object_mesh.rs b/tests/src/android/renderscript/cts/clear_object_mesh.rs
deleted file mode 100644
index 41daf1fb78f..00000000000
--- a/tests/src/android/renderscript/cts/clear_object_mesh.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_mesh mesh;
-
-void root(int *out)
-{
-    rsClearObject( &mesh );
-    *out = ( NULL == mesh.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/clear_object_sampler.rs b/tests/src/android/renderscript/cts/clear_object_sampler.rs
deleted file mode 100644
index b29d853634b..00000000000
--- a/tests/src/android/renderscript/cts/clear_object_sampler.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_sampler sampler;
-
-void root(int *out)
-{
-    rsClearObject( &sampler );
-    *out = ( NULL == sampler.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/clear_object_script.rs b/tests/src/android/renderscript/cts/clear_object_script.rs
deleted file mode 100644
index 5a0139f5e4d..00000000000
--- a/tests/src/android/renderscript/cts/clear_object_script.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_script script;
-
-void root( int *out)
-{
-    rsClearObject( &script );
-    *out = ( NULL == script.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/clear_object_type.rs b/tests/src/android/renderscript/cts/clear_object_type.rs
deleted file mode 100644
index 02e9f3162a6..00000000000
--- a/tests/src/android/renderscript/cts/clear_object_type.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_type type;
-
-void root(int *out)
-{
-    rsClearObject( &type );
-    *out = ( NULL == type.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/copysign_f32.rs b/tests/src/android/renderscript/cts/copysign_f32.rs
index d722d5a40b1..b0b300d4f37 100644
--- a/tests/src/android/renderscript/cts/copysign_f32.rs
+++ b/tests/src/android/renderscript/cts/copysign_f32.rs
@@ -6,6 +6,33 @@ struct copysign_f32_input {
     float y;
 };
 
-void root(const struct copysign_f32_input *in, float *out) {
+void copysign_f32_1(const struct copysign_f32_input *in, float *out) {
+    *out = copysign(in->x, in->y);
+}
+
+struct copysign_f32_2_input {
+    float2 x;
+    float2 y;
+};
+
+void copysign_f32_2(const struct copysign_f32_2_input *in, float2 *out) {
+    *out = copysign(in->x, in->y);
+}
+
+struct copysign_f32_3_input {
+    float3 x;
+    float3 y;
+};
+
+void copysign_f32_3(const struct copysign_f32_3_input *in, float3 *out) {
+    *out = copysign(in->x, in->y);
+}
+
+struct copysign_f32_4_input {
+    float4 x;
+    float4 y;
+};
+
+void copysign_f32_4(const struct copysign_f32_4_input *in, float4 *out) {
     *out = copysign(in->x, in->y);
 }
diff --git a/tests/src/android/renderscript/cts/copysign_f32_2.rs b/tests/src/android/renderscript/cts/copysign_f32_2.rs
deleted file mode 100644
index f310a5d125b..00000000000
--- a/tests/src/android/renderscript/cts/copysign_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct copysign_f32_2_input {
-    float2 x;
-    float2 y;
-};
-
-void root(const struct copysign_f32_2_input *in, float2 *out) {
-    *out = copysign(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/copysign_f32_3.rs b/tests/src/android/renderscript/cts/copysign_f32_3.rs
deleted file mode 100644
index bb58ef414ef..00000000000
--- a/tests/src/android/renderscript/cts/copysign_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct copysign_f32_3_input {
-    float3 x;
-    float3 y;
-};
-
-void root(const struct copysign_f32_3_input *in, float3 *out) {
-    *out = copysign(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/copysign_f32_4.rs b/tests/src/android/renderscript/cts/copysign_f32_4.rs
deleted file mode 100644
index ad083376b55..00000000000
--- a/tests/src/android/renderscript/cts/copysign_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct copysign_f32_4_input {
-    float4 x;
-    float4 y;
-};
-
-void root(const struct copysign_f32_4_input *in, float4 *out) {
-    *out = copysign(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/cos_f32.rs b/tests/src/android/renderscript/cts/cos_f32.rs
index 89f3878a98e..fd061dca0d6 100644
--- a/tests/src/android/renderscript/cts/cos_f32.rs
+++ b/tests/src/android/renderscript/cts/cos_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root(const float *in, float *out) {
+void cos_f32_1(const float *in, float *out) {
+    *out = cos(*in);
+}
+
+void cos_f32_2(const float2 *in, float2 *out) {
+    *out = cos(*in);
+}
+
+void cos_f32_3(const float3 *in, float3 *out) {
+    *out = cos(*in);
+}
+
+void cos_f32_4(const float4 *in, float4 *out) {
     *out = cos(*in);
 }
diff --git a/tests/src/android/renderscript/cts/cos_f32_2.rs b/tests/src/android/renderscript/cts/cos_f32_2.rs
deleted file mode 100644
index e596eca2e78..00000000000
--- a/tests/src/android/renderscript/cts/cos_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2 *in, float2 *out) {
-    *out = cos(*in);
-}
diff --git a/tests/src/android/renderscript/cts/cos_f32_3.rs b/tests/src/android/renderscript/cts/cos_f32_3.rs
deleted file mode 100644
index bcf5c4a8887..00000000000
--- a/tests/src/android/renderscript/cts/cos_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3 *in, float3 *out) {
-    *out = cos(*in);
-}
diff --git a/tests/src/android/renderscript/cts/cos_f32_4.rs b/tests/src/android/renderscript/cts/cos_f32_4.rs
deleted file mode 100644
index 08e47677b41..00000000000
--- a/tests/src/android/renderscript/cts/cos_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4 *in, float4 *out) {
-    *out = cos(*in);
-}
diff --git a/tests/src/android/renderscript/cts/cosh_f32.rs b/tests/src/android/renderscript/cts/cosh_f32.rs
index 6ec2987491f..0f2ab0f5293 100644
--- a/tests/src/android/renderscript/cts/cosh_f32.rs
+++ b/tests/src/android/renderscript/cts/cosh_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root(const float *in, float *out) {
+void cosh_f32_1(const float *in, float *out) {
+    *out = cosh(*in);
+}
+
+void cosh_f32_2(const float2 *in, float2 *out) {
+    *out = cosh(*in);
+}
+
+void cosh_f32_3(const float3 *in, float3 *out) {
+    *out = cosh(*in);
+}
+
+void cosh_f32_4(const float4 *in, float4 *out) {
     *out = cosh(*in);
 }
diff --git a/tests/src/android/renderscript/cts/cosh_f32_2.rs b/tests/src/android/renderscript/cts/cosh_f32_2.rs
deleted file mode 100644
index a440e60a600..00000000000
--- a/tests/src/android/renderscript/cts/cosh_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2 *in, float2 *out) {
-    *out = cosh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/cosh_f32_3.rs b/tests/src/android/renderscript/cts/cosh_f32_3.rs
deleted file mode 100644
index 6408d33fb52..00000000000
--- a/tests/src/android/renderscript/cts/cosh_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3 *in, float3 *out) {
-    *out = cosh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/cosh_f32_4.rs b/tests/src/android/renderscript/cts/cosh_f32_4.rs
deleted file mode 100644
index 666c493f525..00000000000
--- a/tests/src/android/renderscript/cts/cosh_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4 *in, float4 *out) {
-    *out = cosh(*in);
-}
diff --git a/tests/src/android/renderscript/cts/cross_f32.rs b/tests/src/android/renderscript/cts/cross_f32.rs
new file mode 100644
index 00000000000..e996e5fbf06
--- /dev/null
+++ b/tests/src/android/renderscript/cts/cross_f32.rs
@@ -0,0 +1,19 @@
+#pragma version(1)
+#pragma rs java_package_name(android.renderscript.cts)
+typedef struct _cross_f32_3_struct {
+    float3 low;
+    float3 high;
+} cross_f32_3_struct;
+
+void cross_f32_3(const cross_f32_3_struct *in, float3 *out) {
+    *out = cross(in->low, in->high);
+}
+
+typedef struct _cross_f32_4_struct {
+    float4 low;
+    float4 high;
+} cross_f32_4_struct;
+
+void cross_f32_4(const cross_f32_4_struct *in, float4 *out) {
+    *out = cross(in->low, in->high);
+}
diff --git a/tests/src/android/renderscript/cts/cross_f32_3.rs b/tests/src/android/renderscript/cts/cross_f32_3.rs
deleted file mode 100644
index 5895ae48969..00000000000
--- a/tests/src/android/renderscript/cts/cross_f32_3.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-typedef struct _cross_f32_3_struct {
-    float3 low;
-    float3 high;
-}cross_f32_3_struct;
-
-void root(const cross_f32_3_struct *in, float3 *out) {
-    *out = cross(in->low, in->high);
-}
diff --git a/tests/src/android/renderscript/cts/cross_f32_4.rs b/tests/src/android/renderscript/cts/cross_f32_4.rs
deleted file mode 100644
index b2092ca979d..00000000000
--- a/tests/src/android/renderscript/cts/cross_f32_4.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-typedef struct _cross_f32_4_struct {
-    float4 low;
-    float4 high;
-}cross_f32_4_struct;
-
-void root(const cross_f32_4_struct *in, float4 *out) {
-    *out = cross(in->low, in->high);
-}
diff --git a/tests/src/android/renderscript/cts/deg_f32.rs b/tests/src/android/renderscript/cts/deg_f32.rs
deleted file mode 100644
index 447b12b3399..00000000000
--- a/tests/src/android/renderscript/cts/deg_f32.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float* in, float* out) {
-    *out = degrees(*in);
-}
diff --git a/tests/src/android/renderscript/cts/deg_f32_2.rs b/tests/src/android/renderscript/cts/deg_f32_2.rs
deleted file mode 100644
index c9fc6a00f07..00000000000
--- a/tests/src/android/renderscript/cts/deg_f32_2.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2* in, float2* out) {
-    *out = degrees (*in);
-
-}
diff --git a/tests/src/android/renderscript/cts/deg_f32_3.rs b/tests/src/android/renderscript/cts/deg_f32_3.rs
deleted file mode 100644
index ed34b19edbe..00000000000
--- a/tests/src/android/renderscript/cts/deg_f32_3.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3* in, float3* out) {
-    *out = degrees(*in);
-
-}
diff --git a/tests/src/android/renderscript/cts/deg_f32_4.rs b/tests/src/android/renderscript/cts/deg_f32_4.rs
deleted file mode 100644
index 82c5e5c0987..00000000000
--- a/tests/src/android/renderscript/cts/deg_f32_4.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4* in, float4* out) {
-    *out = degrees(*in);
-
-}
diff --git a/tests/src/android/renderscript/cts/degrees_f32.rs b/tests/src/android/renderscript/cts/degrees_f32.rs
new file mode 100644
index 00000000000..e57124607ff
--- /dev/null
+++ b/tests/src/android/renderscript/cts/degrees_f32.rs
@@ -0,0 +1,21 @@
+#pragma version(1)
+#pragma rs java_package_name(android.renderscript.cts)
+
+void degrees_f32_1(const float* in, float* out) {
+    *out = degrees(*in);
+}
+
+void degrees_f32_2(const float2* in, float2* out) {
+    *out = degrees (*in);
+
+}
+
+void degrees_f32_3(const float3* in, float3* out) {
+    *out = degrees(*in);
+
+}
+
+void degrees_f32_4(const float4* in, float4* out) {
+    *out = degrees(*in);
+
+}
diff --git a/tests/src/android/renderscript/cts/exp10_f32.rs b/tests/src/android/renderscript/cts/exp10_f32.rs
index f45a50366ec..67f5c26aec9 100644
--- a/tests/src/android/renderscript/cts/exp10_f32.rs
+++ b/tests/src/android/renderscript/cts/exp10_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root(const float *in, float *out) {
+void exp10_f32_1(const float *in, float *out) {
+    *out = exp10(*in);
+}
+
+void exp10_f32_2(const float2 *in, float2 *out) {
+    *out = exp10(*in);
+}
+
+void exp10_f32_3(const float3 *in, float3 *out) {
+    *out = exp10(*in);
+}
+
+void exp10_f32_4(const float4 *in, float4 *out) {
     *out = exp10(*in);
 }
diff --git a/tests/src/android/renderscript/cts/exp10_f32_2.rs b/tests/src/android/renderscript/cts/exp10_f32_2.rs
deleted file mode 100644
index ff48f4e575d..00000000000
--- a/tests/src/android/renderscript/cts/exp10_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2 *in, float2 *out) {
-    *out = exp10(*in);
-}
diff --git a/tests/src/android/renderscript/cts/exp10_f32_3.rs b/tests/src/android/renderscript/cts/exp10_f32_3.rs
deleted file mode 100644
index e7ffa54fee3..00000000000
--- a/tests/src/android/renderscript/cts/exp10_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3 *in, float3 *out) {
-    *out = exp10(*in);
-}
diff --git a/tests/src/android/renderscript/cts/exp10_f32_4.rs b/tests/src/android/renderscript/cts/exp10_f32_4.rs
deleted file mode 100644
index 1c60e94d4a4..00000000000
--- a/tests/src/android/renderscript/cts/exp10_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4 *in, float4 *out) {
-    *out = exp10(*in);
-}
diff --git a/tests/src/android/renderscript/cts/exp2_f32.rs b/tests/src/android/renderscript/cts/exp2_f32.rs
index c5f0a815b41..9095bf3a1f7 100644
--- a/tests/src/android/renderscript/cts/exp2_f32.rs
+++ b/tests/src/android/renderscript/cts/exp2_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root(const float *in, float *out) {
+void exp2_f32_1(const float *in, float *out) {
+    *out = exp2(*in);
+}
+
+void exp2_f32_2(const float2 *in, float2 *out) {
+    *out = exp2(*in);
+}
+
+void exp2_f32_3(const float3 *in, float3 *out) {
+    *out = exp2(*in);
+}
+
+void exp2_f32_4(const float4 *in, float4 *out) {
     *out = exp2(*in);
 }
diff --git a/tests/src/android/renderscript/cts/exp2_f32_2.rs b/tests/src/android/renderscript/cts/exp2_f32_2.rs
deleted file mode 100644
index c972310903a..00000000000
--- a/tests/src/android/renderscript/cts/exp2_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2 *in, float2 *out) {
-    *out = exp2(*in);
-}
diff --git a/tests/src/android/renderscript/cts/exp2_f32_3.rs b/tests/src/android/renderscript/cts/exp2_f32_3.rs
deleted file mode 100644
index 80d49c110bb..00000000000
--- a/tests/src/android/renderscript/cts/exp2_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3 *in, float3 *out) {
-    *out = exp2(*in);
-}
diff --git a/tests/src/android/renderscript/cts/exp2_f32_4.rs b/tests/src/android/renderscript/cts/exp2_f32_4.rs
deleted file mode 100644
index a82430f11d0..00000000000
--- a/tests/src/android/renderscript/cts/exp2_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4 *in, float4 *out) {
-    *out = exp2(*in);
-}
diff --git a/tests/src/android/renderscript/cts/exp_f32.rs b/tests/src/android/renderscript/cts/exp_f32.rs
index 575d2473f72..036c490c47c 100644
--- a/tests/src/android/renderscript/cts/exp_f32.rs
+++ b/tests/src/android/renderscript/cts/exp_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root(const float *in, float *out) {
+void exp_f32_1(const float *in, float *out) {
     *out = exp(*in);
-}
\ No newline at end of file
+}
+
+void exp_f32_2(const float2 *in, float2 *out) {
+    *out = exp(*in);
+}
+
+void exp_f32_3(const float3 *in, float3 *out) {
+    *out = exp(*in);
+}
+
+void exp_f32_4(const float4 *in, float4 *out) {
+    *out = exp(*in);
+}
diff --git a/tests/src/android/renderscript/cts/exp_f32_2.rs b/tests/src/android/renderscript/cts/exp_f32_2.rs
deleted file mode 100644
index 1d2c5461438..00000000000
--- a/tests/src/android/renderscript/cts/exp_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2 *in, float2 *out) {
-    *out = exp(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/exp_f32_3.rs b/tests/src/android/renderscript/cts/exp_f32_3.rs
deleted file mode 100644
index 6b04c5fec5a..00000000000
--- a/tests/src/android/renderscript/cts/exp_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3 *in, float3 *out) {
-    *out = exp(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/exp_f32_4.rs b/tests/src/android/renderscript/cts/exp_f32_4.rs
deleted file mode 100644
index ced9021f363..00000000000
--- a/tests/src/android/renderscript/cts/exp_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4 *in, float4 *out) {
-    *out = exp(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/expm1_f32.rs b/tests/src/android/renderscript/cts/expm1_f32.rs
index b9875ae57fa..19501315dcd 100644
--- a/tests/src/android/renderscript/cts/expm1_f32.rs
+++ b/tests/src/android/renderscript/cts/expm1_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root(const float *in, float *out) {
+void expm1_f32_1(const float *in, float *out) {
+    *out = expm1(*in);
+}
+
+void expm1_f32_2(const float2 *in, float2 *out) {
+    *out = expm1(*in);
+}
+
+void expm1_f32_3(const float3 *in, float3 *out) {
+    *out = expm1(*in);
+}
+
+void expm1_f32_4(const float4 *in, float4 *out) {
     *out = expm1(*in);
 }
diff --git a/tests/src/android/renderscript/cts/expm1_f32_2.rs b/tests/src/android/renderscript/cts/expm1_f32_2.rs
deleted file mode 100644
index 73fb2b14027..00000000000
--- a/tests/src/android/renderscript/cts/expm1_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2 *in, float2 *out) {
-    *out = expm1(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/expm1_f32_3.rs b/tests/src/android/renderscript/cts/expm1_f32_3.rs
deleted file mode 100644
index 92593bd8e56..00000000000
--- a/tests/src/android/renderscript/cts/expm1_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3 *in, float3 *out) {
-    *out = expm1(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/expm1_f32_4.rs b/tests/src/android/renderscript/cts/expm1_f32_4.rs
deleted file mode 100644
index 4d2aaaa7bf7..00000000000
--- a/tests/src/android/renderscript/cts/expm1_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4 *in, float4 *out) {
-    *out = expm1(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fabs_f32.rs b/tests/src/android/renderscript/cts/fabs_f32.rs
index 221339cdb80..1567e4d349b 100644
--- a/tests/src/android/renderscript/cts/fabs_f32.rs
+++ b/tests/src/android/renderscript/cts/fabs_f32.rs
@@ -1,5 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
-void root(const float *in, float *out) {
+
+void fabs_f32_1(const float *in, float *out) {
     *out = fabs(*in);
-}
\ No newline at end of file
+}
+
+void fabs_f32_2(const float2 *in, float2 *out) {
+    *out = fabs(*in);
+}
+
+void fabs_f32_3(const float3 *in, float3 *out) {
+    *out = fabs(*in);
+}
+
+void fabs_f32_4(const float4 *in, float4 *out) {
+    *out = fabs(*in);
+}
diff --git a/tests/src/android/renderscript/cts/fabs_f32_2.rs b/tests/src/android/renderscript/cts/fabs_f32_2.rs
deleted file mode 100644
index c4aa88406fc..00000000000
--- a/tests/src/android/renderscript/cts/fabs_f32_2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float2 *in, float2 *out) {
-    *out = fabs(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fabs_f32_3.rs b/tests/src/android/renderscript/cts/fabs_f32_3.rs
deleted file mode 100644
index 320d551fbf5..00000000000
--- a/tests/src/android/renderscript/cts/fabs_f32_3.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float3 *in, float3 *out) {
-    *out = fabs(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fabs_f32_4.rs b/tests/src/android/renderscript/cts/fabs_f32_4.rs
deleted file mode 100644
index c7f97888dd2..00000000000
--- a/tests/src/android/renderscript/cts/fabs_f32_4.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float4 *in, float4 *out) {
-    *out = fabs(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fdim_f32.rs b/tests/src/android/renderscript/cts/fdim_f32.rs
index 4292ec9c1e3..e2c5fb10bb5 100644
--- a/tests/src/android/renderscript/cts/fdim_f32.rs
+++ b/tests/src/android/renderscript/cts/fdim_f32.rs
@@ -6,6 +6,33 @@ struct fdim_f32_input {
     float y;
 };
 
-void root(const struct fdim_f32_input *in, float *out) {
+void fdim_f32_1(const struct fdim_f32_input *in, float *out) {
     *out = fdim(in->x, in->y);
-}
\ No newline at end of file
+}
+
+struct fdim_f32_2_input {
+    float2 x;
+    float2 y;
+};
+
+void fdim_f32_2(const struct fdim_f32_2_input *in, float2 *out) {
+    *out = fdim(in->x, in->y);
+}
+
+struct fdim_f32_3_input {
+    float3 x;
+    float3 y;
+};
+
+void fdim_f32_3(const struct fdim_f32_3_input *in, float3 *out) {
+    *out = fdim(in->x, in->y);
+}
+
+struct fdim_f32_4_input {
+    float4 x;
+    float4 y;
+};
+
+void fdim_f32_4(const struct fdim_f32_4_input *in, float4 *out) {
+    *out = fdim(in->x, in->y);
+}
diff --git a/tests/src/android/renderscript/cts/fdim_f32_2.rs b/tests/src/android/renderscript/cts/fdim_f32_2.rs
deleted file mode 100644
index 5965a4ea069..00000000000
--- a/tests/src/android/renderscript/cts/fdim_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct fdim_f32_2_input {
-    float2 x;
-    float2 y;
-};
-
-void root(const struct fdim_f32_2_input *in, float2 *out) {
-    *out = fdim(in->x, in->y);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fdim_f32_3.rs b/tests/src/android/renderscript/cts/fdim_f32_3.rs
deleted file mode 100644
index 86aecd56e0c..00000000000
--- a/tests/src/android/renderscript/cts/fdim_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct fdim_f32_3_input {
-    float3 x;
-    float3 y;
-};
-
-void root(const struct fdim_f32_3_input *in, float3 *out) {
-    *out = fdim(in->x, in->y);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fdim_f32_4.rs b/tests/src/android/renderscript/cts/fdim_f32_4.rs
deleted file mode 100644
index a3d953fc5b4..00000000000
--- a/tests/src/android/renderscript/cts/fdim_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct fdim_f32_4_input {
-    float4 x;
-    float4 y;
-};
-
-void root(const struct fdim_f32_4_input *in, float4 *out) {
-    *out = fdim(in->x, in->y);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/floor_f32.rs b/tests/src/android/renderscript/cts/floor_f32.rs
index e2faa4817bd..2300dabdd7d 100644
--- a/tests/src/android/renderscript/cts/floor_f32.rs
+++ b/tests/src/android/renderscript/cts/floor_f32.rs
@@ -1,5 +1,17 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
-void root(const float *in, float *out) {
+void floor_f32_1(const float *in, float *out) {
     *out = floor(*in);
-}
\ No newline at end of file
+}
+
+void floor_f32_2(const float2 *in, float2 *out) {
+    *out = floor(*in);
+}
+
+void floor_f32_3(const float3 *in, float3 *out) {
+    *out = floor(*in);
+}
+
+void floor_f32_4(const float4 *in, float4 *out) {
+    *out = floor(*in);
+}
diff --git a/tests/src/android/renderscript/cts/floor_f32_2.rs b/tests/src/android/renderscript/cts/floor_f32_2.rs
deleted file mode 100644
index 83fb4e7b984..00000000000
--- a/tests/src/android/renderscript/cts/floor_f32_2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float2 *in, float2 *out) {
-    *out = floor(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/floor_f32_3.rs b/tests/src/android/renderscript/cts/floor_f32_3.rs
deleted file mode 100644
index 6dad3e2336e..00000000000
--- a/tests/src/android/renderscript/cts/floor_f32_3.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float3 *in, float3 *out) {
-    *out = floor(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/floor_f32_4.rs b/tests/src/android/renderscript/cts/floor_f32_4.rs
deleted file mode 100644
index b6083bee270..00000000000
--- a/tests/src/android/renderscript/cts/floor_f32_4.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float4 *in, float4 *out) {
-    *out = floor(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fma_f32.rs b/tests/src/android/renderscript/cts/fma_f32.rs
index fba5202f64c..36257a5baee 100644
--- a/tests/src/android/renderscript/cts/fma_f32.rs
+++ b/tests/src/android/renderscript/cts/fma_f32.rs
@@ -7,6 +7,36 @@ typedef struct Floats {
     float fc;
 } Floats;
 
-void root(const Floats *in, float *out) {
+void fma_f32_1(const Floats *in, float *out) {
     *out = fma(in->fa, in->fb, in->fc);
-}
\ No newline at end of file
+}
+
+typedef struct Floats2 {
+    float2 fa;
+    float2 fb;
+    float2 fc;
+} Floats2;
+
+void fma_f32_2(const Floats2 *in, float2 *out) {
+    *out = fma(in->fa, in->fb, in->fc);
+}
+
+typedef struct Floats3 {
+    float3 fa;
+    float3 fb;
+    float3 fc;
+} Floats3;
+
+void fma_f32_3(const Floats3 *in, float3 *out) {
+    *out = fma(in->fa, in->fb, in->fc);
+}
+
+typedef struct Floats4 {
+    float4 fa;
+    float4 fb;
+    float4 fc;
+} Floats4;
+
+void fma_f32_4(const Floats4 *in, float4 *out) {
+    *out = fma(in->fa, in->fb, in->fc);
+}
diff --git a/tests/src/android/renderscript/cts/fma_f32_2.rs b/tests/src/android/renderscript/cts/fma_f32_2.rs
deleted file mode 100644
index 1ab4b4fe360..00000000000
--- a/tests/src/android/renderscript/cts/fma_f32_2.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct Floats2 {
-    float2 fa;
-    float2 fb;
-    float2 fc;
-} Floats2;
-
-void root(const Floats2 *in, float2 *out) {
-    *out = fma(in->fa, in->fb, in->fc);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fma_f32_3.rs b/tests/src/android/renderscript/cts/fma_f32_3.rs
deleted file mode 100644
index c1006e1a072..00000000000
--- a/tests/src/android/renderscript/cts/fma_f32_3.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct Floats3 {
-    float3 fa;
-    float3 fb;
-    float3 fc;
-} Floats3;
-
-void root(const Floats3 *in, float3 *out) {
-    *out = fma(in->fa, in->fb, in->fc);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fma_f32_4.rs b/tests/src/android/renderscript/cts/fma_f32_4.rs
deleted file mode 100644
index 46c2f895eb3..00000000000
--- a/tests/src/android/renderscript/cts/fma_f32_4.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct Floats4 {
-    float4 fa;
-    float4 fb;
-    float4 fc;
-} Floats4;
-
-void root(const Floats4 *in, float4 *out) {
-    *out = fma(in->fa, in->fb, in->fc);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fmax_f32.rs b/tests/src/android/renderscript/cts/fmax_f32.rs
index 3deab717b7b..e03f258b310 100644
--- a/tests/src/android/renderscript/cts/fmax_f32.rs
+++ b/tests/src/android/renderscript/cts/fmax_f32.rs
@@ -4,8 +4,35 @@
 typedef struct fmax_f32_in {
     float first;
     float second;
-} input;
+} input1;
 
-void root(const input* in, float* out){
+void fmax_f32_1(const input1* in, float* out){
+    *out = fmax(in->first, in->second);
+}
+
+typedef struct fmax_f32_2_in {
+    float2 first;
+    float2 second;
+} input2;
+
+void fmax_f32_2(const input2* in, float2* out){
+    *out = fmax(in->first, in->second);
+}
+
+typedef struct fmax_f32_3_in {
+    float3 first;
+    float3 second;
+} input3;
+
+void fmax_f32_3(const input3* in, float3* out){
+    *out = fmax(in->first, in->second);
+}
+
+typedef struct fmax_f32_4_in {
+    float4 first;
+    float4 second;
+} input4;
+
+void fmax_f32_4(const input4* in, float4* out){
     *out = fmax(in->first, in->second);
 }
diff --git a/tests/src/android/renderscript/cts/fmax_f32_2.rs b/tests/src/android/renderscript/cts/fmax_f32_2.rs
deleted file mode 100644
index 7e901e9c56a..00000000000
--- a/tests/src/android/renderscript/cts/fmax_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct fmax_f32_2_in {
-    float2 first;
-    float2 second;
-} input;
-
-void root(const input* in, float2* out){
-    *out = fmax(in->first, in->second);
-}
diff --git a/tests/src/android/renderscript/cts/fmax_f32_3.rs b/tests/src/android/renderscript/cts/fmax_f32_3.rs
deleted file mode 100644
index 37b856df42e..00000000000
--- a/tests/src/android/renderscript/cts/fmax_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct fmax_f32_3_in {
-    float3 first;
-    float3 second;
-} input;
-
-void root(const input* in, float3* out){
-    *out = fmax(in->first, in->second);
-}
diff --git a/tests/src/android/renderscript/cts/fmax_f32_4.rs b/tests/src/android/renderscript/cts/fmax_f32_4.rs
deleted file mode 100644
index 2057a863a84..00000000000
--- a/tests/src/android/renderscript/cts/fmax_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct fmax_f32_4_in {
-    float4 first;
-    float4 second;
-} input;
-
-void root(const input* in, float4* out){
-    *out = fmax(in->first, in->second);
-}
diff --git a/tests/src/android/renderscript/cts/fmin_f32.rs b/tests/src/android/renderscript/cts/fmin_f32.rs
index d8dec4d55cb..49033f016ef 100644
--- a/tests/src/android/renderscript/cts/fmin_f32.rs
+++ b/tests/src/android/renderscript/cts/fmin_f32.rs
@@ -4,8 +4,35 @@
 typedef struct fmin_f32_in {
     float first;
     float second;
-} input;
+} input1;
 
-void root(const input* in, float* out){
+void fmin_f32_1(const input1* in, float* out){
+    *out = fmin(in->first, in->second);
+}
+
+typedef struct fmin_f32_2_in {
+    float2 first;
+    float2 second;
+} input2;
+
+void fmin_f32_2(const input2* in, float2* out){
+    *out = fmin(in->first, in->second);
+}
+
+typedef struct fmin_f32_3_in {
+    float3 first;
+    float3 second;
+} input3;
+
+void fmin_f32_3(const input3* in, float3* out){
+    *out = fmin(in->first, in->second);
+}
+
+typedef struct fmin_f32_4_in {
+    float4 first;
+    float4 second;
+} input4;
+
+void fmin_f32_4(const input4* in, float4* out){
     *out = fmin(in->first, in->second);
 }
diff --git a/tests/src/android/renderscript/cts/fmin_f32_2.rs b/tests/src/android/renderscript/cts/fmin_f32_2.rs
deleted file mode 100644
index b623bc54548..00000000000
--- a/tests/src/android/renderscript/cts/fmin_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct fmin_f32_2_in {
-    float2 first;
-    float2 second;
-} input;
-
-void root(const input* in, float2* out){
-    *out = fmin(in->first, in->second);
-}
diff --git a/tests/src/android/renderscript/cts/fmin_f32_3.rs b/tests/src/android/renderscript/cts/fmin_f32_3.rs
deleted file mode 100644
index 8e60215c5fe..00000000000
--- a/tests/src/android/renderscript/cts/fmin_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct fmin_f32_3_in {
-    float3 first;
-    float3 second;
-} input;
-
-void root(const input* in, float3* out){
-    *out = fmin(in->first, in->second);
-}
diff --git a/tests/src/android/renderscript/cts/fmin_f32_4.rs b/tests/src/android/renderscript/cts/fmin_f32_4.rs
deleted file mode 100644
index ab299128fa5..00000000000
--- a/tests/src/android/renderscript/cts/fmin_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct fmin_f32_4_in {
-    float4 first;
-    float4 second;
-} input;
-
-void root(const input* in, float4* out){
-    *out = fmin(in->first, in->second);
-}
diff --git a/tests/src/android/renderscript/cts/fmod_f32.rs b/tests/src/android/renderscript/cts/fmod_f32.rs
index 95f5ce37344..ca8b282df1e 100644
--- a/tests/src/android/renderscript/cts/fmod_f32.rs
+++ b/tests/src/android/renderscript/cts/fmod_f32.rs
@@ -6,6 +6,33 @@ struct fmod_input_f32 {
     float param2;
 };
 
-void root(const struct fmod_input_f32 *in, float *out) {
+void fmod_f32_1(const struct fmod_input_f32 *in, float *out) {
     *out = fmod(in->param1, in->param2);
-}
\ No newline at end of file
+}
+
+struct fmod_input_f32_2 {
+    float2 param1;
+    float2 param2;
+};
+
+void fmod_f32_2(const struct fmod_input_f32_2 *in, float2 *out) {
+    *out = fmod(in->param1, in->param2);
+}
+
+struct fmod_input_f32_3 {
+    float3 param1;
+    float3 param2;
+};
+
+void fmod_f32_3(const struct fmod_input_f32_3 *in, float3 *out) {
+    *out = fmod(in->param1, in->param2);
+}
+
+struct fmod_input_f32_4 {
+    float4 param1;
+    float4 param2;
+};
+
+void fmod_f32_4(const struct fmod_input_f32_4 *in, float4 *out) {
+    *out = fmod(in->param1, in->param2);
+}
diff --git a/tests/src/android/renderscript/cts/fmod_f32_2.rs b/tests/src/android/renderscript/cts/fmod_f32_2.rs
deleted file mode 100644
index c48c2a3f581..00000000000
--- a/tests/src/android/renderscript/cts/fmod_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct fmod_input_f32_2 {
-    float2 param1;
-    float2 param2;
-};
-
-void root(const struct fmod_input_f32_2 *in, float2 *out) {
-    *out = fmod(in->param1, in->param2);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fmod_f32_3.rs b/tests/src/android/renderscript/cts/fmod_f32_3.rs
deleted file mode 100644
index 7a57e1a244d..00000000000
--- a/tests/src/android/renderscript/cts/fmod_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct fmod_input_f32_3 {
-    float3 param1;
-    float3 param2;
-};
-
-void root(const struct fmod_input_f32_3 *in, float3 *out) {
-    *out = fmod(in->param1, in->param2);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/fmod_f32_4.rs b/tests/src/android/renderscript/cts/fmod_f32_4.rs
deleted file mode 100644
index 0fb4f739500..00000000000
--- a/tests/src/android/renderscript/cts/fmod_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct fmod_input_f32_4 {
-    float4 param1;
-    float4 param2;
-};
-
-void root(const struct fmod_input_f32_4 *in, float4 *out) {
-    *out = fmod(in->param1, in->param2);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/hypot_f32.rs b/tests/src/android/renderscript/cts/hypot_f32.rs
index 196fd2377ef..4f9159cc573 100644
--- a/tests/src/android/renderscript/cts/hypot_f32.rs
+++ b/tests/src/android/renderscript/cts/hypot_f32.rs
@@ -6,6 +6,33 @@ typedef struct hypot_f32_in {
     float y;
 } hypot_input_f32;
 
-void root(const hypot_input_f32 *in, float *out) {
+void hypot_f32_1(const hypot_input_f32 *in, float *out) {
+    *out = hypot(in->x, in->y);
+}
+
+typedef struct hypot_f32_2_in {
+    float2 x;
+    float2 y;
+} hypot_input_f32_2;
+
+void hypot_f32_2(const hypot_input_f32_2 *in, float2 *out) {
+    *out = hypot(in->x, in->y);
+}
+
+typedef struct hypot_f32_3_in {
+    float3 x;
+    float3 y;
+} hypot_input_f32_3;
+
+void hypot_f32_3(const hypot_input_f32_3 *in, float3 *out) {
+    *out = hypot(in->x, in->y);
+}
+
+typedef struct hypot_f32_4_in {
+    float4 x;
+    float4 y;
+} hypot_input_f32_4;
+
+void hypot_f32_4(const hypot_input_f32_4 *in, float4 *out) {
     *out = hypot(in->x, in->y);
 }
diff --git a/tests/src/android/renderscript/cts/hypot_f32_2.rs b/tests/src/android/renderscript/cts/hypot_f32_2.rs
deleted file mode 100644
index 08d2809b6a7..00000000000
--- a/tests/src/android/renderscript/cts/hypot_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct hypot_f32_2_in {
-    float2 x;
-    float2 y;
-} hypot_input_f32_2;
-
-void root(const hypot_input_f32_2 *in, float2 *out) {
-    *out = hypot(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/hypot_f32_3.rs b/tests/src/android/renderscript/cts/hypot_f32_3.rs
deleted file mode 100644
index 7864840bb6f..00000000000
--- a/tests/src/android/renderscript/cts/hypot_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct hypot_f32_3_in {
-    float3 x;
-    float3 y;
-} hypot_input_f32_3;
-
-void root(const hypot_input_f32_3 *in, float3 *out) {
-    *out = hypot(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/hypot_f32_4.rs b/tests/src/android/renderscript/cts/hypot_f32_4.rs
deleted file mode 100644
index b23effe9bbb..00000000000
--- a/tests/src/android/renderscript/cts/hypot_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct hypot_f32_4_in {
-    float4 x;
-    float4 y;
-} hypot_input_f32_4;
-
-void root(const hypot_input_f32_4 *in, float4 *out) {
-    *out = hypot(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/is_object.rs b/tests/src/android/renderscript/cts/is_object.rs
new file mode 100644
index 00000000000..da28240fdbb
--- /dev/null
+++ b/tests/src/android/renderscript/cts/is_object.rs
@@ -0,0 +1,47 @@
+#pragma version(1)
+#pragma rs java_package_name(android.renderscript.cts)
+
+typedef struct _object_allocation_input {
+    rs_allocation allocation;
+} object_allocation_input;
+
+void is_object_allocation( const object_allocation_input *in, int *out)
+{
+    *out = rsIsObject(in->allocation)==false ? 0 : 1;
+}
+
+typedef struct _object_element_input {
+    rs_element element;
+} object_element_input;
+
+void is_object_element( const object_element_input *in, int *out)
+{
+    *out = rsIsObject(in->element)==false ? 0 : 1;
+}
+
+typedef struct _object_sampler_input {
+    rs_sampler sampler;
+} object_sampler_input;
+
+void is_object_sampler( const object_sampler_input *in, int *out)
+{
+    *out = rsIsObject(in->sampler)==false ? 0 : 1;
+}
+
+typedef struct _object_script_input {
+    rs_script script;
+} object_script_input;
+
+void is_object_script( const object_script_input *in, int *out)
+{
+    *out = rsIsObject(in->script)==false ? 0 : 1;
+}
+
+typedef struct _object_type_input {
+    rs_type type;
+} object_type_input;
+
+void is_object_type( const object_type_input *in, int *out)
+{
+    *out = rsIsObject(in->type)==false ? 0 : 1;
+}
diff --git a/tests/src/android/renderscript/cts/is_object_allocation.rs b/tests/src/android/renderscript/cts/is_object_allocation.rs
deleted file mode 100644
index b99668a4bae..00000000000
--- a/tests/src/android/renderscript/cts/is_object_allocation.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _object_allocation_input {
-    rs_allocation allocation;
-}object_allocation_input;
-
-void root( const object_allocation_input *in, int *out)
-{
-    *out = rsIsObject(in->allocation)==false ? 0 : 1;
-}
diff --git a/tests/src/android/renderscript/cts/is_object_element.rs b/tests/src/android/renderscript/cts/is_object_element.rs
deleted file mode 100644
index cdc04e18de0..00000000000
--- a/tests/src/android/renderscript/cts/is_object_element.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _object_element_input {
-    rs_element element;
-}object_element_input;
-
-void root( const object_element_input *in, int *out)
-{
-    *out = rsIsObject(in->element)==false ? 0 : 1;
-}
diff --git a/tests/src/android/renderscript/cts/is_object_mesh.rs b/tests/src/android/renderscript/cts/is_object_mesh.rs
deleted file mode 100644
index 7e25d044083..00000000000
--- a/tests/src/android/renderscript/cts/is_object_mesh.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _object_mesh_input {
-    rs_mesh mesh;
-}object_mesh_input;
-
-void root( const object_mesh_input *in, int *out)
-{
-    *out = rsIsObject(in->mesh)==false ? 0 : 1;
-}
diff --git a/tests/src/android/renderscript/cts/is_object_sampler.rs b/tests/src/android/renderscript/cts/is_object_sampler.rs
deleted file mode 100644
index 96ac1e2379d..00000000000
--- a/tests/src/android/renderscript/cts/is_object_sampler.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _object_sampler_input {
-    rs_sampler sampler;
-}object_sampler_input;
-
-void root( const object_sampler_input *in, int *out)
-{
-    *out = rsIsObject(in->sampler)==false ? 0 : 1;
-}
diff --git a/tests/src/android/renderscript/cts/is_object_script.rs b/tests/src/android/renderscript/cts/is_object_script.rs
deleted file mode 100644
index 0c632d0d5fb..00000000000
--- a/tests/src/android/renderscript/cts/is_object_script.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _object_script_input {
-    rs_script script;
-}object_script_input;
-
-void root( const object_script_input *in, int *out)
-{
-    *out = rsIsObject(in->script)==false ? 0 : 1;
-}
diff --git a/tests/src/android/renderscript/cts/is_object_type.rs b/tests/src/android/renderscript/cts/is_object_type.rs
deleted file mode 100644
index b55ea15dd81..00000000000
--- a/tests/src/android/renderscript/cts/is_object_type.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _object_type_input {
-    rs_type type;
-}object_type_input;
-
-void root( const object_type_input *in, int *out)
-{
-    *out = rsIsObject(in->type)==false ? 0 : 1;
-}
diff --git a/tests/src/android/renderscript/cts/log10_f32.rs b/tests/src/android/renderscript/cts/log10_f32.rs
index b1f5fd91fb9..dbb5150242d 100644
--- a/tests/src/android/renderscript/cts/log10_f32.rs
+++ b/tests/src/android/renderscript/cts/log10_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void log10_f32_1 (const float* in, float* out) {
+    *out = log10(*in);
+}
+
+void log10_f32_2 (const float2* in, float2* out) {
+    *out = log10(*in);
+}
+
+void log10_f32_3 (const float3* in, float3* out) {
+    *out = log10(*in);
+}
+
+void log10_f32_4 (const float4* in, float4* out) {
     *out = log10(*in);
 }
diff --git a/tests/src/android/renderscript/cts/log10_f32_2.rs b/tests/src/android/renderscript/cts/log10_f32_2.rs
deleted file mode 100644
index 1e3a7fd0612..00000000000
--- a/tests/src/android/renderscript/cts/log10_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = log10(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log10_f32_3.rs b/tests/src/android/renderscript/cts/log10_f32_3.rs
deleted file mode 100644
index 58b2a174b1f..00000000000
--- a/tests/src/android/renderscript/cts/log10_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = log10(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log10_f32_4.rs b/tests/src/android/renderscript/cts/log10_f32_4.rs
deleted file mode 100644
index 82b71b06b90..00000000000
--- a/tests/src/android/renderscript/cts/log10_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = log10(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log1p_f32.rs b/tests/src/android/renderscript/cts/log1p_f32.rs
index d316a16c613..3c725fe71af 100644
--- a/tests/src/android/renderscript/cts/log1p_f32.rs
+++ b/tests/src/android/renderscript/cts/log1p_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void log1p_f32_1 (const float* in, float* out) {
+    *out = log1p(*in);
+}
+
+void log1p_f32_2 (const float2* in, float2* out) {
+    *out = log1p(*in);
+}
+
+void log1p_f32_3 (const float3* in, float3* out) {
+    *out = log1p(*in);
+}
+
+void log1p_f32_4 (const float4* in, float4* out) {
     *out = log1p(*in);
 }
diff --git a/tests/src/android/renderscript/cts/log1p_f32_2.rs b/tests/src/android/renderscript/cts/log1p_f32_2.rs
deleted file mode 100644
index 89657c218b4..00000000000
--- a/tests/src/android/renderscript/cts/log1p_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = log1p(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log1p_f32_3.rs b/tests/src/android/renderscript/cts/log1p_f32_3.rs
deleted file mode 100644
index 243bf0e3c15..00000000000
--- a/tests/src/android/renderscript/cts/log1p_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = log1p(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log1p_f32_4.rs b/tests/src/android/renderscript/cts/log1p_f32_4.rs
deleted file mode 100644
index c0b35913ca2..00000000000
--- a/tests/src/android/renderscript/cts/log1p_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = log1p(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log2_f32.rs b/tests/src/android/renderscript/cts/log2_f32.rs
index 5455c8443f8..2ed2b98a9e5 100644
--- a/tests/src/android/renderscript/cts/log2_f32.rs
+++ b/tests/src/android/renderscript/cts/log2_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void log2_f32_1 (const float* in, float* out) {
+    *out = log2(*in);
+}
+
+void log2_f32_2 (const float2* in, float2* out) {
+    *out = log2(*in);
+}
+
+void log2_f32_3 (const float3* in, float3* out) {
+    *out = log2(*in);
+}
+
+void log2_f32_4 (const float4* in, float4* out) {
     *out = log2(*in);
 }
diff --git a/tests/src/android/renderscript/cts/log2_f32_2.rs b/tests/src/android/renderscript/cts/log2_f32_2.rs
deleted file mode 100644
index 9650fa32d02..00000000000
--- a/tests/src/android/renderscript/cts/log2_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = log2(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log2_f32_3.rs b/tests/src/android/renderscript/cts/log2_f32_3.rs
deleted file mode 100644
index 6ab88479852..00000000000
--- a/tests/src/android/renderscript/cts/log2_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = log2(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log2_f32_4.rs b/tests/src/android/renderscript/cts/log2_f32_4.rs
deleted file mode 100644
index 6807fbba85c..00000000000
--- a/tests/src/android/renderscript/cts/log2_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = log2(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log_f32.rs b/tests/src/android/renderscript/cts/log_f32.rs
index 8b00f7bbb83..14052a2e7b6 100644
--- a/tests/src/android/renderscript/cts/log_f32.rs
+++ b/tests/src/android/renderscript/cts/log_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void log_f32_1 (const float* in, float* out) {
+    *out = log(*in);
+}
+
+void log_f32_2 (const float2* in, float2* out) {
+    *out = log(*in);
+}
+
+void log_f32_3 (const float3* in, float3* out) {
+    *out = log(*in);
+}
+
+void log_f32_4 (const float4* in, float4* out) {
     *out = log(*in);
 }
diff --git a/tests/src/android/renderscript/cts/log_f32_2.rs b/tests/src/android/renderscript/cts/log_f32_2.rs
deleted file mode 100644
index 3d1864a8130..00000000000
--- a/tests/src/android/renderscript/cts/log_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = log(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log_f32_3.rs b/tests/src/android/renderscript/cts/log_f32_3.rs
deleted file mode 100644
index 6d7e389c40f..00000000000
--- a/tests/src/android/renderscript/cts/log_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = log(*in);
-}
diff --git a/tests/src/android/renderscript/cts/log_f32_4.rs b/tests/src/android/renderscript/cts/log_f32_4.rs
deleted file mode 100644
index a3cbe8e61aa..00000000000
--- a/tests/src/android/renderscript/cts/log_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = log(*in);
-}
diff --git a/tests/src/android/renderscript/cts/logb_f32.rs b/tests/src/android/renderscript/cts/logb_f32.rs
index b29f86cdb4e..1b3acfa1064 100644
--- a/tests/src/android/renderscript/cts/logb_f32.rs
+++ b/tests/src/android/renderscript/cts/logb_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void logb_f32_1 (const float* in, float* out) {
+    *out = logb(*in);
+}
+
+void logb_f32_2 (const float2* in, float2* out) {
+    *out = logb(*in);
+}
+
+void logb_f32_3 (const float3* in, float3* out) {
+    *out = logb(*in);
+}
+
+void logb_f32_4 (const float4* in, float4* out) {
     *out = logb(*in);
 }
diff --git a/tests/src/android/renderscript/cts/logb_f32_2.rs b/tests/src/android/renderscript/cts/logb_f32_2.rs
deleted file mode 100644
index ef0f9484a36..00000000000
--- a/tests/src/android/renderscript/cts/logb_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = logb(*in);
-}
diff --git a/tests/src/android/renderscript/cts/logb_f32_3.rs b/tests/src/android/renderscript/cts/logb_f32_3.rs
deleted file mode 100644
index 15d14c94117..00000000000
--- a/tests/src/android/renderscript/cts/logb_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = logb(*in);
-}
diff --git a/tests/src/android/renderscript/cts/logb_f32_4.rs b/tests/src/android/renderscript/cts/logb_f32_4.rs
deleted file mode 100644
index 7e2e24ad3ef..00000000000
--- a/tests/src/android/renderscript/cts/logb_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = logb(*in);
-}
diff --git a/tests/src/android/renderscript/cts/mad_f32.rs b/tests/src/android/renderscript/cts/mad_f32.rs
index fdf868003ab..fc5081b2fe0 100644
--- a/tests/src/android/renderscript/cts/mad_f32.rs
+++ b/tests/src/android/renderscript/cts/mad_f32.rs
@@ -7,6 +7,36 @@ struct mad_input_f32 {
     float z;
 };
 
-void root(const struct mad_input_f32 *param, float *out) {
+void mad_f32_1(const struct mad_input_f32 *param, float *out) {
+    *out = mad(param->x, param->y, param->z);
+}
+
+struct mad_input_f32_2 {
+    float2 x;
+    float2 y;
+    float2 z;
+};
+
+void mad_f32_2(const struct mad_input_f32_2 *param, float2 *out) {
+    *out = mad(param->x, param->y, param->z);
+}
+
+struct mad_input_f32_3 {
+    float3 x;
+    float3 y;
+    float3 z;
+};
+
+void mad_f32_3(const struct mad_input_f32_3 *param, float3 *out) {
+    *out = mad(param->x, param->y, param->z);
+}
+
+struct mad_input_f32_4 {
+    float4 x;
+    float4 y;
+    float4 z;
+};
+
+void mad_f32_4(const struct mad_input_f32_4 *param, float4 *out) {
     *out = mad(param->x, param->y, param->z);
 }
diff --git a/tests/src/android/renderscript/cts/mad_f32_2.rs b/tests/src/android/renderscript/cts/mad_f32_2.rs
deleted file mode 100644
index 16c8b25267c..00000000000
--- a/tests/src/android/renderscript/cts/mad_f32_2.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct mad_input_f32_2 {
-    float2 x;
-    float2 y;
-    float2 z;
-};
-
-void root(const struct mad_input_f32_2 *param, float2 *out) {
-    *out = mad(param->x, param->y, param->z);
-}
diff --git a/tests/src/android/renderscript/cts/mad_f32_3.rs b/tests/src/android/renderscript/cts/mad_f32_3.rs
deleted file mode 100644
index d386238a59d..00000000000
--- a/tests/src/android/renderscript/cts/mad_f32_3.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct mad_input_f32_3 {
-    float3 x;
-    float3 y;
-    float3 z;
-};
-
-void root(const struct mad_input_f32_3 *param, float3 *out) {
-    *out = mad(param->x, param->y, param->z);
-}
diff --git a/tests/src/android/renderscript/cts/mad_f32_4.rs b/tests/src/android/renderscript/cts/mad_f32_4.rs
deleted file mode 100644
index d81cdd2cd1b..00000000000
--- a/tests/src/android/renderscript/cts/mad_f32_4.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct mad_input_f32_4 {
-    float4 x;
-    float4 y;
-    float4 z;
-};
-
-void root(const struct mad_input_f32_4 *param, float4 *out) {
-    *out = mad(param->x, param->y, param->z);
-}
diff --git a/tests/src/android/renderscript/cts/nextafter_f32.rs b/tests/src/android/renderscript/cts/nextafter_f32.rs
index 042d48bcadb..04ce73a49e1 100644
--- a/tests/src/android/renderscript/cts/nextafter_f32.rs
+++ b/tests/src/android/renderscript/cts/nextafter_f32.rs
@@ -6,6 +6,33 @@ typedef struct InputData {
     float b;
 } InputData;
 
-void root(const InputData *in, float *out) {
+void nextafter_f32_1(const InputData *in, float *out) {
+    *out = nextafter (in->a, in->b);
+}
+
+typedef struct InputData_2 {
+    float2 a;
+    float2 b;
+} InputData_2;
+
+void nextafter_f32_2(const InputData_2 *in, float2 *out) {
+    *out = nextafter (in->a, in->b);
+}
+
+typedef struct InputData_3 {
+    float3 a;
+    float3 b;
+} InputData_3;
+
+void nextafter_f32_3(const InputData_3 *in, float3 *out) {
+    *out = nextafter (in->a, in->b);
+}
+
+typedef struct InputData_4 {
+    float4 a;
+    float4 b;
+} InputData_4;
+
+void nextafter_f32_4(const InputData_4 *in, float4 *out) {
     *out = nextafter (in->a, in->b);
 }
diff --git a/tests/src/android/renderscript/cts/nextafter_f32_2.rs b/tests/src/android/renderscript/cts/nextafter_f32_2.rs
deleted file mode 100644
index 529aafe9bac..00000000000
--- a/tests/src/android/renderscript/cts/nextafter_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct InputData_2 {
-    float2 a;
-    float2 b;
-} InputData_2;
-
-void root(const InputData_2 *in, float2 *out) {
-    *out = nextafter (in->a, in->b);
-}
diff --git a/tests/src/android/renderscript/cts/nextafter_f32_3.rs b/tests/src/android/renderscript/cts/nextafter_f32_3.rs
deleted file mode 100644
index 9c457bc02bc..00000000000
--- a/tests/src/android/renderscript/cts/nextafter_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct InputData_3 {
-    float3 a;
-    float3 b;
-} InputData_3;
-
-void root(const InputData_3 *in, float3 *out) {
-    *out = nextafter (in->a, in->b);
-}
diff --git a/tests/src/android/renderscript/cts/nextafter_f32_4.rs b/tests/src/android/renderscript/cts/nextafter_f32_4.rs
deleted file mode 100644
index 0fc1edbacab..00000000000
--- a/tests/src/android/renderscript/cts/nextafter_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct InputData_4 {
-    float4 a;
-    float4 b;
-} InputData_4;
-
-void root(const InputData_4 *in, float4 *out) {
-    *out = nextafter (in->a, in->b);
-}
diff --git a/tests/src/android/renderscript/cts/pow_f32.rs b/tests/src/android/renderscript/cts/pow_f32.rs
index c05095e8707..426d4b1ff40 100644
--- a/tests/src/android/renderscript/cts/pow_f32.rs
+++ b/tests/src/android/renderscript/cts/pow_f32.rs
@@ -6,6 +6,33 @@ typedef struct PowInputData {
     float expo;
 } PowInputData;
 
-void root(const PowInputData *in, float *out) {
+void pow_f32_1(const PowInputData *in, float *out) {
+    *out = pow(in->base, in->expo);
+}
+
+typedef struct PowInputData_2 {
+    float2 base;
+    float2 expo;
+} PowInputData_2;
+
+void pow_f32_2(const PowInputData_2 *in, float2 *out) {
+    *out = pow(in->base, in->expo);
+}
+
+typedef struct PowInputData_3 {
+    float3 base;
+    float3 expo;
+} PowInputData_3;
+
+void pow_f32_3(const PowInputData_3 *in, float3 *out) {
+    *out = pow(in->base, in->expo);
+}
+
+typedef struct PowInputData_4 {
+    float4 base;
+    float4 expo;
+} PowInputData_4;
+
+void pow_f32_4(const PowInputData_4 *in, float4 *out) {
     *out = pow(in->base, in->expo);
 }
diff --git a/tests/src/android/renderscript/cts/pow_f32_2.rs b/tests/src/android/renderscript/cts/pow_f32_2.rs
deleted file mode 100644
index 1d696c393f2..00000000000
--- a/tests/src/android/renderscript/cts/pow_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct PowInputData_2 {
-    float2 base;
-    float2 expo;
-} PowInputData_2;
-
-void root(const PowInputData_2 *in, float2 *out) {
-    *out = pow(in->base, in->expo);
-}
diff --git a/tests/src/android/renderscript/cts/pow_f32_3.rs b/tests/src/android/renderscript/cts/pow_f32_3.rs
deleted file mode 100644
index 02210eb1ec9..00000000000
--- a/tests/src/android/renderscript/cts/pow_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct PowInputData_3 {
-    float3 base;
-    float3 expo;
-} PowInputData_3;
-
-void root(const PowInputData_3 *in, float3 *out) {
-    *out = pow(in->base, in->expo);
-}
diff --git a/tests/src/android/renderscript/cts/pow_f32_4.rs b/tests/src/android/renderscript/cts/pow_f32_4.rs
deleted file mode 100644
index f0201844209..00000000000
--- a/tests/src/android/renderscript/cts/pow_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct PowInputData_4 {
-    float4 base;
-    float4 expo;
-} PowInputData_4;
-
-void root(const PowInputData_4 *in, float4 *out) {
-    *out = pow(in->base, in->expo);
-}
diff --git a/tests/src/android/renderscript/cts/pown_f32.rs b/tests/src/android/renderscript/cts/pown_f32.rs
index e9bf8d244b1..fa066d095dc 100644
--- a/tests/src/android/renderscript/cts/pown_f32.rs
+++ b/tests/src/android/renderscript/cts/pown_f32.rs
@@ -1,8 +1,26 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-rs_allocation n;
+rs_allocation n1;
 
-void root(const float *in, float *out, uint32_t x) {
-    *out = pown(*in, *(int *)rsGetElementAt(n,x));
+void pown_f32_1(const float *in, float *out, uint32_t x) {
+    *out = pown(*in, *(int *)rsGetElementAt(n1,x));
+}
+
+rs_allocation n2;
+
+void pown_f32_2(const float2 *in, float2 *out, uint32_t x) {
+    *out = pown(*in, *(int2 *)rsGetElementAt(n2,x));
+}
+
+rs_allocation n3;
+
+void pown_f32_3(const float3 *in, float3 *out, uint32_t x) {
+    *out = pown(*in, *(int3 *)rsGetElementAt(n3,x));
+}
+
+rs_allocation n4;
+
+void pown_f32_4(const float4 *in, float4 *out, uint32_t x) {
+    *out = pown(*in, *(int4 *)rsGetElementAt(n4,x));
 }
diff --git a/tests/src/android/renderscript/cts/pown_f32_2.rs b/tests/src/android/renderscript/cts/pown_f32_2.rs
deleted file mode 100644
index ebf41a8ed92..00000000000
--- a/tests/src/android/renderscript/cts/pown_f32_2.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_allocation n;
-
-void root(const float2 *in, float2 *out, uint32_t x) {
-    *out = pown(*in, *(int2 *)rsGetElementAt(n,x));
-}
diff --git a/tests/src/android/renderscript/cts/pown_f32_3.rs b/tests/src/android/renderscript/cts/pown_f32_3.rs
deleted file mode 100644
index a386666ddcd..00000000000
--- a/tests/src/android/renderscript/cts/pown_f32_3.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_allocation n;
-
-void root(const float3 *in, float3 *out, uint32_t x) {
-    *out = pown(*in, *(int3 *)rsGetElementAt(n,x));
-}
diff --git a/tests/src/android/renderscript/cts/pown_f32_4.rs b/tests/src/android/renderscript/cts/pown_f32_4.rs
deleted file mode 100644
index b9f416ea04b..00000000000
--- a/tests/src/android/renderscript/cts/pown_f32_4.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_allocation n;
-
-void root(const float4 *in, float4 *out, uint32_t x) {
-    *out = pown(*in, *(int4 *)rsGetElementAt(n,x));
-}
diff --git a/tests/src/android/renderscript/cts/powr_f32.rs b/tests/src/android/renderscript/cts/powr_f32.rs
index c2c217f5705..6eb36b0c980 100644
--- a/tests/src/android/renderscript/cts/powr_f32.rs
+++ b/tests/src/android/renderscript/cts/powr_f32.rs
@@ -6,6 +6,33 @@ typedef struct PowInputData {
     float expo;
 } PowInputData;
 
-void root(const PowInputData *in, float *out) {
+void powr_f32_1(const PowInputData *in, float *out) {
+    *out = powr(in->base, in->expo);
+}
+
+typedef struct PowInputData_2 {
+    float2 base;
+    float2 expo;
+} PowInputData_2;
+
+void powr_f32_2(const PowInputData_2 *in, float2 *out) {
+    *out = powr(in->base, in->expo);
+}
+
+typedef struct PowInputData_3 {
+    float3 base;
+    float3 expo;
+} PowInputData_3;
+
+void powr_f32_3(const PowInputData_3 *in, float3 *out) {
+    *out = powr(in->base, in->expo);
+}
+
+typedef struct PowInputData_4 {
+    float4 base;
+    float4 expo;
+} PowInputData_4;
+
+void powr_f32_4(const PowInputData_4 *in, float4 *out) {
     *out = powr(in->base, in->expo);
 }
diff --git a/tests/src/android/renderscript/cts/powr_f32_2.rs b/tests/src/android/renderscript/cts/powr_f32_2.rs
deleted file mode 100644
index cdd7699cfba..00000000000
--- a/tests/src/android/renderscript/cts/powr_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct PowInputData_2 {
-    float2 base;
-    float2 expo;
-} PowInputData_2;
-
-void root(const PowInputData_2 *in, float2 *out) {
-    *out = powr(in->base, in->expo);
-}
diff --git a/tests/src/android/renderscript/cts/powr_f32_3.rs b/tests/src/android/renderscript/cts/powr_f32_3.rs
deleted file mode 100644
index 28957b4e273..00000000000
--- a/tests/src/android/renderscript/cts/powr_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct PowInputData_3 {
-    float3 base;
-    float3 expo;
-} PowInputData_3;
-
-void root(const PowInputData_3 *in, float3 *out) {
-    *out = powr(in->base, in->expo);
-}
diff --git a/tests/src/android/renderscript/cts/powr_f32_4.rs b/tests/src/android/renderscript/cts/powr_f32_4.rs
deleted file mode 100644
index eedc6744085..00000000000
--- a/tests/src/android/renderscript/cts/powr_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct PowInputData_4 {
-    float4 base;
-    float4 expo;
-} PowInputData_4;
-
-void root(const PowInputData_4 *in, float4 *out) {
-    *out = powr(in->base, in->expo);
-}
diff --git a/tests/src/android/renderscript/cts/rad_f32.rs b/tests/src/android/renderscript/cts/rad_f32.rs
deleted file mode 100644
index 4bea9057f52..00000000000
--- a/tests/src/android/renderscript/cts/rad_f32.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float* in, float* out) {
-    *out = radians (*in);
-}
diff --git a/tests/src/android/renderscript/cts/rad_f32_2.rs b/tests/src/android/renderscript/cts/rad_f32_2.rs
deleted file mode 100644
index c7a7048c136..00000000000
--- a/tests/src/android/renderscript/cts/rad_f32_2.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-
-void root(const float2* in, float2* out) {
-    *out = radians(*in);
-}
diff --git a/tests/src/android/renderscript/cts/rad_f32_3.rs b/tests/src/android/renderscript/cts/rad_f32_3.rs
deleted file mode 100644
index e16c7faffa5..00000000000
--- a/tests/src/android/renderscript/cts/rad_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3* in, float3* out) {
-    *out = radians(*in);
-}
diff --git a/tests/src/android/renderscript/cts/rad_f32_4.rs b/tests/src/android/renderscript/cts/rad_f32_4.rs
deleted file mode 100644
index 1224e52cc76..00000000000
--- a/tests/src/android/renderscript/cts/rad_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4* in, float4* out) {
-    *out = radians(*in);
-}
diff --git a/tests/src/android/renderscript/cts/radians_f32.rs b/tests/src/android/renderscript/cts/radians_f32.rs
new file mode 100644
index 00000000000..1aa743e1b6a
--- /dev/null
+++ b/tests/src/android/renderscript/cts/radians_f32.rs
@@ -0,0 +1,18 @@
+#pragma version(1)
+#pragma rs java_package_name(android.renderscript.cts)
+
+void radians_f32_1(const float* in, float* out) {
+    *out = radians (*in);
+}
+
+void radians_f32_2(const float2* in, float2* out) {
+    *out = radians(*in);
+}
+
+void radians_f32_3(const float3* in, float3* out) {
+    *out = radians(*in);
+}
+
+void radians_f32_4(const float4* in, float4* out) {
+    *out = radians(*in);
+}
diff --git a/tests/src/android/renderscript/cts/remainder_f32.rs b/tests/src/android/renderscript/cts/remainder_f32.rs
index 4886fb300b5..d08a0345974 100644
--- a/tests/src/android/renderscript/cts/remainder_f32.rs
+++ b/tests/src/android/renderscript/cts/remainder_f32.rs
@@ -6,6 +6,33 @@ struct remainder_f32 {
     float den;
 };
 
-void root (const struct remainder_f32* in, float* out) {
+void remainder_f32_1 (const struct remainder_f32* in, float* out) {
+    *out = remainder(in->num, in->den);
+}
+
+struct remainder_f32_2 {
+    float2 num;
+    float2 den;
+};
+
+void remainder_f32_2 (const struct remainder_f32_2* in, float2* out) {
+    *out = remainder(in->num, in->den);
+}
+
+struct remainder_f32_3 {
+    float3 num;
+    float3 den;
+};
+
+void remainder_f32_3 (const struct remainder_f32_3* in, float3* out) {
+    *out = remainder(in->num, in->den);
+}
+
+struct remainder_f32_4 {
+    float4 num;
+    float4 den;
+};
+
+void remainder_f32_4 (const struct remainder_f32_4* in, float4* out) {
     *out = remainder(in->num, in->den);
 }
diff --git a/tests/src/android/renderscript/cts/remainder_f32_2.rs b/tests/src/android/renderscript/cts/remainder_f32_2.rs
deleted file mode 100644
index 95808175183..00000000000
--- a/tests/src/android/renderscript/cts/remainder_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct remainder_f32_2 {
-    float2 num;
-    float2 den;
-};
-
-void root (const struct remainder_f32_2* in, float2* out) {
-    *out = remainder(in->num, in->den);
-}
diff --git a/tests/src/android/renderscript/cts/remainder_f32_3.rs b/tests/src/android/renderscript/cts/remainder_f32_3.rs
deleted file mode 100644
index beb2ca809ae..00000000000
--- a/tests/src/android/renderscript/cts/remainder_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct remainder_f32_3 {
-    float3 num;
-    float3 den;
-};
-
-void root (const struct remainder_f32_3* in, float3* out) {
-    *out = remainder(in->num, in->den);
-}
diff --git a/tests/src/android/renderscript/cts/remainder_f32_4.rs b/tests/src/android/renderscript/cts/remainder_f32_4.rs
deleted file mode 100644
index 1118fc2291b..00000000000
--- a/tests/src/android/renderscript/cts/remainder_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct remainder_f32_4 {
-    float4 num;
-    float4 den;
-};
-
-void root (const struct remainder_f32_4* in, float4* out) {
-    *out = remainder(in->num, in->den);
-}
diff --git a/tests/src/android/renderscript/cts/rint_f32.rs b/tests/src/android/renderscript/cts/rint_f32.rs
index 9d52d171743..46ef8b1feb4 100644
--- a/tests/src/android/renderscript/cts/rint_f32.rs
+++ b/tests/src/android/renderscript/cts/rint_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void rint_f32_1 (const float* in, float* out) {
+    *out = rint(*in);
+}
+
+void rint_f32_2 (const float2* in, float2* out) {
+    *out = rint(*in);
+}
+
+void rint_f32_3 (const float3* in, float3* out) {
+    *out = rint(*in);
+}
+
+void rint_f32_4 (const float4* in, float4* out) {
     *out = rint(*in);
 }
diff --git a/tests/src/android/renderscript/cts/rint_f32_2.rs b/tests/src/android/renderscript/cts/rint_f32_2.rs
deleted file mode 100644
index 371f8cae5bb..00000000000
--- a/tests/src/android/renderscript/cts/rint_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = rint(*in);
-}
diff --git a/tests/src/android/renderscript/cts/rint_f32_3.rs b/tests/src/android/renderscript/cts/rint_f32_3.rs
deleted file mode 100644
index df3b240fd26..00000000000
--- a/tests/src/android/renderscript/cts/rint_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = rint(*in);
-}
diff --git a/tests/src/android/renderscript/cts/rint_f32_4.rs b/tests/src/android/renderscript/cts/rint_f32_4.rs
deleted file mode 100644
index 02d1eab4cf9..00000000000
--- a/tests/src/android/renderscript/cts/rint_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = rint(*in);
-}
diff --git a/tests/src/android/renderscript/cts/rootn_f32.rs b/tests/src/android/renderscript/cts/rootn_f32.rs
index f734c1d1c12..1c60ea91270 100644
--- a/tests/src/android/renderscript/cts/rootn_f32.rs
+++ b/tests/src/android/renderscript/cts/rootn_f32.rs
@@ -1,8 +1,26 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-rs_allocation n;
+rs_allocation n1;
 
-void root(const float *in, float *out, uint32_t x) {
-    *out = rootn(*in, *(int *)rsGetElementAt(n,x));
+void rootn_f32_1(const float *in, float *out, uint32_t x) {
+    *out = rootn(*in, *(int *)rsGetElementAt(n1,x));
+}
+
+rs_allocation n2;
+
+void rootn_f32_2(const float2 *in, float2 *out, uint32_t x) {
+    *out = rootn(*in, *(int2 *)rsGetElementAt(n2,x));
+}
+
+rs_allocation n3;
+
+void rootn_f32_3(const float3 *in, float3 *out, uint32_t x) {
+    *out = rootn(*in, *(int3 *)rsGetElementAt(n3,x));
+}
+
+rs_allocation n4;
+
+void rootn_f32_4(const float4 *in, float4 *out, uint32_t x) {
+    *out = rootn(*in, *(int4 *)rsGetElementAt(n4,x));
 }
diff --git a/tests/src/android/renderscript/cts/rootn_f32_2.rs b/tests/src/android/renderscript/cts/rootn_f32_2.rs
deleted file mode 100644
index d31c179091d..00000000000
--- a/tests/src/android/renderscript/cts/rootn_f32_2.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_allocation n;
-
-void root(const float2 *in, float2 *out, uint32_t x) {
-    *out = rootn(*in, *(int2 *)rsGetElementAt(n,x));
-}
diff --git a/tests/src/android/renderscript/cts/rootn_f32_3.rs b/tests/src/android/renderscript/cts/rootn_f32_3.rs
deleted file mode 100644
index 7c6c9c9cae5..00000000000
--- a/tests/src/android/renderscript/cts/rootn_f32_3.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_allocation n;
-
-void root(const float3 *in, float3 *out, uint32_t x) {
-    *out = rootn(*in, *(int3 *)rsGetElementAt(n,x));
-}
diff --git a/tests/src/android/renderscript/cts/rootn_f32_4.rs b/tests/src/android/renderscript/cts/rootn_f32_4.rs
deleted file mode 100644
index cdf6c109449..00000000000
--- a/tests/src/android/renderscript/cts/rootn_f32_4.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-rs_allocation n;
-
-void root(const float4 *in, float4 *out, uint32_t x) {
-    *out = rootn(*in, *(int4 *)rsGetElementAt(n,x));
-}
diff --git a/tests/src/android/renderscript/cts/round_f32.rs b/tests/src/android/renderscript/cts/round_f32.rs
index e06ad5c0d28..60b5e8d2a40 100644
--- a/tests/src/android/renderscript/cts/round_f32.rs
+++ b/tests/src/android/renderscript/cts/round_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void round_f32_1 (const float* in, float* out) {
+    *out = round(*in);
+}
+
+void round_f32_2 (const float2* in , float2* out) {
+    *out = round(*in);
+}
+
+void round_f32_3 (const float3* in, float3* out) {
+    *out = round(*in);
+}
+
+void round_f32_4 (const float4* in , float4* out) {
     *out = round(*in);
 }
diff --git a/tests/src/android/renderscript/cts/round_f32_2.rs b/tests/src/android/renderscript/cts/round_f32_2.rs
deleted file mode 100644
index cb8ea971ac4..00000000000
--- a/tests/src/android/renderscript/cts/round_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in , float2* out) {
-    *out = round(*in);
-}
diff --git a/tests/src/android/renderscript/cts/round_f32_3.rs b/tests/src/android/renderscript/cts/round_f32_3.rs
deleted file mode 100644
index 421b1d409b3..00000000000
--- a/tests/src/android/renderscript/cts/round_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = round(*in);
-}
diff --git a/tests/src/android/renderscript/cts/round_f32_4.rs b/tests/src/android/renderscript/cts/round_f32_4.rs
deleted file mode 100644
index 55c36e12724..00000000000
--- a/tests/src/android/renderscript/cts/round_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in , float4* out) {
-    *out = round(*in);
-}
diff --git a/tests/src/android/renderscript/cts/rs_pack_color_to_8888.rs b/tests/src/android/renderscript/cts/rs_pack_color_to_8888.rs
new file mode 100644
index 00000000000..415e2df9175
--- /dev/null
+++ b/tests/src/android/renderscript/cts/rs_pack_color_to_8888.rs
@@ -0,0 +1,17 @@
+#pragma version(1)
+#pragma rs java_package_name(android.renderscript.cts)
+
+void pack_color_to_8888_rgb (const float3* in, uchar4* out) {
+    *out = rsPackColorTo8888(in->r, in->g, in->b);
+}
+
+void pack_color_to_8888_rgba (const float4* in, uchar4* out) {
+    *out = rsPackColorTo8888(in->r, in->g, in->b, in->a);
+}
+void pack_color_to_8888_f32_3 (const float3* in, uchar4* out) {
+    *out = rsPackColorTo8888(*in);
+}
+
+void pack_color_to_8888_f32_4 (const float4* in, uchar4* out) {
+    *out = rsPackColorTo8888(*in);
+}
diff --git a/tests/src/android/renderscript/cts/rs_pack_color_to_8888_f32_3.rs b/tests/src/android/renderscript/cts/rs_pack_color_to_8888_f32_3.rs
deleted file mode 100644
index 76a01358665..00000000000
--- a/tests/src/android/renderscript/cts/rs_pack_color_to_8888_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, uchar4* out) {
-    *out = rsPackColorTo8888(*in);
-}
diff --git a/tests/src/android/renderscript/cts/rs_pack_color_to_8888_f32_4.rs b/tests/src/android/renderscript/cts/rs_pack_color_to_8888_f32_4.rs
deleted file mode 100644
index 1d2d71b8661..00000000000
--- a/tests/src/android/renderscript/cts/rs_pack_color_to_8888_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, uchar4* out) {
-    *out = rsPackColorTo8888(*in);
-}
diff --git a/tests/src/android/renderscript/cts/rs_pack_color_to_8888_rgb.rs b/tests/src/android/renderscript/cts/rs_pack_color_to_8888_rgb.rs
deleted file mode 100644
index 1639e61f2b4..00000000000
--- a/tests/src/android/renderscript/cts/rs_pack_color_to_8888_rgb.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, uchar4* out) {
-    *out = rsPackColorTo8888(in->r, in->g, in->b);
-}
diff --git a/tests/src/android/renderscript/cts/rs_pack_color_to_8888_rgba.rs b/tests/src/android/renderscript/cts/rs_pack_color_to_8888_rgba.rs
deleted file mode 100644
index 64e7886df67..00000000000
--- a/tests/src/android/renderscript/cts/rs_pack_color_to_8888_rgba.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, uchar4* out) {
-    *out = rsPackColorTo8888(in->r, in->g, in->b, in->a);
-}
diff --git a/tests/src/android/renderscript/cts/rsqrt_f32.rs b/tests/src/android/renderscript/cts/rsqrt_f32.rs
index 2db534a6b96..1e8f5a2c311 100644
--- a/tests/src/android/renderscript/cts/rsqrt_f32.rs
+++ b/tests/src/android/renderscript/cts/rsqrt_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void Rsqrt_f32_1 (const float* in, float* out) {
+    *out = rsqrt(*in);
+}
+
+void Rsqrt_f32_2 (const float2* in, float2* out) {
+    *out = rsqrt(*in);
+}
+
+void Rsqrt_f32_3 (const float3* in, float3* out) {
+    *out = rsqrt(*in);
+}
+
+void Rsqrt_f32_4 (const float4* in, float4* out) {
     *out = rsqrt(*in);
 }
diff --git a/tests/src/android/renderscript/cts/rsqrt_f32_2.rs b/tests/src/android/renderscript/cts/rsqrt_f32_2.rs
deleted file mode 100644
index 549bd6af5e6..00000000000
--- a/tests/src/android/renderscript/cts/rsqrt_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = rsqrt(*in);
-}
diff --git a/tests/src/android/renderscript/cts/rsqrt_f32_3.rs b/tests/src/android/renderscript/cts/rsqrt_f32_3.rs
deleted file mode 100644
index 847112a61e8..00000000000
--- a/tests/src/android/renderscript/cts/rsqrt_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = rsqrt(*in);
-}
diff --git a/tests/src/android/renderscript/cts/rsqrt_f32_4.rs b/tests/src/android/renderscript/cts/rsqrt_f32_4.rs
deleted file mode 100644
index 54587cd989a..00000000000
--- a/tests/src/android/renderscript/cts/rsqrt_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = rsqrt(*in);
-}
diff --git a/tests/src/android/renderscript/cts/set_object.rs b/tests/src/android/renderscript/cts/set_object.rs
new file mode 100644
index 00000000000..6a7ba953ab6
--- /dev/null
+++ b/tests/src/android/renderscript/cts/set_object.rs
@@ -0,0 +1,57 @@
+#pragma version(1)
+#pragma rs java_package_name(android.renderscript.cts)
+
+typedef struct _set_object_allocation_input {
+    rs_allocation allocation;
+} set_object_allocation_input;
+
+void set_object_allocation(const set_object_allocation_input *in, int *out)
+{
+    rs_allocation dst;
+    rsSetObject(&dst,in->allocation);
+    *out = ( dst.p == in->allocation.p ? 1 : 0 );
+}
+
+typedef struct _set_object_element_input {
+    rs_element element;
+} set_object_element_input;
+
+void set_object_element(const set_object_element_input *in, int *out)
+{
+    rs_element dst;
+    rsSetObject(&dst,in->element);
+    *out = ( dst.p == in->element.p ? 1 : 0 );
+}
+
+typedef struct _set_object_sampler_input {
+    rs_sampler sampler;
+} set_object_sampler_input;
+
+void set_object_sampler(const set_object_sampler_input *in, int *out)
+{
+    rs_sampler dst;
+    rsSetObject(&dst,in->sampler);
+    *out = ( dst.p == in->sampler.p ? 1 : 0 );
+}
+
+typedef struct _set_object_script_input {
+    rs_script script;
+} set_object_script_input;
+
+void set_object_script(const set_object_script_input *in, int *out)
+{
+    rs_script dst;
+    rsSetObject(&dst,in->script);
+    *out = ( dst.p == in->script.p ? 1 : 0 );
+}
+
+typedef struct _set_object_type_input {
+    rs_type type;
+} set_object_type_input;
+
+void set_object_type(const set_object_type_input *in, int *out)
+{
+    rs_type dst;
+    rsSetObject(&dst,in->type);
+    *out = ( dst.p == in->type.p ? 1 : 0 );
+}
diff --git a/tests/src/android/renderscript/cts/set_object_allocation.rs b/tests/src/android/renderscript/cts/set_object_allocation.rs
deleted file mode 100644
index 6d2dd1dcdc0..00000000000
--- a/tests/src/android/renderscript/cts/set_object_allocation.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _set_object_allocation_input {
-    rs_allocation allocation;
-}set_object_allocation_input;
-
-void root( const set_object_allocation_input *in, int *out)
-{
-    rs_allocation dst;
-    rsSetObject(&dst,in->allocation);
-    *out = ( dst.p == in->allocation.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/set_object_element.rs b/tests/src/android/renderscript/cts/set_object_element.rs
deleted file mode 100644
index 6f21ebe39b1..00000000000
--- a/tests/src/android/renderscript/cts/set_object_element.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _set_object_element_input {
-    rs_element element;
-}set_object_element_input;
-
-void root( const set_object_element_input *in, int *out)
-{
-    rs_element dst;
-    rsSetObject(&dst,in->element);
-    *out = ( dst.p == in->element.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/set_object_mesh.rs b/tests/src/android/renderscript/cts/set_object_mesh.rs
deleted file mode 100644
index 584b0e68e65..00000000000
--- a/tests/src/android/renderscript/cts/set_object_mesh.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _set_object_mesh_input {
-    rs_mesh mesh;
-}set_object_mesh_input;
-
-void root( const set_object_mesh_input *in, int *out)
-{
-    rs_mesh dst;
-    rsSetObject(&dst,in->mesh);
-    *out = ( dst.p == in->mesh.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/set_object_sampler.rs b/tests/src/android/renderscript/cts/set_object_sampler.rs
deleted file mode 100644
index 6ea201b3f1a..00000000000
--- a/tests/src/android/renderscript/cts/set_object_sampler.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _set_object_sampler_input {
-    rs_sampler sampler;
-}set_object_sampler_input;
-
-void root( const set_object_sampler_input *in, int *out)
-{
-    rs_sampler dst;
-    rsSetObject(&dst,in->sampler);
-    *out = ( dst.p == in->sampler.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/set_object_script.rs b/tests/src/android/renderscript/cts/set_object_script.rs
deleted file mode 100644
index 2f5703e531b..00000000000
--- a/tests/src/android/renderscript/cts/set_object_script.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _set_object_script_input {
-    rs_script script;
-}set_object_script_input;
-
-void root( const set_object_script_input *in, int *out)
-{
-    rs_script dst;
-    rsSetObject(&dst,in->script);
-    *out = ( dst.p == in->script.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/set_object_type.rs b/tests/src/android/renderscript/cts/set_object_type.rs
deleted file mode 100644
index 704cc620c7a..00000000000
--- a/tests/src/android/renderscript/cts/set_object_type.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-typedef struct _set_object_type_input {
-    rs_type type;
-}set_object_type_input;
-
-void root( const set_object_type_input *in, int *out)
-{
-    rs_type dst;
-    rsSetObject(&dst,in->type);
-    *out = ( dst.p == in->type.p ? 1 : 0 );
-}
diff --git a/tests/src/android/renderscript/cts/sign_f32.rs b/tests/src/android/renderscript/cts/sign_f32.rs
index 29540538175..f9edb90827f 100644
--- a/tests/src/android/renderscript/cts/sign_f32.rs
+++ b/tests/src/android/renderscript/cts/sign_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root(const float *in, float *out) {
+void sign_f32_1(const float *in, float *out) {
+    *out = sign (*in);
+}
+
+void sign_f32_2(const float2 *in, float2 *out) {
+    *out = sign (*in);
+}
+
+void sign_f32_3(const float3 *in, float3 *out) {
+    *out = sign (*in);
+}
+
+void sign_f32_4(const float4 *in, float4 *out) {
     *out = sign (*in);
 }
diff --git a/tests/src/android/renderscript/cts/sign_f32_2.rs b/tests/src/android/renderscript/cts/sign_f32_2.rs
deleted file mode 100644
index 3de8ecfb977..00000000000
--- a/tests/src/android/renderscript/cts/sign_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2 *in, float2 *out) {
-    *out = sign (*in);
-}
diff --git a/tests/src/android/renderscript/cts/sign_f32_3.rs b/tests/src/android/renderscript/cts/sign_f32_3.rs
deleted file mode 100644
index 6a6088630ef..00000000000
--- a/tests/src/android/renderscript/cts/sign_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3 *in, float3 *out) {
-    *out = sign (*in);
-}
diff --git a/tests/src/android/renderscript/cts/sign_f32_4.rs b/tests/src/android/renderscript/cts/sign_f32_4.rs
deleted file mode 100644
index 3c29a7eacc1..00000000000
--- a/tests/src/android/renderscript/cts/sign_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4 *in, float4 *out) {
-    *out = sign (*in);
-}
diff --git a/tests/src/android/renderscript/cts/sin_f32.rs b/tests/src/android/renderscript/cts/sin_f32.rs
index 42b67139e21..91652bb6bc8 100644
--- a/tests/src/android/renderscript/cts/sin_f32.rs
+++ b/tests/src/android/renderscript/cts/sin_f32.rs
@@ -1,5 +1,17 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
-void root(const float *in, float *out) {
+void sin_f32_1(const float *in, float *out) {
     *out = sin(*in);
-}
\ No newline at end of file
+}
+
+void sin_f32_2(const float2 *in, float2 *out) {
+    *out = sin(*in);
+}
+
+void sin_f32_3(const float3 *in, float3 *out) {
+    *out = sin(*in);
+}
+
+void sin_f32_4(const float4 *in, float4 *out) {
+    *out = sin(*in);
+}
diff --git a/tests/src/android/renderscript/cts/sin_f32_2.rs b/tests/src/android/renderscript/cts/sin_f32_2.rs
deleted file mode 100644
index e48c7570921..00000000000
--- a/tests/src/android/renderscript/cts/sin_f32_2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float2 *in, float2 *out) {
-    *out = sin(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/sin_f32_3.rs b/tests/src/android/renderscript/cts/sin_f32_3.rs
deleted file mode 100644
index 1a51f374ab8..00000000000
--- a/tests/src/android/renderscript/cts/sin_f32_3.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float3 *in, float3 *out) {
-    *out = sin(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/sin_f32_4.rs b/tests/src/android/renderscript/cts/sin_f32_4.rs
deleted file mode 100644
index 82848c01d87..00000000000
--- a/tests/src/android/renderscript/cts/sin_f32_4.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float4 *in, float4 *out) {
-    *out = sin(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/sinh_f32.rs b/tests/src/android/renderscript/cts/sinh_f32.rs
index 8fcc6f20767..b7853992959 100644
--- a/tests/src/android/renderscript/cts/sinh_f32.rs
+++ b/tests/src/android/renderscript/cts/sinh_f32.rs
@@ -1,5 +1,17 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
-void root(const float *in, float *out) {
+void sinh_f32_1(const float *in, float *out) {
     *out = sinh(*in);
-}
\ No newline at end of file
+}
+
+void sinh_f32_2(const float2 *in, float2 *out) {
+    *out = sinh(*in);
+}
+
+void sinh_f32_3(const float3 *in, float3 *out) {
+    *out = sinh(*in);
+}
+
+void sinh_f32_4(const float4 *in, float4 *out) {
+    *out = sinh(*in);
+}
diff --git a/tests/src/android/renderscript/cts/sinh_f32_2.rs b/tests/src/android/renderscript/cts/sinh_f32_2.rs
deleted file mode 100644
index 5333429a2c5..00000000000
--- a/tests/src/android/renderscript/cts/sinh_f32_2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float2 *in, float2 *out) {
-    *out = sinh(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/sinh_f32_3.rs b/tests/src/android/renderscript/cts/sinh_f32_3.rs
deleted file mode 100644
index 49a5dee2f1c..00000000000
--- a/tests/src/android/renderscript/cts/sinh_f32_3.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float3 *in, float3 *out) {
-    *out = sinh(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/sinh_f32_4.rs b/tests/src/android/renderscript/cts/sinh_f32_4.rs
deleted file mode 100644
index e8b60cb6e5b..00000000000
--- a/tests/src/android/renderscript/cts/sinh_f32_4.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float4 *in, float4 *out) {
-    *out = sinh(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/sqrt_f32.rs b/tests/src/android/renderscript/cts/sqrt_f32.rs
index 865183dc08a..253f1c09de1 100644
--- a/tests/src/android/renderscript/cts/sqrt_f32.rs
+++ b/tests/src/android/renderscript/cts/sqrt_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void sqrt_f32_1 (const float* in, float* out) {
+    *out = sqrt(*in);
+}
+
+void sqrt_f32_2 (const float2* in, float2* out) {
+    *out = sqrt(*in);
+}
+
+void sqrt_f32_3 (const float3* in, float3* out) {
+    *out = sqrt(*in);
+}
+
+void sqrt_f32_4 (const float4* in, float4* out) {
     *out = sqrt(*in);
 }
diff --git a/tests/src/android/renderscript/cts/sqrt_f32_2.rs b/tests/src/android/renderscript/cts/sqrt_f32_2.rs
deleted file mode 100644
index ca70e03ac9d..00000000000
--- a/tests/src/android/renderscript/cts/sqrt_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = sqrt(*in);
-}
diff --git a/tests/src/android/renderscript/cts/sqrt_f32_3.rs b/tests/src/android/renderscript/cts/sqrt_f32_3.rs
deleted file mode 100644
index 9efe0ce5863..00000000000
--- a/tests/src/android/renderscript/cts/sqrt_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = sqrt(*in);
-}
diff --git a/tests/src/android/renderscript/cts/sqrt_f32_4.rs b/tests/src/android/renderscript/cts/sqrt_f32_4.rs
deleted file mode 100644
index b9805824331..00000000000
--- a/tests/src/android/renderscript/cts/sqrt_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = sqrt(*in);
-}
diff --git a/tests/src/android/renderscript/cts/step_f32.rs b/tests/src/android/renderscript/cts/step_f32.rs
index 61320c6951c..d2261b3134a 100644
--- a/tests/src/android/renderscript/cts/step_f32.rs
+++ b/tests/src/android/renderscript/cts/step_f32.rs
@@ -6,6 +6,33 @@ struct step_input {
     float y;
 };
 
-void root(const struct step_input *in, float *out) {
+void step_f32_1(const struct step_input *in, float *out) {
+    *out = step(in->x, in->y);
+}
+
+struct step_2_input {
+    float2 x;
+    float2 y;
+};
+
+void step_f32_2(const struct step_2_input *in, float2 *out) {
+    *out = step(in->x, in->y);
+}
+
+struct step_3_input {
+    float3 x;
+    float3 y;
+};
+
+void step_f32_3(const struct step_3_input *in, float3 *out) {
+    *out = step(in->x, in->y);
+}
+
+struct step_4_input {
+    float4 x;
+    float4 y;
+};
+
+void step_f32_4(const struct step_4_input *in, float4 *out) {
     *out = step(in->x, in->y);
 }
diff --git a/tests/src/android/renderscript/cts/step_f32_2.rs b/tests/src/android/renderscript/cts/step_f32_2.rs
deleted file mode 100644
index b3eac17d7dc..00000000000
--- a/tests/src/android/renderscript/cts/step_f32_2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct step_2_input {
-    float2 x;
-    float2 y;
-};
-
-void root(const struct step_2_input *in, float2 *out) {
-    *out = step(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/step_f32_3.rs b/tests/src/android/renderscript/cts/step_f32_3.rs
deleted file mode 100644
index 3d4c9df4dba..00000000000
--- a/tests/src/android/renderscript/cts/step_f32_3.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct step_3_input {
-    float3 x;
-    float3 y;
-};
-
-void root(const struct step_3_input *in, float3 *out) {
-    *out = step(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/step_f32_4.rs b/tests/src/android/renderscript/cts/step_f32_4.rs
deleted file mode 100644
index 29523d2a6a7..00000000000
--- a/tests/src/android/renderscript/cts/step_f32_4.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct step_4_input {
-    float4 x;
-    float4 y;
-};
-
-void root(const struct step_4_input *in, float4 *out) {
-    *out = step(in->x, in->y);
-}
diff --git a/tests/src/android/renderscript/cts/tan_f32.rs b/tests/src/android/renderscript/cts/tan_f32.rs
index 62b1a811608..35ee971f9ae 100644
--- a/tests/src/android/renderscript/cts/tan_f32.rs
+++ b/tests/src/android/renderscript/cts/tan_f32.rs
@@ -1,5 +1,17 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
-void root(const float *in, float *out) {
+void tan_f32_1(const float *in, float *out) {
     *out = tan(*in);
-}
\ No newline at end of file
+}
+
+void tan_f32_2(const float2 *in, float2 *out) {
+    *out = tan(*in);
+}
+
+void tan_f32_3(const float3 *in, float3 *out) {
+    *out = tan(*in);
+}
+
+void tan_f32_4(const float4 *in, float4 *out) {
+    *out = tan(*in);
+}
diff --git a/tests/src/android/renderscript/cts/tan_f32_2.rs b/tests/src/android/renderscript/cts/tan_f32_2.rs
deleted file mode 100644
index f179da54e00..00000000000
--- a/tests/src/android/renderscript/cts/tan_f32_2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float2 *in, float2 *out) {
-    *out = tan(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/tan_f32_3.rs b/tests/src/android/renderscript/cts/tan_f32_3.rs
deleted file mode 100644
index 0a7f550256c..00000000000
--- a/tests/src/android/renderscript/cts/tan_f32_3.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float3 *in, float3 *out) {
-    *out = tan(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/tan_f32_4.rs b/tests/src/android/renderscript/cts/tan_f32_4.rs
deleted file mode 100644
index 2d1b0d06091..00000000000
--- a/tests/src/android/renderscript/cts/tan_f32_4.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float4 *in, float4 *out) {
-    *out = tan(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/tanh_f32.rs b/tests/src/android/renderscript/cts/tanh_f32.rs
index e7195729408..2b0782e1c68 100644
--- a/tests/src/android/renderscript/cts/tanh_f32.rs
+++ b/tests/src/android/renderscript/cts/tanh_f32.rs
@@ -1,5 +1,17 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
-void root(const float *in, float *out) {
+void tanh_f32_1(const float *in, float *out) {
     *out = tanh(*in);
-}
\ No newline at end of file
+}
+
+void tanh_f32_2(const float2 *in, float2 *out) {
+    *out = tanh(*in);
+}
+
+void tanh_f32_3(const float3 *in, float3 *out) {
+    *out = tanh(*in);
+}
+
+void tanh_f32_4(const float4 *in, float4 *out) {
+    *out = tanh(*in);
+}
diff --git a/tests/src/android/renderscript/cts/tanh_f32_2.rs b/tests/src/android/renderscript/cts/tanh_f32_2.rs
deleted file mode 100644
index 2ffb0fff29d..00000000000
--- a/tests/src/android/renderscript/cts/tanh_f32_2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float2 *in, float2 *out) {
-    *out = tanh(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/tanh_f32_3.rs b/tests/src/android/renderscript/cts/tanh_f32_3.rs
deleted file mode 100644
index f39b6fc0545..00000000000
--- a/tests/src/android/renderscript/cts/tanh_f32_3.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float3 *in, float3 *out) {
-    *out = tanh(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/tanh_f32_4.rs b/tests/src/android/renderscript/cts/tanh_f32_4.rs
deleted file mode 100644
index f3ff7e78b1e..00000000000
--- a/tests/src/android/renderscript/cts/tanh_f32_4.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-void root(const float4 *in, float4 *out) {
-    *out = tanh(*in);
-}
\ No newline at end of file
diff --git a/tests/src/android/renderscript/cts/trunc_f32.rs b/tests/src/android/renderscript/cts/trunc_f32.rs
index 9a2845a1007..a464086f5af 100644
--- a/tests/src/android/renderscript/cts/trunc_f32.rs
+++ b/tests/src/android/renderscript/cts/trunc_f32.rs
@@ -1,6 +1,18 @@
 #pragma version(1)
 #pragma rs java_package_name(android.renderscript.cts)
 
-void root (const float* in, float* out) {
+void trunc_f32_1 (const float* in, float* out) {
+    *out = trunc(*in);
+}
+
+void trunc_f32_2 (const float2* in, float2* out) {
+    *out = trunc(*in);
+}
+
+void trunc_f32_3 (const float3* in, float3* out) {
+    *out = trunc(*in);
+}
+
+void trunc_f32_4 (const float4* in, float4* out) {
     *out = trunc(*in);
 }
diff --git a/tests/src/android/renderscript/cts/trunc_f32_2.rs b/tests/src/android/renderscript/cts/trunc_f32_2.rs
deleted file mode 100644
index f4eabffa577..00000000000
--- a/tests/src/android/renderscript/cts/trunc_f32_2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float2* in, float2* out) {
-    *out = trunc(*in);
-}
diff --git a/tests/src/android/renderscript/cts/trunc_f32_3.rs b/tests/src/android/renderscript/cts/trunc_f32_3.rs
deleted file mode 100644
index 9f0b13fc5ed..00000000000
--- a/tests/src/android/renderscript/cts/trunc_f32_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float3* in, float3* out) {
-    *out = trunc(*in);
-}
diff --git a/tests/src/android/renderscript/cts/trunc_f32_4.rs b/tests/src/android/renderscript/cts/trunc_f32_4.rs
deleted file mode 100644
index 2524cafd466..00000000000
--- a/tests/src/android/renderscript/cts/trunc_f32_4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root (const float4* in, float4* out) {
-    *out = trunc(*in);
-}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/AcosPiTest.java b/tests/tests/renderscript/src/android/renderscript/cts/AcosPiTest.java
index 532d61af367..859f235ff3b 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/AcosPiTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/AcosPiTest.java
@@ -21,26 +21,28 @@ import android.renderscript.Allocation;
 import android.renderscript.RSRuntimeException;
 
 public class AcosPiTest extends RSBaseCompute {
-
     private ScriptC_acospi_f32 script_f32;
-    private ScriptC_acospi_f32_2 script_f32_2;
-    private ScriptC_acospi_f32_3 script_f32_3;
-    private ScriptC_acospi_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_acospi_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_acospi_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_acospi_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_acospi_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_acospi_f32_4(mIn, mOut);
             break;
         }
     }
@@ -59,22 +61,18 @@ public class AcosPiTest extends RSBaseCompute {
     }
 
     public void testAcosPiF32() {
-        script_f32 = new ScriptC_acospi_f32(mRS, mRes, R.raw.acospi_f32);
         doF32(0xe1, 5);
     }
 
     public void testAcosPiF32_2() {
-        script_f32_2 = new ScriptC_acospi_f32_2(mRS, mRes, R.raw.acospi_f32_2);
         doF32_2(0xa123, 5);
     }
 
     public void testAcosPiF32_3() {
-        script_f32_3 = new ScriptC_acospi_f32_3(mRS, mRes, R.raw.acospi_f32_3);
         doF32_3(0x123, 5);
     }
 
     public void testAcosPiF32_4() {
-        script_f32_4 = new ScriptC_acospi_f32_4(mRS, mRes, R.raw.acospi_f32_4);
         doF32_4(0x123ef, 5);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/AcosTest.java b/tests/tests/renderscript/src/android/renderscript/cts/AcosTest.java
index 4b6e0b0de0a..0553aa53c14 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/AcosTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/AcosTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class AcosTest extends RSBaseCompute {
     private ScriptC_acos_f32 script_f32;
-    private ScriptC_acos_f32_2 script_f32_2;
-    private ScriptC_acos_f32_3 script_f32_3;
-    private ScriptC_acos_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_acos_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_acos_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_acos_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_acos_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_acos_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class AcosTest extends RSBaseCompute {
     }
 
     public void testAcosF32() {
-        script_f32 = new ScriptC_acos_f32(mRS, mRes, R.raw.acos_f32);
         doF32(0x123e, 4);
     }
 
     public void testAcosF32_2() {
-        script_f32_2 = new ScriptC_acos_f32_2(mRS, mRes, R.raw.acos_f32_2);
         doF32_2(0x1e, 4);
     }
 
     public void testAcosF32_3() {
-        script_f32_3 = new ScriptC_acos_f32_3(mRS, mRes, R.raw.acos_f32_3);
         doF32_3(0xeaf, 4);
     }
 
     public void testAcosF32_4() {
-        script_f32_4 = new ScriptC_acos_f32_4(mRS, mRes, R.raw.acos_f32_4);
         doF32_4(0x123, 4);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/AcoshTest.java b/tests/tests/renderscript/src/android/renderscript/cts/AcoshTest.java
index 05ca1835cd2..86755b0deba 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/AcoshTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/AcoshTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class AcoshTest extends RSBaseCompute {
     private ScriptC_acosh_f32 script_f32;
-    private ScriptC_acosh_f32_2 script_f32_2;
-    private ScriptC_acosh_f32_3 script_f32_3;
-    private ScriptC_acosh_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_acosh_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_acosh_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_acosh_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_acosh_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_acosh_f32_4(mIn, mOut);
             break;
         }
     }
@@ -59,22 +62,18 @@ public class AcoshTest extends RSBaseCompute {
     }
 
     public void testAcoshF32() {
-        script_f32 = new ScriptC_acosh_f32(mRS, mRes, R.raw.acosh_f32);
         doF32(0x12345678, 4);
     }
 
     public void testAcoshF32_2() {
-        script_f32_2 = new ScriptC_acosh_f32_2(mRS, mRes, R.raw.acosh_f32_2);
         doF32_2(0x1234ac, 4);
     }
 
     public void testAcoshF32_3() {
-        script_f32_3 = new ScriptC_acosh_f32_3(mRS, mRes, R.raw.acosh_f32_3);
         doF32_3(0x123fc78, 4);
     }
 
     public void testAcoshF32_4() {
-        script_f32_4 = new ScriptC_acosh_f32_4(mRS, mRes, R.raw.acosh_f32_4);
         doF32_4(0x12def8, 4);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/AsinPiTest.java b/tests/tests/renderscript/src/android/renderscript/cts/AsinPiTest.java
index 63e60ce5288..d0ce9eafd95 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/AsinPiTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/AsinPiTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class AsinPiTest extends RSBaseCompute {
     private ScriptC_asinpi_f32 script_f32;
-    private ScriptC_asinpi_f32_2 script_f32_2;
-    private ScriptC_asinpi_f32_3 script_f32_3;
-    private ScriptC_asinpi_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_asinpi_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_asinpi_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_asinpi_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_asinpi_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_asinpi_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class AsinPiTest extends RSBaseCompute {
     }
 
     public void testAsinPiF32() {
-        script_f32 = new ScriptC_asinpi_f32(mRS, mRes, R.raw.asinpi_f32);
         doF32(0xa, 5);
     }
 
     public void testAsinPiF32_2() {
-        script_f32_2 = new ScriptC_asinpi_f32_2(mRS, mRes, R.raw.asinpi_f32_2);
         doF32_2(0xe, 5);
     }
 
     public void testAsinPiF32_3() {
-        script_f32_3 = new ScriptC_asinpi_f32_3(mRS, mRes, R.raw.asinpi_f32_3);
         doF32_3(0x1234, 5);
     }
 
     public void testAsinPiF32_4() {
-        script_f32_4 = new ScriptC_asinpi_f32_4(mRS, mRes, R.raw.asinpi_f32_4);
         doF32_4(0xaf, 5);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/AsinTest.java b/tests/tests/renderscript/src/android/renderscript/cts/AsinTest.java
index eaf5e452043..a47e034db26 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/AsinTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/AsinTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class AsinTest extends RSBaseCompute {
     private ScriptC_asin_f32 script_f32;
-    private ScriptC_asin_f32_2 script_f32_2;
-    private ScriptC_asin_f32_3 script_f32_3;
-    private ScriptC_asin_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_asin_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_asin_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_asin_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_asin_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_asin_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class AsinTest extends RSBaseCompute {
     }
 
     public void testAsinF32() {
-        script_f32 = new ScriptC_asin_f32(mRS, mRes, R.raw.asin_f32);
         doF32(0x12efa, 4);
     }
 
     public void testAsinF32_2() {
-        script_f32_2 = new ScriptC_asin_f32_2(mRS, mRes, R.raw.asin_f32_2);
         doF32_2(0x34ef, 4);
     }
 
     public void testAsinF32_3() {
-        script_f32_3 = new ScriptC_asin_f32_3(mRS, mRes, R.raw.asin_f32_3);
         doF32_3(0xae31, 4);
     }
 
     public void testAsinF32_4() {
-        script_f32_4 = new ScriptC_asin_f32_4(mRS, mRes, R.raw.asin_f32_4);
         doF32_4(0x341, 4);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/AsinhTest.java b/tests/tests/renderscript/src/android/renderscript/cts/AsinhTest.java
index e4370ec509d..729262648e2 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/AsinhTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/AsinhTest.java
@@ -22,25 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class AsinhTest extends RSBaseCompute {
     private ScriptC_asinh_f32 script_f32;
-    private ScriptC_asinh_f32_2 script_f32_2;
-    private ScriptC_asinh_f32_3 script_f32_3;
-    private ScriptC_asinh_f32_4 script_f32_4;
 
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_asinh_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_asinh_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_asinh_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_asinh_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_asinh_f32_4(mIn, mOut);
             break;
         }
     }
@@ -60,22 +62,18 @@ public class AsinhTest extends RSBaseCompute {
     }
 
     public void testAsinhF32() {
-        script_f32 = new ScriptC_asinh_f32(mRS, mRes, R.raw.asinh_f32);
         doF32(0x12, 4);
     }
 
     public void testAsinhF32_2() {
-        script_f32_2 = new ScriptC_asinh_f32_2(mRS, mRes, R.raw.asinh_f32_2);
         doF32_2(0xead, 4);
     }
 
     public void testAsinhF32_3() {
-        script_f32_3 = new ScriptC_asinh_f32_3(mRS, mRes, R.raw.asinh_f32_3);
         doF32_3(0xabc, 4);
     }
 
     public void testAsinhF32_4() {
-        script_f32_4 = new ScriptC_asinh_f32_4(mRS, mRes, R.raw.asinh_f32_4);
         doF32_4(0xfea, 4);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/Atan2PiTest.java b/tests/tests/renderscript/src/android/renderscript/cts/Atan2PiTest.java
index 62d31e60e0d..ef821c75037 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/Atan2PiTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/Atan2PiTest.java
@@ -23,25 +23,28 @@ import android.renderscript.Element;
 
 public class Atan2PiTest extends RSBaseCompute {
     private ScriptC_atan2pi_f32 script_f32;
-    private ScriptC_atan2pi_f32_2 script_f32_2;
-    private ScriptC_atan2pi_f32_3 script_f32_3;
-    private ScriptC_atan2pi_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_atan2pi_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_atan2pi_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_atan2pi_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_atan2pi_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_atan2pi_f32_4(mIn, mOut);
             break;
         }
     }
@@ -69,28 +72,24 @@ public class Atan2PiTest extends RSBaseCompute {
     }
 
     public void testAtan2PiF32() {
-        script_f32 = new ScriptC_atan2pi_f32(mRS, mRes, R.raw.atan2pi_f32);
         ScriptField_atan2pi_float_input in = new ScriptField_atan2pi_float_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x12678, 6);
     }
 
     public void testAtan2PiF32_2() {
-        script_f32_2 = new ScriptC_atan2pi_f32_2(mRS, mRes, R.raw.atan2pi_f32_2);
         ScriptField_atan2pi_float2_input in = new ScriptField_atan2pi_float2_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_2(0x1af45, 6);
     }
 
     public void testAtan2PiF32_3() {
-        script_f32_3 = new ScriptC_atan2pi_f32_3(mRS, mRes, R.raw.atan2pi_f32_3);
         ScriptField_atan2pi_float3_input in = new ScriptField_atan2pi_float3_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0x1cd345, 6);
     }
 
     public void testAtan2PiF32_4() {
-        script_f32_4 = new ScriptC_atan2pi_f32_4(mRS, mRes, R.raw.atan2pi_f32_4);
         ScriptField_atan2pi_float4_input in = new ScriptField_atan2pi_float4_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0x1ca45, 6);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/Atan2Test.java b/tests/tests/renderscript/src/android/renderscript/cts/Atan2Test.java
index 4071e10c118..93f252741fc 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/Atan2Test.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/Atan2Test.java
@@ -23,25 +23,28 @@ import android.renderscript.Element;
 
 public class Atan2Test extends RSBaseCompute {
     private ScriptC_atan2_f32 script_f32;
-    private ScriptC_atan2_f32_2 script_f32_2;
-    private ScriptC_atan2_f32_3 script_f32_3;
-    private ScriptC_atan2_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_atan2_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_atan2_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_atan2_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_atan2_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_atan2_f32_4(mIn, mOut);
             break;
         }
     }
@@ -69,28 +72,24 @@ public class Atan2Test extends RSBaseCompute {
     }
 
     public void testAtan2F32() {
-        script_f32 = new ScriptC_atan2_f32(mRS, mRes, R.raw.atan2_f32);
         ScriptField_atan2_f32_in in = new ScriptField_atan2_f32_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x12678, 6);
     }
 
     public void testAtan2F32_2() {
-        script_f32_2 = new ScriptC_atan2_f32_2(mRS, mRes, R.raw.atan2_f32_2);
         ScriptField_atan2_f32_2_in in = new ScriptField_atan2_f32_2_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_2(0x1af45, 6);
     }
 
     public void testAtan2F32_3() {
-        script_f32_3 = new ScriptC_atan2_f32_3(mRS, mRes, R.raw.atan2_f32_3);
         ScriptField_atan2_f32_3_in in = new ScriptField_atan2_f32_3_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0x1cd345, 6);
     }
 
     public void testAtan2F32_4() {
-        script_f32_4 = new ScriptC_atan2_f32_4(mRS, mRes, R.raw.atan2_f32_4);
         ScriptField_atan2_f32_4_in in = new ScriptField_atan2_f32_4_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0x1ca45, 6);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/AtanPiTest.java b/tests/tests/renderscript/src/android/renderscript/cts/AtanPiTest.java
index 29977249c52..de22780967a 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/AtanPiTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/AtanPiTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class AtanPiTest extends RSBaseCompute {
     private ScriptC_atanpi_f32 script_f32;
-    private ScriptC_atanpi_f32_2 script_f32_2;
-    private ScriptC_atanpi_f32_3 script_f32_3;
-    private ScriptC_atanpi_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_atanpi_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_atanpi_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_atanpi_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_atanpi_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_atanpi_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class AtanPiTest extends RSBaseCompute {
     }
 
     public void testAtanPiF32() {
-        script_f32 = new ScriptC_atanpi_f32(mRS, mRes, R.raw.atanpi_f32);
         doF32(0x123, 5);
     }
 
     public void testAtanPiF32_2() {
-        script_f32_2 = new ScriptC_atanpi_f32_2(mRS, mRes, R.raw.atanpi_f32_2);
         doF32_2(0x12, 5);
     }
 
     public void testAtanPiF32_3() {
-        script_f32_3 = new ScriptC_atanpi_f32_3(mRS, mRes, R.raw.atanpi_f32_3);
         doF32_3(0x847, 5);
     }
 
     public void testAtanPiF32_4() {
-        script_f32_4 = new ScriptC_atanpi_f32_4(mRS, mRes, R.raw.atanpi_f32_4);
         doF32_4(0xfa2, 5);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/AtanTest.java b/tests/tests/renderscript/src/android/renderscript/cts/AtanTest.java
index f1daec3b676..d91b6e598f7 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/AtanTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/AtanTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class AtanTest extends RSBaseCompute {
     private ScriptC_atan_f32 script_f32;
-    private ScriptC_atan_f32_2 script_f32_2;
-    private ScriptC_atan_f32_3 script_f32_3;
-    private ScriptC_atan_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_atan_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_atan_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_atan_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_atan_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_atan_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class AtanTest extends RSBaseCompute {
     }
 
     public void testAtanF32() {
-        script_f32 = new ScriptC_atan_f32(mRS, mRes, R.raw.atan_f32);
         doF32(0x12a, 5);
     }
 
     public void testAtanF32_2() {
-        script_f32_2 = new ScriptC_atan_f32_2(mRS, mRes, R.raw.atan_f32_2);
         doF32_2(0xad, 5);
     }
 
     public void testAtanF32_3() {
-        script_f32_3 = new ScriptC_atan_f32_3(mRS, mRes, R.raw.atan_f32_3);
         doF32_3(0xafe, 5);
     }
 
     public void testAtanF32_4() {
-        script_f32_4 = new ScriptC_atan_f32_4(mRS, mRes, R.raw.atan_f32_4);
         doF32_4(0x1238, 5);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/AtanhTest.java b/tests/tests/renderscript/src/android/renderscript/cts/AtanhTest.java
index 0ff35e9f878..25fa8597be1 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/AtanhTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/AtanhTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class AtanhTest extends RSBaseCompute {
     private ScriptC_atanh_f32 script_f32;
-    private ScriptC_atanh_f32_2 script_f32_2;
-    private ScriptC_atanh_f32_3 script_f32_3;
-    private ScriptC_atanh_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_atanh_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_atanh_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_atanh_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_atanh_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_atanh_f32_4(mIn, mOut);
             break;
         }
     }
@@ -59,22 +62,18 @@ public class AtanhTest extends RSBaseCompute {
     }
 
     public void testAtanhF32() {
-        script_f32 = new ScriptC_atanh_f32(mRS, mRes, R.raw.atanh_f32);
         doF32(0xace, 5);
     }
 
     public void testAtanhF32_2() {
-        script_f32_2 = new ScriptC_atanh_f32_2(mRS, mRes, R.raw.atanh_f32_2);
         doF32_2(0xdae, 5);
     }
 
     public void testAtanhF32_3() {
-        script_f32_3 = new ScriptC_atanh_f32_3(mRS, mRes, R.raw.atanh_f32_3);
         doF32_3(0x123, 5);
     }
 
     public void testAtanhF32_4() {
-        script_f32_4 = new ScriptC_atanh_f32_4(mRS, mRes, R.raw.atanh_f32_4);
         doF32_4(0x6480, 5);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/CbrtTest.java b/tests/tests/renderscript/src/android/renderscript/cts/CbrtTest.java
index 2db47061c9e..15a509d25e3 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/CbrtTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/CbrtTest.java
@@ -21,25 +21,28 @@ import android.renderscript.RSRuntimeException;
 import com.android.cts.stub.R;
 
 public class CbrtTest extends RSBaseCompute {
-    private ScriptC_cbrt_f32 mscript_f32;
-    private ScriptC_cbrt_f32_2 mscript_f32_2;
-    private ScriptC_cbrt_f32_3 mscript_f32_3;
-    private ScriptC_cbrt_f32_4 mscript_f32_4;
+    private ScriptC_cbrt_f32 script_f32;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_cbrt_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            mscript_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_cbrt_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            mscript_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_cbrt_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            mscript_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_cbrt_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            mscript_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_cbrt_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class CbrtTest extends RSBaseCompute {
     }
 
     public void testCbrtF32() {
-        mscript_f32 = new ScriptC_cbrt_f32(mRS, mRes, R.raw.cbrt_f32);
         doF32(0xabe, 2);
     }
 
     public void testCbrtF32_2() {
-        mscript_f32_2 = new ScriptC_cbrt_f32_2(mRS, mRes, R.raw.cbrt_f32_2);
         doF32_2(0x78, 2);
     }
 
     public void testCbrtF32_3() {
-        mscript_f32_3 = new ScriptC_cbrt_f32_3(mRS, mRes, R.raw.cbrt_f32_3);
         doF32_3(0x1e, 2);
     }
 
     public void testCbrtF32_4() {
-        mscript_f32_4 = new ScriptC_cbrt_f32_4(mRS, mRes, R.raw.cbrt_f32_4);
         doF32_4(0xfe2, 2);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/CeilTest.java b/tests/tests/renderscript/src/android/renderscript/cts/CeilTest.java
index dfaee006a70..4ee2adea637 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/CeilTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/CeilTest.java
@@ -21,25 +21,28 @@ import android.renderscript.RSRuntimeException;
 import com.android.cts.stub.R;
 
 public class CeilTest extends RSBaseCompute {
-    private ScriptC_ceil_f32 mscript_f32;
-    private ScriptC_ceil_f32_2 mscript_f32_2;
-    private ScriptC_ceil_f32_3 mscript_f32_3;
-    private ScriptC_ceil_f32_4 mscript_f32_4;
+    private ScriptC_ceil_f32 script_f32;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_ceil_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            mscript_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_ceil_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            mscript_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_ceil_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            mscript_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_ceil_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            mscript_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_ceil_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class CeilTest extends RSBaseCompute {
     }
 
     public void testCeilF32() {
-        mscript_f32 = new ScriptC_ceil_f32(mRS, mRes, R.raw.ceil_f32);
         doF32(0x12345ace, 0);
     }
 
     public void testCeilF32_2() {
-        mscript_f32_2 = new ScriptC_ceil_f32_2(mRS, mRes, R.raw.ceil_f32_2);
         doF32_2(0x1ac478, 0);
     }
 
     public void testCeilF32_3() {
-        mscript_f32_3 = new ScriptC_ceil_f32_3(mRS, mRes, R.raw.ceil_f32_3);
         doF32_3(0xacef, 0);
     }
 
     public void testCeilF32_4() {
-        mscript_f32_4 = new ScriptC_ceil_f32_4(mRS, mRes, R.raw.ceil_f32_4);
         doF32_4(0xef12, 0);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ClearObjectTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ClearObjectTest.java
index 6a974a66b72..64deb332ba3 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ClearObjectTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ClearObjectTest.java
@@ -31,39 +31,40 @@ public class ClearObjectTest extends RSBaseCompute {
     static final int TEST_ID_ALLOCATION = 2;
     static final int TEST_ID_SAMPLER = 3;
     static final int TEST_ID_SCRIPT = 4;
-    private ScriptC_clear_object_element ms_element;
-    private ScriptC_clear_object_type ms_type;
-    private ScriptC_clear_object_allocation ms_allcation;
-    private ScriptC_clear_object_sampler ms_sampler;
-    private ScriptC_clear_object_script ms_script;
+    private ScriptC_clear_object ms_clear;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        ms_clear = new ScriptC_clear_object(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_ID_ELEMENT:
-            ms_element.forEach_root(mOut);
+            ms_clear.forEach_clear_element(mOut);
             break;
         case TEST_ID_TYPE:
-            ms_type.forEach_root(mOut);
+            ms_clear.forEach_clear_type(mOut);
             break;
         case TEST_ID_ALLOCATION:
-            ms_allcation.forEach_root(mOut);
+            ms_clear.forEach_clear_allocation(mOut);
             break;
         case TEST_ID_SAMPLER:
-            ms_sampler.forEach_root(mOut);
+            ms_clear.forEach_clear_sampler(mOut);
             break;
         case TEST_ID_SCRIPT:
-            ms_script.forEach_root(mOut);
+            ms_clear.forEach_clear_script(mOut);
             break;
         }
     }
 
     public void testClearObjectElement() {
-        ms_element = new ScriptC_clear_object_element(mRS, mRes, R.raw.clear_object_element);
         Element element = Element.BOOLEAN(mRS);
         Allocation mIn = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
         Allocation mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ms_element.set_element(element);
+        ms_clear.set_element(element);
         try {
             RSUtils.forEach(this, TEST_ID_ELEMENT, mIn, mOut);
         } catch (RSRuntimeException e) {
@@ -76,11 +77,10 @@ public class ClearObjectTest extends RSBaseCompute {
     }
 
     public void testclearObjectType() {
-        ms_type = new ScriptC_clear_object_type(mRS, mRes, R.raw.clear_object_type);
         Type type= new Type.Builder(mRS, Element.I8(mRS)).setX(1).create();
         Allocation mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
         Allocation mIn = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ms_type.set_type(type);
+        ms_clear.set_type(type);
 
         try {
             RSUtils.forEach(this, TEST_ID_TYPE, mIn, mOut);
@@ -94,12 +94,10 @@ public class ClearObjectTest extends RSBaseCompute {
     }
 
     public void testclearObjectAllocation() {
-        ms_allcation = new ScriptC_clear_object_allocation(mRS, mRes,
-                R.raw.clear_object_allocation);
         Allocation mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
         Allocation mIn = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
         Allocation allocation = Allocation.createTyped(mRS, mIn.getType());
-        ms_allcation.set_allocation(allocation);
+        ms_clear.set_allocation(allocation);
         try {
             RSUtils.forEach(this, TEST_ID_ALLOCATION, mIn, mOut);
         } catch (RSRuntimeException e) {
@@ -112,11 +110,10 @@ public class ClearObjectTest extends RSBaseCompute {
     }
 
     public void testclearObjectSampler() {
-        ms_sampler = new ScriptC_clear_object_sampler(mRS, mRes, R.raw.clear_object_sampler);
         Sampler sampler = new Sampler.Builder(mRS).create();
         Allocation mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
         Allocation mIn = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ms_sampler.set_sampler(sampler);
+        ms_clear.set_sampler(sampler);
         try {
             RSUtils.forEach(this, TEST_ID_SAMPLER, mIn, mOut);
         } catch (RSRuntimeException e) {
@@ -129,11 +126,10 @@ public class ClearObjectTest extends RSBaseCompute {
     }
 
     public void testclearObjectScript() {
-        ms_script = new ScriptC_clear_object_script(mRS, mRes, R.raw.clear_object_script);
-        Script script = new ScriptC_clear_object_type(mRS, mRes, R.raw.clear_object_element);
+        Script script = new ScriptC_clear_object(mRS);
         Allocation mIn = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
         Allocation mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ms_script.set_script(script);
+        ms_clear.set_script(script);
         try {
             RSUtils.forEach(this, TEST_ID_SCRIPT, mIn, mOut);
         } catch (RSRuntimeException e) {
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/CopysignTest.java b/tests/tests/renderscript/src/android/renderscript/cts/CopysignTest.java
index 84e07ed5b50..5601e4659e1 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/CopysignTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/CopysignTest.java
@@ -22,26 +22,29 @@ import android.renderscript.RSRuntimeException;
 import com.android.cts.stub.R;
 
 public class CopysignTest extends RSBaseCompute {
-    private ScriptC_copysign_f32 ms_f32;
-    private ScriptC_copysign_f32_2 ms_f32_2;
-    private ScriptC_copysign_f32_3 ms_f32_3;
-    private ScriptC_copysign_f32_4 ms_f32_4;
+    private ScriptC_copysign_f32 script_f32;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_copysign_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            ms_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_copysign_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            ms_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_copysign_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            ms_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_copysign_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            ms_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_copysign_f32_4(mIn, mOut);
             break;
         }
     }
@@ -73,7 +76,6 @@ public class CopysignTest extends RSBaseCompute {
      * Tests copysign(float, float).
      */
     public void testCopysignF32() {
-        ms_f32 = new ScriptC_copysign_f32(mRS, mRes, R.raw.copysign_f32);
         ScriptField_copysign_f32_input in = new ScriptField_copysign_f32_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x12ac5678, 0);
@@ -83,7 +85,6 @@ public class CopysignTest extends RSBaseCompute {
      * Tests copysign(float2, float2).
      */
     public void testCopysignF32_2() {
-        ms_f32_2 = new ScriptC_copysign_f32_2(mRS, mRes, R.raw.copysign_f32_2);
         ScriptField_copysign_f32_2_input in =
                 new ScriptField_copysign_f32_2_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
@@ -94,7 +95,6 @@ public class CopysignTest extends RSBaseCompute {
      * Tests copysign(float3, float3).
      */
     public void testCopysignF32_3() {
-        ms_f32_3 = new ScriptC_copysign_f32_3(mRS, mRes, R.raw.copysign_f32_3);
         ScriptField_copysign_f32_3_input in =
                 new ScriptField_copysign_f32_3_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
@@ -105,7 +105,6 @@ public class CopysignTest extends RSBaseCompute {
      * Tests copysign(float4, float4).
      */
     public void testCopysignF32_4() {
-        ms_f32_4 = new ScriptC_copysign_f32_4(mRS, mRes, R.raw.copysign_f32_4);
         ScriptField_copysign_f32_4_input in =
                 new ScriptField_copysign_f32_4_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/CosTest.java b/tests/tests/renderscript/src/android/renderscript/cts/CosTest.java
index ae2bac4d050..ebf4940ce7f 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/CosTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/CosTest.java
@@ -22,24 +22,27 @@ import com.android.cts.stub.R;
 
 public class CosTest extends RSBaseCompute {
     private ScriptC_cos_f32 script_f32;
-    private ScriptC_cos_f32_2 script_f32_2;
-    private ScriptC_cos_f32_3 script_f32_3;
-    private ScriptC_cos_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_cos_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_cos_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_cos_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_cos_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_cos_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class CosTest extends RSBaseCompute {
     }
 
     public void testCosF32() {
-        script_f32 = new ScriptC_cos_f32(mRS, mRes, R.raw.cos_f32);
         doF32(0xe, 4);
     }
 
     public void testCosF32_2() {
-        script_f32_2 = new ScriptC_cos_f32_2(mRS, mRes, R.raw.cos_f32_2);
         doF32_2(0xb, 4);
     }
 
     public void testCosF32_3() {
-        script_f32_3 = new ScriptC_cos_f32_3(mRS, mRes, R.raw.cos_f32_3);
         doF32_3(0x12a, 4);
     }
 
     public void testCosF32_4() {
-        script_f32_4 = new ScriptC_cos_f32_4(mRS, mRes, R.raw.cos_f32_4);
         doF32_4(0x98a, 4);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/CoshTest.java b/tests/tests/renderscript/src/android/renderscript/cts/CoshTest.java
index eafa3b059db..7e46b4c6e29 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/CoshTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/CoshTest.java
@@ -22,25 +22,28 @@ import android.renderscript.RSRuntimeException;
 
 public class CoshTest extends RSBaseCompute {
 
-    private ScriptC_cosh_f32 ms_f32;
-    private ScriptC_cosh_f32_2 ms_f32_2;
-    private ScriptC_cosh_f32_3 ms_f32_3;
-    private ScriptC_cosh_f32_4 ms_f32_4;
+    private ScriptC_cosh_f32 script_f32;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_cosh_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            ms_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_cosh_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            ms_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_cosh_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            ms_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_cosh_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            ms_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_cosh_f32_4(mIn, mOut);
             break;
         }
     }
@@ -59,22 +62,18 @@ public class CoshTest extends RSBaseCompute {
     }
 
     public void testCoshF32() {
-        ms_f32 = new ScriptC_cosh_f32(mRS, mRes, R.raw.cosh_f32);
         doF32(0xfe, 4);
     }
 
     public void testCoshF32_2() {
-        ms_f32_2 = new ScriptC_cosh_f32_2(mRS, mRes, R.raw.cosh_f32_2);
         doF32_2(0x71, 4);
     }
 
     public void testCoshF32_3() {
-        ms_f32_3 = new ScriptC_cosh_f32_3(mRS, mRes, R.raw.cosh_f32_3);
         doF32_3(0xa, 4);
     }
 
     public void testCoshF32_4() {
-        ms_f32_4 = new ScriptC_cosh_f32_4(mRS, mRes, R.raw.cosh_f32_4);
         doF32_4(0xabe, 4);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/CrossTest.java b/tests/tests/renderscript/src/android/renderscript/cts/CrossTest.java
index 3c8c212655b..a32eafdada5 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/CrossTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/CrossTest.java
@@ -22,18 +22,23 @@ import android.renderscript.Element;
 import android.renderscript.RSRuntimeException;
 
 public class CrossTest extends RSBaseCompute {
-    private ScriptC_cross_f32_3 script_f32_3;
-    private ScriptC_cross_f32_4 script_f32_4;
+    private ScriptC_cross_f32 script_f32;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_cross_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_cross_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_cross_f32_4(mIn, mOut);
             break;
         }
     }
@@ -67,7 +72,6 @@ public class CrossTest extends RSBaseCompute {
      * cross test for float3
      */
     public void testCrossF32_3() {
-        script_f32_3 = new ScriptC_cross_f32_3(mRS, mRes, R.raw.cross_f32_3);
         ScriptField__cross_f32_3_struct in = new ScriptField__cross_f32_3_struct(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0x12345678, 0);
@@ -77,7 +81,6 @@ public class CrossTest extends RSBaseCompute {
      * cross test for float4
      */
     public void testCrossF32_4() {
-        script_f32_4 = new ScriptC_cross_f32_4(mRS, mRes, R.raw.cross_f32_4);
         ScriptField__cross_f32_4_struct in = new ScriptField__cross_f32_4_struct(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0x12ac5678, 0);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/DegreesTest.java b/tests/tests/renderscript/src/android/renderscript/cts/DegreesTest.java
index 83496ffc469..bb6e18d47ae 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/DegreesTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/DegreesTest.java
@@ -21,25 +21,28 @@ import android.renderscript.Allocation;
 import android.renderscript.RSRuntimeException;
 
 public class DegreesTest extends RSBaseCompute {
-    private ScriptC_deg_f32 script_f32;
-    private ScriptC_deg_f32_2 script_f32_2;
-    private ScriptC_deg_f32_3 script_f32_3;
-    private ScriptC_deg_f32_4 script_f32_4;
+    private ScriptC_degrees_f32 script_f32;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_degrees_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_degrees_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_degrees_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_degrees_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_degrees_f32_4(mIn, mOut);
             break;
         }
     }
@@ -62,7 +65,6 @@ public class DegreesTest extends RSBaseCompute {
      * degrees test for float
      */
     public void testDegreesF32() {
-        script_f32 = new ScriptC_deg_f32(mRS, mRes, R.raw.deg_f32);
         doF32(0x12345678, 3);
     }
 
@@ -70,7 +72,6 @@ public class DegreesTest extends RSBaseCompute {
      * degrees test for float2
      */
     public void testDegreesF32_2() {
-        script_f32_2 = new ScriptC_deg_f32_2(mRS, mRes, R.raw.deg_f32_2);
         doF32_2(0x12353678, 3);
     }
 
@@ -78,7 +79,6 @@ public class DegreesTest extends RSBaseCompute {
      * degrees test for float3
      */
     public void testDegreesF32_3() {
-        script_f32_3 = new ScriptC_deg_f32_3(mRS, mRes, R.raw.deg_f32_3);
         doF32_3(0x12312678, 3);
     }
 
@@ -86,7 +86,6 @@ public class DegreesTest extends RSBaseCompute {
      * degrees test for float4
      */
     public void testDegreesF32_4() {
-        script_f32_4 = new ScriptC_deg_f32_4(mRS, mRes, R.raw.deg_f32_4);
         doF32_4(0x12675678, 3);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/Exp10Test.java b/tests/tests/renderscript/src/android/renderscript/cts/Exp10Test.java
index 679dd7a8919..6359765aafb 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/Exp10Test.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/Exp10Test.java
@@ -22,24 +22,27 @@ import com.android.cts.stub.R;
 
 public class Exp10Test extends RSBaseCompute {
     private ScriptC_exp10_f32 script_f32;
-    private ScriptC_exp10_f32_2 script_f32_2;
-    private ScriptC_exp10_f32_3 script_f32_3;
-    private ScriptC_exp10_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_exp10_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_exp10_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_exp10_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_exp10_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_exp10_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class Exp10Test extends RSBaseCompute {
     }
 
     public void testExp10F32() {
-        script_f32 = new ScriptC_exp10_f32(mRS, mRes, R.raw.exp10_f32);
         doF32(0x81, 3);
     }
 
     public void testExp10F32_2() {
-        script_f32_2 = new ScriptC_exp10_f32_2(mRS, mRes, R.raw.exp10_f32_2);
         doF32_2(0xa42, 3);
     }
 
     public void testExp10F32_3() {
-        script_f32_3 = new ScriptC_exp10_f32_3(mRS, mRes, R.raw.exp10_f32_3);
         doF32_3(0xace2, 3);
     }
 
     public void testExp10F32_4() {
-        script_f32_4 = new ScriptC_exp10_f32_4(mRS, mRes, R.raw.exp10_f32_4);
         doF32_4(0x918, 3);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/Exp2Test.java b/tests/tests/renderscript/src/android/renderscript/cts/Exp2Test.java
index 4b4918dfafd..4f9335e2869 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/Exp2Test.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/Exp2Test.java
@@ -22,24 +22,27 @@ import com.android.cts.stub.R;
 
 public class Exp2Test extends RSBaseCompute {
     private ScriptC_exp2_f32 script_f32;
-    private ScriptC_exp2_f32_2 script_f32_2;
-    private ScriptC_exp2_f32_3 script_f32_3;
-    private ScriptC_exp2_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_exp2_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_exp2_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_exp2_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_exp2_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_exp2_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class Exp2Test extends RSBaseCompute {
     }
 
     public void testExp2F32() {
-        script_f32 = new ScriptC_exp2_f32(mRS, mRes, R.raw.exp2_f32);
         doF32(0xa6, 3);
     }
 
     public void testExp2F32_2() {
-        script_f32_2 = new ScriptC_exp2_f32_2(mRS, mRes, R.raw.exp2_f32_2);
         doF32_2(0xab2, 3);
     }
 
     public void testExp2F32_3() {
-        script_f32_3 = new ScriptC_exp2_f32_3(mRS, mRes, R.raw.exp2_f32_3);
         doF32_3(0x617a, 3);
     }
 
     public void testExp2F32_4() {
-        script_f32_4 = new ScriptC_exp2_f32_4(mRS, mRes, R.raw.exp2_f32_4);
         doF32_4(0xabc3, 3);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ExpTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ExpTest.java
index c2789e8930c..3542f6f87be 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ExpTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ExpTest.java
@@ -22,24 +22,27 @@ import com.android.cts.stub.R;
 
 public class ExpTest extends RSBaseCompute {
     private ScriptC_exp_f32 script_f32;
-    private ScriptC_exp_f32_2 script_f32_2;
-    private ScriptC_exp_f32_3 script_f32_3;
-    private ScriptC_exp_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_exp_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_exp_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_exp_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_exp_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_exp_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class ExpTest extends RSBaseCompute {
     }
 
     public void testExpF32() {
-        script_f32 = new ScriptC_exp_f32(mRS, mRes, R.raw.exp_f32);
         doF32(0xa28, 3);
     }
 
     public void testExpF32_2() {
-        script_f32_2 = new ScriptC_exp_f32_2(mRS, mRes, R.raw.exp_f32_2);
         doF32_2(0xfeb4, 3);
     }
 
     public void testExpF32_3() {
-        script_f32_3 = new ScriptC_exp_f32_3(mRS, mRes, R.raw.exp_f32_3);
         doF32_3(0xab2, 3);
     }
 
     public void testExpF32_4() {
-        script_f32_4 = new ScriptC_exp_f32_4(mRS, mRes, R.raw.exp_f32_4);
         doF32_4(0x7a6, 3);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/Expm1Test.java b/tests/tests/renderscript/src/android/renderscript/cts/Expm1Test.java
index 4379462cbe4..f501c391776 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/Expm1Test.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/Expm1Test.java
@@ -22,24 +22,27 @@ import com.android.cts.stub.R;
 
 public class Expm1Test extends RSBaseCompute {
     private ScriptC_expm1_f32 script_f32;
-    private ScriptC_expm1_f32_2 script_f32_2;
-    private ScriptC_expm1_f32_3 script_f32_3;
-    private ScriptC_expm1_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_expm1_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_expm1_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_expm1_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_expm1_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_expm1_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class Expm1Test extends RSBaseCompute {
     }
 
     public void testExpm1F32() {
-        script_f32 = new ScriptC_expm1_f32(mRS, mRes, R.raw.expm1_f32);
         doF32(0xa29, 3);
     }
 
     public void testExpm1F32_2() {
-        script_f32_2 = new ScriptC_expm1_f32_2(mRS, mRes, R.raw.expm1_f32_2);
         doF32_2(0x8a2, 3);
     }
 
     public void testExpm1F32_3() {
-        script_f32_3 = new ScriptC_expm1_f32_3(mRS, mRes, R.raw.expm1_f32_3);
         doF32_3(0xa7c, 3);
     }
 
     public void testExpm1F32_4() {
-        script_f32_4 = new ScriptC_expm1_f32_4(mRS, mRes, R.raw.expm1_f32_4);
         doF32_4(0x81a, 3);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/FabsTest.java b/tests/tests/renderscript/src/android/renderscript/cts/FabsTest.java
index 481e4ed293d..a50162c241c 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/FabsTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/FabsTest.java
@@ -21,24 +21,27 @@ import com.android.cts.stub.R;
 
 public class FabsTest extends RSBaseCompute {
     private ScriptC_fabs_f32 script_f32;
-    private ScriptC_fabs_f32_2 script_f32_2;
-    private ScriptC_fabs_f32_3 script_f32_3;
-    private ScriptC_fabs_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_fabs_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_fabs_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_fabs_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_fabs_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_fabs_f32_4(mIn, mOut);
             break;
         }
     }
@@ -57,22 +60,18 @@ public class FabsTest extends RSBaseCompute {
     }
 
     public void testfabsF32() {
-        script_f32 = new ScriptC_fabs_f32(mRS, mRes, R.raw.fabs_f32);
         doF32(0xa, 0);
     }
 
     public void testfabsF32_2() {
-        script_f32_2 = new ScriptC_fabs_f32_2(mRS, mRes, R.raw.fabs_f32_2);
         doF32_2(0xb, 0);
     }
 
     public void testfabsF32_3() {
-        script_f32_3 = new ScriptC_fabs_f32_3(mRS, mRes, R.raw.fabs_f32_3);
         doF32_3(0xc, 0);
     }
 
     public void testfabsF32_4() {
-        script_f32_4 = new ScriptC_fabs_f32_4(mRS, mRes, R.raw.fabs_f32_4);
         doF32_4(0xd, 0);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/FdimTest.java b/tests/tests/renderscript/src/android/renderscript/cts/FdimTest.java
index ee19d38a610..099ca3d3346 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/FdimTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/FdimTest.java
@@ -22,25 +22,28 @@ import com.android.cts.stub.R;
 
 public class FdimTest extends RSBaseCompute {
     private ScriptC_fdim_f32 script_f32;
-    private ScriptC_fdim_f32_2 script_f32_2;
-    private ScriptC_fdim_f32_3 script_f32_3;
-    private ScriptC_fdim_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_fdim_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_fdim_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_fdim_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_fdim_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_fdim_f32_4(mIn, mOut);
             break;
         }
     }
@@ -68,28 +71,24 @@ public class FdimTest extends RSBaseCompute {
     }
 
     public void testfdimF32() {
-        script_f32 = new ScriptC_fdim_f32(mRS, mRes, R.raw.fdim_f32);
         ScriptField_fdim_f32_input floatArray = new ScriptField_fdim_f32_input(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32(0x12678, 0);
     }
 
     public void testfdimF32_2() {
-        script_f32_2 = new ScriptC_fdim_f32_2(mRS, mRes, R.raw.fdim_f32_2);
         ScriptField_fdim_f32_2_input floatArray = new ScriptField_fdim_f32_2_input(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32_2(0x1af45, 0);
     }
 
     public void testfdimF32_3() {
-        script_f32_3 = new ScriptC_fdim_f32_3(mRS, mRes, R.raw.fdim_f32_3);
         ScriptField_fdim_f32_3_input floatArray = new ScriptField_fdim_f32_3_input(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32_3(0x1cd345, 0);
     }
 
     public void testfdimF32_4() {
-        script_f32_4 = new ScriptC_fdim_f32_4(mRS, mRes, R.raw.fdim_f32_4);
         ScriptField_fdim_f32_4_input floatArray = new ScriptField_fdim_f32_4_input(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32_4(0x1ca45, 0);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/FloorTest.java b/tests/tests/renderscript/src/android/renderscript/cts/FloorTest.java
index 3068d095e05..78b819b18cd 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/FloorTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/FloorTest.java
@@ -21,24 +21,27 @@ import com.android.cts.stub.R;
 
 public class FloorTest extends RSBaseCompute {
     private ScriptC_floor_f32 script_f32;
-    private ScriptC_floor_f32_2 script_f32_2;
-    private ScriptC_floor_f32_3 script_f32_3;
-    private ScriptC_floor_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_floor_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_floor_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_floor_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_floor_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_floor_f32_4(mIn, mOut);
             break;
         }
     }
@@ -57,22 +60,18 @@ public class FloorTest extends RSBaseCompute {
     }
 
     public void testfloorF32() {
-        script_f32 = new ScriptC_floor_f32(mRS, mRes, R.raw.floor_f32);
         doF32(0xa, 0);
     }
 
     public void testfloorF32_2() {
-        script_f32_2 = new ScriptC_floor_f32_2(mRS, mRes, R.raw.floor_f32_2);
         doF32_2(0xb, 0);
     }
 
     public void testfloorF32_3() {
-        script_f32_3 = new ScriptC_floor_f32_3(mRS, mRes, R.raw.floor_f32_3);
         doF32_3(0xef1, 0);
     }
 
     public void testfloorF32_4() {
-        script_f32_4 = new ScriptC_floor_f32_4(mRS, mRes, R.raw.floor_f32_4);
         doF32_4(0xefa12, 0);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/FmaTest.java b/tests/tests/renderscript/src/android/renderscript/cts/FmaTest.java
index e68d9a142a6..2fb29b7bb19 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/FmaTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/FmaTest.java
@@ -23,25 +23,28 @@ import com.android.cts.stub.R;
 
 public class FmaTest extends RSBaseCompute {
     private ScriptC_fma_f32 script_f32;
-    private ScriptC_fma_f32_2 script_f32_2;
-    private ScriptC_fma_f32_3 script_f32_3;
-    private ScriptC_fma_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_fma_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_fma_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_fma_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_fma_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_fma_f32_4(mIn, mOut);
             break;
         }
     }
@@ -69,28 +72,24 @@ public class FmaTest extends RSBaseCompute {
     }
 
     public void testFmaF32() {
-        script_f32 = new ScriptC_fma_f32(mRS, mRes, R.raw.fma_f32);
         ScriptField_Floats floatArray = new ScriptField_Floats(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32(0xea1, 0);
     }
 
     public void testFmaF32_2() {
-        script_f32_2 = new ScriptC_fma_f32_2(mRS, mRes, R.raw.fma_f32_2);
         ScriptField_Floats2 floatArray = new ScriptField_Floats2(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32_2(0x12a, 0);
     }
 
     public void testFmaF32_3() {
-        script_f32_3 = new ScriptC_fma_f32_3(mRS, mRes, R.raw.fma_f32_3);
         ScriptField_Floats3 floatArray = new ScriptField_Floats3(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32_3(0xfae, 0);
     }
 
     public void testFmaF32_4() {
-        script_f32_4 = new ScriptC_fma_f32_4(mRS, mRes, R.raw.fma_f32_4);
         ScriptField_Floats4 floatArray = new ScriptField_Floats4(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32_4(0x87a, 0);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/FmaxTest.java b/tests/tests/renderscript/src/android/renderscript/cts/FmaxTest.java
index 5c2a9d349d0..eca16a067d4 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/FmaxTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/FmaxTest.java
@@ -22,25 +22,28 @@ import com.android.cts.stub.R;
 
 public class FmaxTest extends RSBaseCompute {
     private ScriptC_fmax_f32 script_f32;
-    private ScriptC_fmax_f32_2 script_f32_2;
-    private ScriptC_fmax_f32_3 script_f32_3;
-    private ScriptC_fmax_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_fmax_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation max, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_fmax_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_fmax_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_fmax_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_fmax_f32_4(mIn, mOut);
             break;
         }
     }
@@ -68,28 +71,24 @@ public class FmaxTest extends RSBaseCompute {
     }
 
     public void testfmaxF32() {
-        script_f32 = new ScriptC_fmax_f32(mRS, mRes, R.raw.fmax_f32);
         ScriptField_fmax_f32_in in = new ScriptField_fmax_f32_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x12678, 0);
     }
 
     public void testfmaxF32_2() {
-        script_f32_2 = new ScriptC_fmax_f32_2(mRS, mRes, R.raw.fmax_f32_2);
         ScriptField_fmax_f32_2_in in = new ScriptField_fmax_f32_2_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_2(0x12ace, 0);
     }
 
     public void testfmaxF32_3() {
-        script_f32_3 = new ScriptC_fmax_f32_3(mRS, mRes, R.raw.fmax_f32_3);
         ScriptField_fmax_f32_3_in in = new ScriptField_fmax_f32_3_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0x12e8, 0);
     }
 
     public void testfmaxF32_4() {
-        script_f32_4 = new ScriptC_fmax_f32_4(mRS, mRes, R.raw.fmax_f32_4);
         ScriptField_fmax_f32_4_in in = new ScriptField_fmax_f32_4_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0xeac, 0);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/FminTest.java b/tests/tests/renderscript/src/android/renderscript/cts/FminTest.java
index 179edd79a39..da90e14dd22 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/FminTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/FminTest.java
@@ -22,25 +22,28 @@ import com.android.cts.stub.R;
 
 public class FminTest extends RSBaseCompute {
     private ScriptC_fmin_f32 script_f32;
-    private ScriptC_fmin_f32_2 script_f32_2;
-    private ScriptC_fmin_f32_3 script_f32_3;
-    private ScriptC_fmin_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_fmin_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_fmin_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_fmin_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_fmin_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_fmin_f32_4(mIn, mOut);
             break;
         }
     }
@@ -68,28 +71,24 @@ public class FminTest extends RSBaseCompute {
     }
 
     public void testfminF32() {
-        script_f32 = new ScriptC_fmin_f32(mRS, mRes, R.raw.fmin_f32);
         ScriptField_fmin_f32_in in = new ScriptField_fmin_f32_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x12678, 0);
     }
 
     public void testfminF32_2() {
-        script_f32_2 = new ScriptC_fmin_f32_2(mRS, mRes, R.raw.fmin_f32_2);
         ScriptField_fmin_f32_2_in in = new ScriptField_fmin_f32_2_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_2(0x12ace, 0);
     }
 
     public void testfminF32_3() {
-        script_f32_3 = new ScriptC_fmin_f32_3(mRS, mRes, R.raw.fmin_f32_3);
         ScriptField_fmin_f32_3_in in = new ScriptField_fmin_f32_3_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0x12e8, 0);
     }
 
     public void testfminF32_4() {
-        script_f32_4 = new ScriptC_fmin_f32_4(mRS, mRes, R.raw.fmin_f32_4);
         ScriptField_fmin_f32_4_in in = new ScriptField_fmin_f32_4_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0xeac, 0);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/FmodTest.java b/tests/tests/renderscript/src/android/renderscript/cts/FmodTest.java
index 0cd49b5ddf4..47fe202de2b 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/FmodTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/FmodTest.java
@@ -23,25 +23,28 @@ import com.android.cts.stub.R;
 
 public class FmodTest extends RSBaseCompute {
     private ScriptC_fmod_f32 script_f32;
-    private ScriptC_fmod_f32_2 script_f32_2;
-    private ScriptC_fmod_f32_3 script_f32_3;
-    private ScriptC_fmod_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_fmod_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_fmod_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_fmod_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_fmod_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_fmod_f32_4(mIn, mOut);
             break;
         }
     }
@@ -72,7 +75,6 @@ public class FmodTest extends RSBaseCompute {
      * This method is used for testing the fmod() function with F32
      */
     public void testfmodF32() {
-        script_f32 = new ScriptC_fmod_f32(mRS, mRes, R.raw.fmod_f32);
         ScriptField_fmod_input_f32 floatArray = new ScriptField_fmod_input_f32(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32(0x12345678, 0);
@@ -82,7 +84,6 @@ public class FmodTest extends RSBaseCompute {
      * This method is used for testing the fmod() function with F32_2
      */
     public void testfmodF32_2() {
-        script_f32_2 = new ScriptC_fmod_f32_2(mRS, mRes, R.raw.fmod_f32_2);
         ScriptField_fmod_input_f32_2 floatArray = new ScriptField_fmod_input_f32_2(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32_2(0x12345, 0);
@@ -92,7 +93,6 @@ public class FmodTest extends RSBaseCompute {
      * This method is used for testing the fmod() function with F32_3
      */
     public void testfmodF32_3() {
-        script_f32_3 = new ScriptC_fmod_f32_3(mRS, mRes, R.raw.fmod_f32_3);
         ScriptField_fmod_input_f32_3 floatArray = new ScriptField_fmod_input_f32_3(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32_3(0x12345, 0);
@@ -102,7 +102,6 @@ public class FmodTest extends RSBaseCompute {
      * This method is used for testing the fmod() function with F32_4
      */
     public void testfmodF32_4() {
-        script_f32_4 = new ScriptC_fmod_f32_4(mRS, mRes, R.raw.fmod_f32_4);
         ScriptField_fmod_input_f32_4 floatArray = new ScriptField_fmod_input_f32_4(mRS, INPUTSIZE);
         mIn = floatArray.getAllocation();
         doF32_4(0x12345, 0);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/HypotTest.java b/tests/tests/renderscript/src/android/renderscript/cts/HypotTest.java
index ffe0399dfc8..f6a280f05a3 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/HypotTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/HypotTest.java
@@ -23,25 +23,28 @@ import com.android.cts.stub.R;
 
 public class HypotTest extends RSBaseCompute {
     private ScriptC_hypot_f32 script_f32;
-    private ScriptC_hypot_f32_2 script_f32_2;
-    private ScriptC_hypot_f32_3 script_f32_3;
-    private ScriptC_hypot_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_hypot_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_hypot_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_hypot_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_hypot_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_hypot_f32_4(mIn, mOut);
             break;
         }
     }
@@ -69,28 +72,24 @@ public class HypotTest extends RSBaseCompute {
     }
 
     public void testHypotF32() {
-        script_f32 = new ScriptC_hypot_f32(mRS, mRes, R.raw.hypot_f32);
         ScriptField_hypot_f32_in in = new ScriptField_hypot_f32_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x123678, 4);
     }
 
     public void testHypotF32_2() {
-        script_f32_2 = new ScriptC_hypot_f32_2(mRS, mRes, R.raw.hypot_f32_2);
         ScriptField_hypot_f32_2_in in = new ScriptField_hypot_f32_2_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_2(0x1234a5, 4);
     }
 
     public void testHypotF32_3() {
-        script_f32_3 = new ScriptC_hypot_f32_3(mRS, mRes, R.raw.hypot_f32_3);
         ScriptField_hypot_f32_3_in in = new ScriptField_hypot_f32_3_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0x1af345, 4);
     }
 
     public void testHypotF32_4() {
-        script_f32_4 = new ScriptC_hypot_f32_4(mRS, mRes, R.raw.hypot_f32_4);
         ScriptField_hypot_f32_4_in in = new ScriptField_hypot_f32_4_in(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0x12ce45, 4);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/IsObjectTest.java b/tests/tests/renderscript/src/android/renderscript/cts/IsObjectTest.java
index fffaa5c1bc1..58ae448ac30 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/IsObjectTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/IsObjectTest.java
@@ -36,6 +36,8 @@ public class IsObjectTest extends RSBaseCompute {
     Sampler sampler;
     Script script;
 
+    private ScriptC_is_object ms_is_object;
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -45,7 +47,8 @@ public class IsObjectTest extends RSBaseCompute {
         type = new Type.Builder(mRS, Element.I8(mRS)).setX(1).create();
         allocation = Allocation.createTyped(mRS, type);
         sampler = new Sampler.Builder(mRS).create();
-        script = new ScriptC_is_object_element(mRS, mRes, R.raw.is_object_element);
+        script = new ScriptC_is_object(mRS);
+        ms_is_object = new ScriptC_is_object(mRS);
     }
 
     /**
@@ -61,10 +64,8 @@ public class IsObjectTest extends RSBaseCompute {
 
         mIn = filed.getAllocation();
         mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ScriptC_is_object_element mScript = new ScriptC_is_object_element(mRS, mRes,
-                R.raw.is_object_element);
         try {
-            mScript.forEach_root(mIn, mOut);
+            ms_is_object.forEach_is_object_element(mIn, mOut);
         } catch (RSRuntimeException e) {
             Log.i("compare", "rsIsObject root fail");
         }
@@ -83,11 +84,9 @@ public class IsObjectTest extends RSBaseCompute {
 
         mIn = filed.getAllocation();
         mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ScriptC_is_object_type mScript = new ScriptC_is_object_type(mRS, mRes,
-                R.raw.is_object_type);
 
         try {
-            mScript.forEach_root(mIn, mOut);
+            ms_is_object.forEach_is_object_type(mIn, mOut);
         } catch (RSRuntimeException e) {
             Log.i("compare", "rsIsObject root fail");
         }
@@ -109,11 +108,9 @@ public class IsObjectTest extends RSBaseCompute {
 
         mIn = filed.getAllocation();
         mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ScriptC_is_object_allocation mScript = new ScriptC_is_object_allocation(mRS,
-                mRes, R.raw.is_object_allocation);
 
         try {
-            mScript.forEach_root(mIn, mOut);
+            ms_is_object.forEach_is_object_allocation(mIn, mOut);
         } catch (RSRuntimeException e) {
             Log.i("compare", "rsIsObject root fail");
         }
@@ -134,11 +131,9 @@ public class IsObjectTest extends RSBaseCompute {
 
         mIn = filed.getAllocation();
         mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ScriptC_is_object_sampler mScript = new ScriptC_is_object_sampler(mRS, mRes,
-                R.raw.is_object_sampler);
 
         try {
-            mScript.forEach_root(mIn, mOut);
+            ms_is_object.forEach_is_object_sampler(mIn, mOut);
         } catch (RSRuntimeException e) {
             Log.i("compare", "rsIsObject root fail");
         }
@@ -158,11 +153,9 @@ public class IsObjectTest extends RSBaseCompute {
 
         mIn = filed.getAllocation();
         mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ScriptC_is_object_script mScript = new ScriptC_is_object_script(mRS, mRes,
-                R.raw.is_object_script);
 
         try {
-            mScript.forEach_root(mIn, mOut);
+            ms_is_object.forEach_is_object_script(mIn, mOut);
         } catch (RSRuntimeException e) {
             Log.i("compare", "rsIsObject root fail");
         }
@@ -172,4 +165,4 @@ public class IsObjectTest extends RSBaseCompute {
         Assert.assertTrue("rsIsObject script test fail: " + "Expect 1;value "
                 + tmpArray[0], tmpArray[0] == 1);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/Log10Test.java b/tests/tests/renderscript/src/android/renderscript/cts/Log10Test.java
index 7fd94cefa64..823366b86a8 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/Log10Test.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/Log10Test.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class Log10Test extends RSBaseCompute {
     private ScriptC_log10_f32 script_f32;
-    private ScriptC_log10_f32_2 script_f32_2;
-    private ScriptC_log10_f32_3 script_f32_3;
-    private ScriptC_log10_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_log10_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_log10_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_log10_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_log10_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_log10_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class Log10Test extends RSBaseCompute {
     }
 
     public void testLog10F32() {
-        script_f32 = new ScriptC_log10_f32(mRS, mRes, R.raw.log10_f32);
         doF32(0x13, 3);
     }
 
     public void testLog10F32_2() {
-        script_f32_2 = new ScriptC_log10_f32_2(mRS, mRes, R.raw.log10_f32_2);
         doF32_2(0xf, 3);
     }
 
     public void testLog10F32_3() {
-        script_f32_3 = new ScriptC_log10_f32_3(mRS, mRes, R.raw.log10_f32_3);
         doF32_3(0xa, 3);
     }
 
     public void testLog10F32_4() {
-        script_f32_4 = new ScriptC_log10_f32_4(mRS, mRes, R.raw.log10_f32_4);
         doF32_4(0xf3, 3);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/Log1PTest.java b/tests/tests/renderscript/src/android/renderscript/cts/Log1PTest.java
index 0c15c1f9bcd..55e98de49b3 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/Log1PTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/Log1PTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class Log1PTest extends RSBaseCompute {
     private ScriptC_log1p_f32 script_f32;
-    private ScriptC_log1p_f32_2 script_f32_2;
-    private ScriptC_log1p_f32_3 script_f32_3;
-    private ScriptC_log1p_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_log1p_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_log1p_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_log1p_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_log1p_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_log1p_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class Log1PTest extends RSBaseCompute {
     }
 
     public void testLog1PF32() {
-        script_f32 = new ScriptC_log1p_f32(mRS, mRes, R.raw.log1p_f32);
         doF32(0xab, 2);
     }
 
     public void testLog1PF32_2() {
-        script_f32_2 = new ScriptC_log1p_f32_2(mRS, mRes, R.raw.log1p_f32_2);
         doF32_2(0x12, 2);
     }
 
     public void testLog1PF32_3() {
-        script_f32_3 = new ScriptC_log1p_f32_3(mRS, mRes, R.raw.log1p_f32_3);
         doF32_3(0xa1, 2);
     }
 
     public void testLog1PF32_4() {
-    script_f32_4 = new ScriptC_log1p_f32_4(mRS, mRes, R.raw.log1p_f32_4);
         doF32_4(0xbae, 2);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/Log2Test.java b/tests/tests/renderscript/src/android/renderscript/cts/Log2Test.java
index 10f9bebbded..9bbd3fbcb80 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/Log2Test.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/Log2Test.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class Log2Test extends RSBaseCompute {
     private ScriptC_log2_f32 script_f32;
-    private ScriptC_log2_f32_2 script_f32_2;
-    private ScriptC_log2_f32_3 script_f32_3;
-    private ScriptC_log2_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_log2_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_log2_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_log2_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_log2_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_log2_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class Log2Test extends RSBaseCompute {
     }
 
     public void testLog2F32() {
-        script_f32 = new ScriptC_log2_f32(mRS, mRes, R.raw.log2_f32);
         doF32(0x18a, 3);
     }
 
     public void testLog2F32_2() {
-        script_f32_2 = new ScriptC_log2_f32_2(mRS, mRes, R.raw.log2_f32_2);
         doF32_2(0xfa, 3);
     }
 
     public void testLog2F32_3() {
-        script_f32_3 = new ScriptC_log2_f32_3(mRS, mRes, R.raw.log2_f32_3);
         doF32_3(0xaef, 3);
     }
 
     public void testLog2F32_4() {
-        script_f32_4 = new ScriptC_log2_f32_4(mRS, mRes, R.raw.log2_f32_4);
         doF32_4(0xae62, 3);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/LogTest.java b/tests/tests/renderscript/src/android/renderscript/cts/LogTest.java
index d43d1dff0d7..462f6825630 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/LogTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/LogTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class LogTest extends RSBaseCompute {
     private ScriptC_log_f32 script_f32;
-    private ScriptC_log_f32_2 script_f32_2;
-    private ScriptC_log_f32_3 script_f32_3;
-    private ScriptC_log_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_log_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_log_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_log_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_log_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_log_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class LogTest extends RSBaseCompute {
     }
 
     public void testLogF32() {
-        script_f32 = new ScriptC_log_f32(mRS, mRes, R.raw.log_f32);
         doF32(0xfae, 3);
     }
 
     public void testLogF32_2() {
-        script_f32_2 = new ScriptC_log_f32_2(mRS, mRes, R.raw.log_f32_2);
         doF32_2(0x123, 3);
     }
 
     public void testLogF32_3() {
-        script_f32_3 = new ScriptC_log_f32_3(mRS, mRes, R.raw.log_f32_3);
         doF32_3(0xab4, 3);
     }
 
     public void testLogF32_4() {
-        script_f32_4 = new ScriptC_log_f32_4(mRS, mRes, R.raw.log_f32_4);
         doF32_4(0xfa3, 3);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/LogbTest.java b/tests/tests/renderscript/src/android/renderscript/cts/LogbTest.java
index b8ae32ebd59..1be03fb9a4f 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/LogbTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/LogbTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class LogbTest extends RSBaseCompute {
     private ScriptC_logb_f32 script_f32;
-    private ScriptC_logb_f32_2 script_f32_2;
-    private ScriptC_logb_f32_3 script_f32_3;
-    private ScriptC_logb_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_logb_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_logb_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_logb_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_logb_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_logb_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class LogbTest extends RSBaseCompute {
     }
 
     public void testLogbF32() {
-        script_f32 = new ScriptC_logb_f32(mRS, mRes, R.raw.logb_f32);
         doF32(0xe, 0);
     }
 
     public void testLogbF32_2() {
-        script_f32_2 = new ScriptC_logb_f32_2(mRS, mRes, R.raw.logb_f32_2);
         doF32_2(0xa1, 0);
     }
 
     public void testLogbF32_3() {
-        script_f32_3 = new ScriptC_logb_f32_3(mRS, mRes, R.raw.logb_f32_3);
         doF32_3(0xab2, 0);
     }
 
     public void testLogbF32_4() {
-        script_f32_4 = new ScriptC_logb_f32_4(mRS, mRes, R.raw.logb_f32_4);
         doF32_4(0xaa2, 0);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/MadTest.java b/tests/tests/renderscript/src/android/renderscript/cts/MadTest.java
index 554b8328c34..8ab3db25f28 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/MadTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/MadTest.java
@@ -23,25 +23,28 @@ import com.android.cts.stub.R;
 
 public class MadTest extends RSBaseCompute {
     private ScriptC_mad_f32 script_f32;
-    private ScriptC_mad_f32_2 script_f32_2;
-    private ScriptC_mad_f32_3 script_f32_3;
-    private ScriptC_mad_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_mad_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_mad_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_mad_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_mad_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_mad_f32_4(mIn, mOut);
             break;
         }
     }
@@ -69,28 +72,24 @@ public class MadTest extends RSBaseCompute {
     }
 
     public void testMadF32() {
-        script_f32 = new ScriptC_mad_f32(mRS, mRes, R.raw.mad_f32);
         ScriptField_mad_input_f32 in = new ScriptField_mad_input_f32(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x123678, 4);
     }
 
     public void testMadF32_2() {
-        script_f32_2 = new ScriptC_mad_f32_2(mRS, mRes, R.raw.mad_f32_2);
         ScriptField_mad_input_f32_2 in = new ScriptField_mad_input_f32_2(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_2(0x1234a5, 4);
     }
 
     public void testMadF32_3() {
-        script_f32_3 = new ScriptC_mad_f32_3(mRS, mRes, R.raw.mad_f32_3);
         ScriptField_mad_input_f32_3 in = new ScriptField_mad_input_f32_3(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0x1af345, 4);
     }
 
     public void testMadF32_4() {
-        script_f32_4 = new ScriptC_mad_f32_4(mRS, mRes, R.raw.mad_f32_4);
         ScriptField_mad_input_f32_4 in = new ScriptField_mad_input_f32_4(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0x12ce45, 4);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/NextafterTest.java b/tests/tests/renderscript/src/android/renderscript/cts/NextafterTest.java
index ad7558aa920..a36aa0e658a 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/NextafterTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/NextafterTest.java
@@ -23,25 +23,28 @@ import com.android.cts.stub.R;
 
 public class NextafterTest extends RSBaseCompute {
     private ScriptC_nextafter_f32 script_f32;
-    private ScriptC_nextafter_f32_2 script_f32_2;
-    private ScriptC_nextafter_f32_3 script_f32_3;
-    private ScriptC_nextafter_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_nextafter_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_nextafter_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_nextafter_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_nextafter_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_nextafter_f32_4(mIn, mOut);
             break;
         }
     }
@@ -69,28 +72,24 @@ public class NextafterTest extends RSBaseCompute {
     }
 
     public void testNextafterF32() {
-        script_f32 = new ScriptC_nextafter_f32(mRS, mRes, R.raw.nextafter_f32);
         ScriptField_InputData inputDataArray = new ScriptField_InputData(mRS, INPUTSIZE);
         mIn = inputDataArray.getAllocation();
         doF32(0x12678, 0);
     }
 
     public void testNextafterF32_2() {
-        script_f32_2 = new ScriptC_nextafter_f32_2(mRS, mRes, R.raw.nextafter_f32_2);
         ScriptField_InputData_2 inputDataArray = new ScriptField_InputData_2(mRS, INPUTSIZE);
         mIn = inputDataArray.getAllocation();
         doF32_2(0x1af45, 0);
     }
 
     public void testNextafterF32_3() {
-        script_f32_3 = new ScriptC_nextafter_f32_3(mRS, mRes, R.raw.nextafter_f32_3);
         ScriptField_InputData_3 inputDataArray = new ScriptField_InputData_3(mRS, INPUTSIZE);
         mIn = inputDataArray.getAllocation();
         doF32_3(0x1cd345, 0);
     }
 
     public void testNextafterF32_4() {
-        script_f32_4 = new ScriptC_nextafter_f32_4(mRS, mRes, R.raw.nextafter_f32_4);
         ScriptField_InputData_4 inputDataArray = new ScriptField_InputData_4(mRS, INPUTSIZE);
         mIn = inputDataArray.getAllocation();
         doF32_4(0x1ca45, 0);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/PowTest.java b/tests/tests/renderscript/src/android/renderscript/cts/PowTest.java
index 8ed7f1d8164..b5ea9fa79b4 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/PowTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/PowTest.java
@@ -23,25 +23,28 @@ import com.android.cts.stub.R;
 
 public class PowTest extends RSBaseCompute {
     private ScriptC_pow_f32 script_f32;
-    private ScriptC_pow_f32_2 script_f32_2;
-    private ScriptC_pow_f32_3 script_f32_3;
-    private ScriptC_pow_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_pow_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_pow_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_pow_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_pow_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_pow_f32_4(mIn, mOut);
             break;
         }
     }
@@ -75,28 +78,24 @@ public class PowTest extends RSBaseCompute {
     }
 
     public void testPowF32() {
-        script_f32 = new ScriptC_pow_f32(mRS, mRes, R.raw.pow_f32);
         ScriptField_PowInputData in = new ScriptField_PowInputData(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x12345678, 16);
     }
 
     public void testPowF32_2() {
-        script_f32_2 = new ScriptC_pow_f32_2(mRS, mRes, R.raw.pow_f32_2);
         ScriptField_PowInputData_2 in = new ScriptField_PowInputData_2(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_2(0x12ab78, 16);
     }
 
     public void testPowF32_3() {
-        script_f32_3 = new ScriptC_pow_f32_3(mRS, mRes, R.raw.pow_f32_3);
         ScriptField_PowInputData_3 in = new ScriptField_PowInputData_3(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0x1f5678, 16);
     }
 
     public void testPowF32_4() {
-        script_f32_4 = new ScriptC_pow_f32_4(mRS, mRes, R.raw.pow_f32_4);
         ScriptField_PowInputData_4 in = new ScriptField_PowInputData_4(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0xc678, 16);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/PownTest.java b/tests/tests/renderscript/src/android/renderscript/cts/PownTest.java
index 4af3d2b5031..b149347a92f 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/PownTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/PownTest.java
@@ -23,25 +23,28 @@ import com.android.cts.stub.R;
 
 public class PownTest extends RSBaseCompute {
     private ScriptC_pown_f32 script_f32;
-    private ScriptC_pown_f32_2 script_f32_2;
-    private ScriptC_pown_f32_3 script_f32_3;
-    private ScriptC_pown_f32_4 script_f32_4;
     private int[] n;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_pown_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_pown_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_pown_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_pown_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_pown_f32_4(mIn, mOut);
             break;
         }
     }
@@ -60,49 +63,45 @@ public class PownTest extends RSBaseCompute {
     }
 
     public void testPownF32() {
-        script_f32 = new ScriptC_pown_f32(mRS, mRes, R.raw.pown_f32);
         Allocation nAlloc = Allocation.createSized(mRS, Element.I32(mRS), INPUTSIZE);
 
         n = new int[INPUTSIZE];
         RSUtils.genRandom(0x12345678, 32, 1, -16, n);
         nAlloc.copyFrom(n);
-        script_f32.set_n(nAlloc);
+        script_f32.set_n1(nAlloc);
 
         doF32(0x716acd, 16);
     }
 
     public void testPownF32_2() {
-        script_f32_2 = new ScriptC_pown_f32_2(mRS, mRes, R.raw.pown_f32_2);
         Allocation nAlloc = Allocation.createSized(mRS, Element.I32_2(mRS), INPUTSIZE);
 
         n = new int[INPUTSIZE*2];
         RSUtils.genRandom(0xacdef1, 32, 1, -16, n);
         nAlloc.copyFrom(n);
-        script_f32_2.set_n(nAlloc);
+        script_f32.set_n2(nAlloc);
 
         doF32_2(0xacdef1, 16);
     }
 
     public void testPownF32_3() {
-        script_f32_3 = new ScriptC_pown_f32_3(mRS, mRes, R.raw.pown_f32_3);
         Allocation nAlloc = Allocation.createSized(mRS, Element.I32_3(mRS), INPUTSIZE);
 
         n = new int[INPUTSIZE*4];
         RSUtils.genRandom(0xa123f1, 32, 1, -16, n, 4, 1);
         nAlloc.copyFrom(n);
-        script_f32_3.set_n(nAlloc);
+        script_f32.set_n3(nAlloc);
 
         doF32_3(0xaac3f1, 16);
     }
 
     public void testPownF32_4() {
-        script_f32_4 = new ScriptC_pown_f32_4(mRS, mRes, R.raw.pown_f32_4);
         Allocation nAlloc = Allocation.createSized(mRS, Element.I32_4(mRS), INPUTSIZE);
 
         n = new int[INPUTSIZE*4];
         RSUtils.genRandom(0x4323ca, 32, 1, -16, n);
         nAlloc.copyFrom(n);
-        script_f32_4.set_n(nAlloc);
+        script_f32.set_n4(nAlloc);
 
         doF32_4(0xaa12f1, 16);
     }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/PowrTest.java b/tests/tests/renderscript/src/android/renderscript/cts/PowrTest.java
index 4339e6b1452..5c75a040082 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/PowrTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/PowrTest.java
@@ -23,25 +23,28 @@ import com.android.cts.stub.R;
 
 public class PowrTest extends RSBaseCompute {
     private ScriptC_powr_f32 script_f32;
-    private ScriptC_powr_f32_2 script_f32_2;
-    private ScriptC_powr_f32_3 script_f32_3;
-    private ScriptC_powr_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_powr_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_powr_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_powr_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_powr_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_powr_f32_4(mIn, mOut);
             break;
         }
     }
@@ -75,28 +78,24 @@ public class PowrTest extends RSBaseCompute {
     }
 
     public void testPowrF32() {
-        script_f32 = new ScriptC_powr_f32(mRS, mRes, R.raw.powr_f32);
         ScriptField_PowInputData in = new ScriptField_PowInputData(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x12345678, 16);
     }
 
     public void testPowrF32_2() {
-        script_f32_2 = new ScriptC_powr_f32_2(mRS, mRes, R.raw.powr_f32_2);
         ScriptField_PowInputData_2 in = new ScriptField_PowInputData_2(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_2(0x12ab78, 16);
     }
 
     public void testPowrF32_3() {
-        script_f32_3 = new ScriptC_powr_f32_3(mRS, mRes, R.raw.powr_f32_3);
         ScriptField_PowInputData_3 in = new ScriptField_PowInputData_3(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0x1f5678, 16);
     }
 
     public void testPowrF32_4() {
-        script_f32_4 = new ScriptC_powr_f32_4(mRS, mRes, R.raw.powr_f32_4);
         ScriptField_PowInputData_4 in = new ScriptField_PowInputData_4(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0xc678, 16);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RadiansTest.java b/tests/tests/renderscript/src/android/renderscript/cts/RadiansTest.java
index a12b13e8c82..f8a6936d95b 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RadiansTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RadiansTest.java
@@ -21,25 +21,28 @@ import android.renderscript.Allocation;
 import android.renderscript.RSRuntimeException;
 
 public class RadiansTest extends RSBaseCompute {
-    private ScriptC_rad_f32 script_f32;
-    private ScriptC_rad_f32_2 script_f32_2;
-    private ScriptC_rad_f32_3 script_f32_3;
-    private ScriptC_rad_f32_4 script_f32_4;
+    private ScriptC_radians_f32 script_f32;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_radians_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_radians_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_radians_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_radians_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_radians_f32_4(mIn, mOut);
             break;
         }
     }
@@ -62,7 +65,6 @@ public class RadiansTest extends RSBaseCompute {
      * radians test for float
      */
     public void testRadiansF32() {
-        script_f32 = new ScriptC_rad_f32(mRS, mRes, R.raw.rad_f32);
         doF32(0x1234f678, 3);
     }
 
@@ -70,7 +72,6 @@ public class RadiansTest extends RSBaseCompute {
      * radians test for float2
      */
     public void testRadiansF32_2() {
-        script_f32_2 = new ScriptC_rad_f32_2(mRS, mRes, R.raw.rad_f32_2);
         doF32_2(0x12345678, 3);
     }
 
@@ -78,7 +79,6 @@ public class RadiansTest extends RSBaseCompute {
      * radians test for float3
      */
     public void testRadiansF32_3() {
-        script_f32_3 = new ScriptC_rad_f32_3(mRS, mRes, R.raw.rad_f32_3);
         doF32_3(0x123d5678, 3);
     }
 
@@ -86,7 +86,6 @@ public class RadiansTest extends RSBaseCompute {
      * radians test for float4
      */
     public void testRadiansF32_4() {
-        script_f32_4 = new ScriptC_rad_f32_4(mRS, mRes, R.raw.rad_f32_4);
         doF32_4(0x123a5678, 3);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RemainderTest.java b/tests/tests/renderscript/src/android/renderscript/cts/RemainderTest.java
index e0968395b9b..8abdafe24c3 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RemainderTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RemainderTest.java
@@ -23,25 +23,28 @@ import com.android.cts.stub.R;
 
 public class RemainderTest extends RSBaseCompute {
     private ScriptC_remainder_f32 script_f32;
-    private ScriptC_remainder_f32_2 script_f32_2;
-    private ScriptC_remainder_f32_3 script_f32_3;
-    private ScriptC_remainder_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_remainder_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_remainder_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_remainder_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_remainder_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_remainder_f32_4(mIn, mOut);
             break;
         }
     }
@@ -71,28 +74,24 @@ public class RemainderTest extends RSBaseCompute {
     }
 
     public void testRemainderF32() {
-        script_f32 = new ScriptC_remainder_f32(mRS, mRes, R.raw.remainder_f32);
         ScriptField_remainder_f32 in = new ScriptField_remainder_f32(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x123678, 0);
     }
 
     public void testRemainderF32_2() {
-        script_f32_2 = new ScriptC_remainder_f32_2(mRS, mRes, R.raw.remainder_f32_2);
         ScriptField_remainder_f32_2 in = new ScriptField_remainder_f32_2(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_2(0x1234a5, 0);
     }
 
     public void testRemainderF32_3() {
-        script_f32_3 = new ScriptC_remainder_f32_3(mRS, mRes, R.raw.remainder_f32_3);
         ScriptField_remainder_f32_3 in = new ScriptField_remainder_f32_3(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0x1af345, 0);
     }
 
     public void testRemainderF32_4() {
-        script_f32_4 = new ScriptC_remainder_f32_4(mRS, mRes, R.raw.remainder_f32_4);
         ScriptField_remainder_f32_4 in = new ScriptField_remainder_f32_4(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0x12ce45, 0);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RintTest.java b/tests/tests/renderscript/src/android/renderscript/cts/RintTest.java
index 150d3ef919a..2efef4417a6 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RintTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RintTest.java
@@ -21,26 +21,29 @@ import android.renderscript.Allocation;
 import android.renderscript.RSRuntimeException;
 
 public class RintTest extends RSBaseCompute {
-    private ScriptC_rint_f32 ms_f32;
-    private ScriptC_rint_f32_2 ms_f32_2;
-    private ScriptC_rint_f32_3 ms_f32_3;
-    private ScriptC_rint_f32_4 ms_f32_4;
+    private ScriptC_rint_f32 script_f32;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_rint_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut)
             throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            ms_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_rint_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            ms_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_rint_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            ms_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_rint_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            ms_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_rint_f32_4(mIn, mOut);
             break;
         }
     }
@@ -62,7 +65,6 @@ public class RintTest extends RSBaseCompute {
      * rint test for float
      */
     public void testRintF32() {
-        ms_f32 = new ScriptC_rint_f32(mRS, mRes, R.raw.rint_f32);
         doF32(0x12345678, 0);
     }
 
@@ -70,7 +72,6 @@ public class RintTest extends RSBaseCompute {
      * rint test for float2
      */
     public void testRintF32_2() {
-        ms_f32_2 = new ScriptC_rint_f32_2(mRS, mRes, R.raw.rint_f32_2);
         doF32_2(0x12ab5678, 0);
     }
 
@@ -78,7 +79,6 @@ public class RintTest extends RSBaseCompute {
      * rint test for float3
      */
     public void testRintF32_3() {
-        ms_f32_3 = new ScriptC_rint_f32_3(mRS, mRes, R.raw.rint_f32_3);
         doF32_3(0x123ac678, 0);
     }
 
@@ -86,7 +86,6 @@ public class RintTest extends RSBaseCompute {
      * rint test for float4
      */
     public void testRintF32_4() {
-        ms_f32_4 = new ScriptC_rint_f32_4(mRS, mRes, R.raw.rint_f32_4);
         doF32_4(0x1f345678, 0);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RootnTest.java b/tests/tests/renderscript/src/android/renderscript/cts/RootnTest.java
index dd074edb916..1b2c46b2cd4 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RootnTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RootnTest.java
@@ -23,25 +23,28 @@ import com.android.cts.stub.R;
 
 public class RootnTest extends RSBaseCompute {
     private ScriptC_rootn_f32 script_f32;
-    private ScriptC_rootn_f32_2 script_f32_2;
-    private ScriptC_rootn_f32_3 script_f32_3;
-    private ScriptC_rootn_f32_4 script_f32_4;
     private int[] n;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_rootn_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_rootn_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_rootn_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_rootn_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_rootn_f32_4(mIn, mOut);
             break;
         }
     }
@@ -60,49 +63,45 @@ public class RootnTest extends RSBaseCompute {
     }
 
     public void testRootnF32() {
-        script_f32 = new ScriptC_rootn_f32(mRS, mRes, R.raw.rootn_f32);
         Allocation nAlloc = Allocation.createSized(mRS, Element.I32(mRS), INPUTSIZE);
 
         n = new int[INPUTSIZE];
         RSUtils.genRandom(0x12345678, 32, 1, 1, n);
         nAlloc.copyFrom(n);
-        script_f32.set_n(nAlloc);
+        script_f32.set_n1(nAlloc);
 
         doF32(0x716acd, 16);
     }
 
     public void testRootnF32_2() {
-        script_f32_2 = new ScriptC_rootn_f32_2(mRS, mRes, R.raw.rootn_f32_2);
         Allocation nAlloc = Allocation.createSized(mRS, Element.I32_2(mRS), INPUTSIZE);
 
         n = new int[INPUTSIZE*2];
         RSUtils.genRandom(0xacdef1, 32, 1, 1, n);
         nAlloc.copyFrom(n);
-        script_f32_2.set_n(nAlloc);
+        script_f32.set_n2(nAlloc);
 
         doF32_2(0xacdef1, 16);
     }
 
     public void testRootnF32_3() {
-        script_f32_3 = new ScriptC_rootn_f32_3(mRS, mRes, R.raw.rootn_f32_3);
         Allocation nAlloc = Allocation.createSized(mRS, Element.I32_3(mRS), INPUTSIZE);
 
         n = new int[INPUTSIZE*4];
         RSUtils.genRandom(0xa123f1, 32, 1, 1, n, 4, 1);
         nAlloc.copyFrom(n);
-        script_f32_3.set_n(nAlloc);
+        script_f32.set_n3(nAlloc);
 
         doF32_3(0xaac3f1, 16);
     }
 
     public void testRootnF32_4() {
-        script_f32_4 = new ScriptC_rootn_f32_4(mRS, mRes, R.raw.rootn_f32_4);
         Allocation nAlloc = Allocation.createSized(mRS, Element.I32_4(mRS), INPUTSIZE);
 
         n = new int[INPUTSIZE*4];
         RSUtils.genRandom(0x4323ca, 32, 1, 1, n);
         nAlloc.copyFrom(n);
-        script_f32_4.set_n(nAlloc);
+        script_f32.set_n4(nAlloc);
 
         doF32_4(0xaa12f1, 16);
     }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RoundTest.java b/tests/tests/renderscript/src/android/renderscript/cts/RoundTest.java
index ac8f6fc70bc..90f155b939a 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RoundTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RoundTest.java
@@ -21,26 +21,29 @@ import android.renderscript.Allocation;
 import android.renderscript.RSRuntimeException;
 
 public class RoundTest extends RSBaseCompute {
-    private ScriptC_round_f32 ms_f32;
-    private ScriptC_round_f32_2 ms_f32_2;
-    private ScriptC_round_f32_3 ms_f32_3;
-    private ScriptC_round_f32_4 ms_f32_4;
+    private ScriptC_round_f32 script_f32;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_round_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut)
             throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            ms_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_round_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            ms_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_round_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            ms_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_round_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            ms_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_round_f32_4(mIn, mOut);
             break;
         }
     }
@@ -70,7 +73,6 @@ public class RoundTest extends RSBaseCompute {
      * round test for float
      */
     public void testRoundF32() {
-        ms_f32 = new ScriptC_round_f32(mRS, mRes, R.raw.round_f32);
         doF32(0x12345678, 0);
     }
 
@@ -78,7 +80,6 @@ public class RoundTest extends RSBaseCompute {
      * round test for float2
      */
     public void testRoundF32_2() {
-        ms_f32_2 = new ScriptC_round_f32_2(mRS, mRes, R.raw.round_f32_2);
         doF32_2(0x123a5678, 0);
     }
 
@@ -86,7 +87,6 @@ public class RoundTest extends RSBaseCompute {
      * round test for float3
      */
     public void testRoundF32_3() {
-        ms_f32_3 = new ScriptC_round_f32_3(mRS, mRes, R.raw.round_f32_3);
         doF32_3(0x1af45678, 0);
     }
 
@@ -94,7 +94,6 @@ public class RoundTest extends RSBaseCompute {
      * round test for float4
      */
     public void testRoundF32_4() {
-        ms_f32_4 = new ScriptC_round_f32_4(mRS, mRes, R.raw.round_f32_4);
         doF32_4(0x1f345678, 0);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RsPackColorTo8888Test.java b/tests/tests/renderscript/src/android/renderscript/cts/RsPackColorTo8888Test.java
index 53ee490f3c1..0b008a7ddab 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RsPackColorTo8888Test.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RsPackColorTo8888Test.java
@@ -24,46 +24,45 @@ import android.renderscript.Float4;
 import android.renderscript.RSRuntimeException;
 
 public class RsPackColorTo8888Test extends RSBaseCompute {
-    private ScriptC_rs_pack_color_to_8888_rgb script_rgb;
-    private ScriptC_rs_pack_color_to_8888_rgba script_rgba;
-    private ScriptC_rs_pack_color_to_8888_f32_3 script_f32_3;
-    private ScriptC_rs_pack_color_to_8888_f32_4 script_f32_4;
+    private ScriptC_rs_pack_color_to_8888 script_f32;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_rs_pack_color_to_8888(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case 0:
-            script_rgb.forEach_root(mIn, mOut);
+            script_f32.forEach_pack_color_to_8888_rgb(mIn, mOut);
             break;
         case 1:
-            script_rgba.forEach_root(mIn, mOut);
+            script_f32.forEach_pack_color_to_8888_rgba(mIn, mOut);
             break;
         case 2:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_pack_color_to_8888_f32_3(mIn, mOut);
             break;
         case 3:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_pack_color_to_8888_f32_4(mIn, mOut);
             break;
         }
     }
 
     public void testRsPackColorTo8888RGB() {
-        script_rgb = new ScriptC_rs_pack_color_to_8888_rgb(mRS, mRes, R.raw.rs_pack_color_to_8888_rgb);
         float3input(0x17abc72, 0);
     }
 
     public void testRsPackColorTo8888RGBA() {
-        script_rgba = new ScriptC_rs_pack_color_to_8888_rgba(mRS, mRes, R.raw.rs_pack_color_to_8888_rgba);
         float4input(0x76a6b, 1);
     }
 
     public void testRsPackColorTo8888F32_3() {
-        script_f32_3 = new ScriptC_rs_pack_color_to_8888_f32_3(mRS, mRes, R.raw.rs_pack_color_to_8888_f32_3);
         float3input(0x17abc72, 2);
     }
 
     public void testRsPackColorTo8888F32_4() {
-        script_f32_4 = new ScriptC_rs_pack_color_to_8888_f32_4(mRS, mRes, R.raw.rs_pack_color_to_8888_f32_4);
         float4input(0xabc72, 3);
     }
 
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RsqrtTest.java b/tests/tests/renderscript/src/android/renderscript/cts/RsqrtTest.java
index 7878d1b16fc..13f4817bbcc 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RsqrtTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RsqrtTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class RsqrtTest extends RSBaseCompute {
     private ScriptC_rsqrt_f32 script_f32;
-    private ScriptC_rsqrt_f32_2 script_f32_2;
-    private ScriptC_rsqrt_f32_3 script_f32_3;
-    private ScriptC_rsqrt_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_rsqrt_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_Rsqrt_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_Rsqrt_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_Rsqrt_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_Rsqrt_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class RsqrtTest extends RSBaseCompute {
     }
 
     public void testRsqrtF32() {
-        script_f32 = new ScriptC_rsqrt_f32(mRS, mRes, R.raw.rsqrt_f32);
         doF32(0x12345678, 2);
     }
 
     public void testRsqrtF32_2() {
-        script_f32_2 = new ScriptC_rsqrt_f32_2(mRS, mRes, R.raw.rsqrt_f32_2);
         doF32_2(0x12ae4567, 2);
     }
 
     public void testRsqrtF32_3() {
-        script_f32_3 = new ScriptC_rsqrt_f32_3(mRS, mRes, R.raw.rsqrt_f32_3);
         doF32_3(0x12cf8, 2);
     }
 
     public void testRsqrtF32_4() {
-        script_f32_4 = new ScriptC_rsqrt_f32_4(mRS, mRes, R.raw.rsqrt_f32_4);
         doF32_4(0x12abc8, 2);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/SetObjectTest.java b/tests/tests/renderscript/src/android/renderscript/cts/SetObjectTest.java
index 6e814b0e3d3..a6626ee3707 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/SetObjectTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/SetObjectTest.java
@@ -35,6 +35,8 @@ public class SetObjectTest extends RSBaseCompute {
     Sampler sampler;
     Script script;
 
+    private ScriptC_set_object ms_set;
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -44,7 +46,9 @@ public class SetObjectTest extends RSBaseCompute {
         type = new Type.Builder(mRS, Element.I8(mRS)).setX(1).create();
         allocation = Allocation.createTyped(mRS, type);
         sampler = new Sampler.Builder(mRS).create();
-        script = new ScriptC_set_object_element(mRS, mRes, R.raw.set_object_element);
+        script = new ScriptC_set_object(mRS);
+
+        ms_set = new ScriptC_set_object(mRS);
     }
 
     /**
@@ -59,10 +63,8 @@ public class SetObjectTest extends RSBaseCompute {
 
         mIn = filed.getAllocation();
         mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ScriptC_set_object_element mScript = new ScriptC_set_object_element(mRS, mRes,
-                R.raw.set_object_element);
         try {
-            mScript.forEach_root(mIn, mOut);
+            ms_set.forEach_set_object_element(mIn, mOut);
         } catch (RSRuntimeException e) {
             Log.i("compare", "rsSetObject root fail");
         }
@@ -81,11 +83,9 @@ public class SetObjectTest extends RSBaseCompute {
 
         mIn = filed.getAllocation();
         mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ScriptC_set_object_type mScript = new ScriptC_set_object_type(mRS, mRes,
-                R.raw.set_object_type);
 
         try {
-            mScript.forEach_root(mIn, mOut);
+            ms_set.forEach_set_object_type(mIn, mOut);
         } catch (RSRuntimeException e) {
             Log.i("compare", "rsSetObject root fail");
         }
@@ -106,11 +106,9 @@ public class SetObjectTest extends RSBaseCompute {
 
         mIn = filed.getAllocation();
         mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ScriptC_set_object_allocation mScript = new ScriptC_set_object_allocation(mRS,
-                mRes, R.raw.set_object_allocation);
 
         try {
-            mScript.forEach_root(mIn, mOut);
+            ms_set.forEach_set_object_allocation(mIn, mOut);
         } catch (RSRuntimeException e) {
             Log.i("compare", "rsSetObject root fail");
         }
@@ -130,11 +128,9 @@ public class SetObjectTest extends RSBaseCompute {
 
         mIn = filed.getAllocation();
         mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ScriptC_set_object_sampler mScript = new ScriptC_set_object_sampler(mRS, mRes,
-                R.raw.set_object_sampler);
 
         try {
-            mScript.forEach_root(mIn, mOut);
+            ms_set.forEach_set_object_sampler(mIn, mOut);
         } catch (RSRuntimeException e) {
             Log.i("compare", "rsSetObject root fail");
         }
@@ -154,11 +150,9 @@ public class SetObjectTest extends RSBaseCompute {
 
         mIn = filed.getAllocation();
         mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
-        ScriptC_set_object_script mScript = new ScriptC_set_object_script(mRS, mRes,
-                R.raw.set_object_script);
 
         try {
-            mScript.forEach_root(mIn, mOut);
+            ms_set.forEach_set_object_script(mIn, mOut);
         } catch (RSRuntimeException e) {
             Log.i("compare", "rsSetObject root fail");
         }
@@ -168,4 +162,4 @@ public class SetObjectTest extends RSBaseCompute {
         Assert.assertTrue("rsSetObject script test fail: " + "Expect 1;value "
                 + tmpArray[0], tmpArray[0] == 1);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/SignTest.java b/tests/tests/renderscript/src/android/renderscript/cts/SignTest.java
index a6df37377c2..9329d01a9e1 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/SignTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/SignTest.java
@@ -22,24 +22,27 @@ import com.android.cts.stub.R;
 
 public class SignTest extends RSBaseCompute {
     private ScriptC_sign_f32 script_f32;
-    private ScriptC_sign_f32_2 script_f32_2;
-    private ScriptC_sign_f32_3 script_f32_3;
-    private ScriptC_sign_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_sign_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_sign_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_sign_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_sign_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_sign_f32_4(mIn, mOut);
             break;
         }
     }
@@ -61,12 +64,10 @@ public class SignTest extends RSBaseCompute {
      * This method is used for sign() function with f32
      */
     public void testSignF32() {
-        script_f32 = new ScriptC_sign_f32(mRS, mRes, R.raw.sign_f32);
         doF32(0x12345678, 0);
     }
 
     public void testSignF32_2() {
-        script_f32_2 = new ScriptC_sign_f32_2(mRS, mRes, R.raw.sign_f32_2);
         doF32_2(0x12a45678, 0);
     }
 
@@ -74,7 +75,6 @@ public class SignTest extends RSBaseCompute {
      * This method is used for sign() function with f32_3
      */
     public void testSignF32_3() {
-        script_f32_3 = new ScriptC_sign_f32_3(mRS, mRes, R.raw.sign_f32_3);
         doF32_3(0x123c5678, 0);
     }
 
@@ -82,7 +82,6 @@ public class SignTest extends RSBaseCompute {
      * This method is used for sign() function with f32_4
      */
     public void testSignF32_4() {
-        script_f32_4 = new ScriptC_sign_f32_4(mRS, mRes, R.raw.sign_f32_4);
         doF32_4(0x123d678, 0);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/SinTest.java b/tests/tests/renderscript/src/android/renderscript/cts/SinTest.java
index 0bce175826d..2d5721935d8 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/SinTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/SinTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class SinTest extends RSBaseCompute {
     private ScriptC_sin_f32 script_f32;
-    private ScriptC_sin_f32_2 script_f32_2;
-    private ScriptC_sin_f32_3 script_f32_3;
-    private ScriptC_sin_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_sin_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_sin_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_sin_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_sin_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_sin_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class SinTest extends RSBaseCompute {
     }
 
     public void testSinF32() {
-        script_f32 = new ScriptC_sin_f32(mRS, mRes, R.raw.sin_f32);
         doF32(0xba, 4);
     }
 
     public void testSinF32_2() {
-        script_f32_2 = new ScriptC_sin_f32_2(mRS, mRes, R.raw.sin_f32_2);
         doF32_2(0xbaa, 4);
     }
 
     public void testSinF32_3() {
-        script_f32_3 = new ScriptC_sin_f32_3(mRS, mRes, R.raw.sin_f32_3);
         doF32_3(0xca, 4);
     }
 
     public void testSinF32_4() {
-        script_f32_4 = new ScriptC_sin_f32_4(mRS, mRes, R.raw.sin_f32_4);
         doF32_4(0xda, 4);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/SinhTest.java b/tests/tests/renderscript/src/android/renderscript/cts/SinhTest.java
index 6d2f7e8f91d..c88bd42ac99 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/SinhTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/SinhTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class SinhTest extends RSBaseCompute {
     private ScriptC_sinh_f32 script_f32;
-    private ScriptC_sinh_f32_2 script_f32_2;
-    private ScriptC_sinh_f32_3 script_f32_3;
-    private ScriptC_sinh_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_sinh_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_sinh_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_sinh_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_sinh_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_sinh_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class SinhTest extends RSBaseCompute {
     }
 
     public void testSinhF32() {
-        script_f32 = new ScriptC_sinh_f32(mRS, mRes, R.raw.sinh_f32);
         doF32(0x32a, 4);
     }
 
     public void testSinhF32_2() {
-        script_f32_2 = new ScriptC_sinh_f32_2(mRS, mRes, R.raw.sinh_f32_2);
         doF32_2(0xba35, 4);
     }
 
     public void testSinhF32_3() {
-        script_f32_3 = new ScriptC_sinh_f32_3(mRS, mRes, R.raw.sinh_f32_3);
         doF32_3(0xacc3, 4);
     }
 
     public void testSinhF32_4() {
-        script_f32_4 = new ScriptC_sinh_f32_4(mRS, mRes, R.raw.sinh_f32_4);
         doF32_4(0xaa, 4);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/SqrtTest.java b/tests/tests/renderscript/src/android/renderscript/cts/SqrtTest.java
index 843373420f8..300a519a6a4 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/SqrtTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/SqrtTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class SqrtTest extends RSBaseCompute {
     private ScriptC_sqrt_f32 script_f32;
-    private ScriptC_sqrt_f32_2 script_f32_2;
-    private ScriptC_sqrt_f32_3 script_f32_3;
-    private ScriptC_sqrt_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_sqrt_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_sqrt_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_sqrt_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_sqrt_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_sqrt_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class SqrtTest extends RSBaseCompute {
     }
 
     public void testSqrtF32() {
-        script_f32 = new ScriptC_sqrt_f32(mRS, mRes, R.raw.sqrt_f32);
         doF32(0xab3, 3);
     }
 
     public void testSqrtF32_2() {
-        script_f32_2 = new ScriptC_sqrt_f32_2(mRS, mRes, R.raw.sqrt_f32_2);
         doF32_2(0xa1, 3);
     }
 
     public void testSqrtF32_3() {
-        script_f32_3 = new ScriptC_sqrt_f32_3(mRS, mRes, R.raw.sqrt_f32_3);
         doF32_3(0xbae7, 3);
     }
 
     public void testSqrtF32_4() {
-        script_f32_4 = new ScriptC_sqrt_f32_4(mRS, mRes, R.raw.sqrt_f32_4);
         doF32_4(0xbac361, 3);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/StepTest.java b/tests/tests/renderscript/src/android/renderscript/cts/StepTest.java
index b3fd01cb468..a1ffda39aaa 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/StepTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/StepTest.java
@@ -22,25 +22,28 @@ import com.android.cts.stub.R;
 
 public class StepTest extends RSBaseCompute {
     private ScriptC_step_f32 script_f32;
-    private ScriptC_step_f32_2 script_f32_2;
-    private ScriptC_step_f32_3 script_f32_3;
-    private ScriptC_step_f32_4 script_f32_4;
     private Allocation mIn;
 
     @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_step_f32(mRS);
+    }
+
+    @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_step_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_step_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_step_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_step_f32_4(mIn, mOut);
             break;
         }
     }
@@ -68,28 +71,24 @@ public class StepTest extends RSBaseCompute {
     }
 
     public void testStepF32() {
-        script_f32 = new ScriptC_step_f32(mRS, mRes, R.raw.step_f32);
         ScriptField_step_input in = new ScriptField_step_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32(0x12678, 0);
     }
 
     public void testStepF32_2() {
-        script_f32_2 = new ScriptC_step_f32_2(mRS, mRes, R.raw.step_f32_2);
         ScriptField_step_2_input in = new ScriptField_step_2_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_2(0x1ace8, 0);
     }
 
     public void testStepF32_3() {
-        script_f32_3 = new ScriptC_step_f32_3(mRS, mRes, R.raw.step_f32_3);
         ScriptField_step_3_input in = new ScriptField_step_3_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_3(0xa2ce8, 0);
     }
 
     public void testStepF32_4() {
-        script_f32_4 = new ScriptC_step_f32_4(mRS, mRes, R.raw.step_f32_4);
         ScriptField_step_4_input in = new ScriptField_step_4_input(mRS, INPUTSIZE);
         mIn = in.getAllocation();
         doF32_4(0x1ee8, 0);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/TanTest.java b/tests/tests/renderscript/src/android/renderscript/cts/TanTest.java
index 07dfb337a4b..f237c40e640 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/TanTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/TanTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class TanTest extends RSBaseCompute {
     private ScriptC_tan_f32 script_f32;
-    private ScriptC_tan_f32_2 script_f32_2;
-    private ScriptC_tan_f32_3 script_f32_3;
-    private ScriptC_tan_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_tan_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_tan_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_tan_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_tan_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_tan_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class TanTest extends RSBaseCompute {
     }
 
     public void testTanF32() {
-        script_f32 = new ScriptC_tan_f32(mRS, mRes, R.raw.tan_f32);
         doF32(0xabe, 5);
     }
 
     public void testTanF32_2() {
-        script_f32_2 = new ScriptC_tan_f32_2(mRS, mRes, R.raw.tan_f32_2);
         doF32_2(0x29, 5);
     }
 
     public void testTanF32_3() {
-        script_f32_3 = new ScriptC_tan_f32_3(mRS, mRes, R.raw.tan_f32_3);
         doF32_3(0x9a, 5);
     }
 
     public void testTanF32_4() {
-        script_f32_4 = new ScriptC_tan_f32_4(mRS, mRes, R.raw.tan_f32_4);
         doF32_4(0xac3, 5);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/TanhTest.java b/tests/tests/renderscript/src/android/renderscript/cts/TanhTest.java
index 2070a81ad4b..070fa209b8a 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/TanhTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/TanhTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class TanhTest extends RSBaseCompute {
     private ScriptC_tanh_f32 script_f32;
-    private ScriptC_tanh_f32_2 script_f32_2;
-    private ScriptC_tanh_f32_3 script_f32_3;
-    private ScriptC_tanh_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_tanh_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_tanh_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_tanh_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_tanh_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_tanh_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class TanhTest extends RSBaseCompute {
     }
 
     public void testTanhF32() {
-        script_f32 = new ScriptC_tanh_f32(mRS, mRes, R.raw.tanh_f32);
         doF32(0xab61, 5);
     }
 
     public void testTanhF32_2() {
-        script_f32_2 = new ScriptC_tanh_f32_2(mRS, mRes, R.raw.tanh_f32_2);
         doF32_2(0xa301, 5);
     }
 
     public void testTanhF32_3() {
-        script_f32_3 = new ScriptC_tanh_f32_3(mRS, mRes, R.raw.tanh_f32_3);
         doF32_3(0x918, 5);
     }
 
     public void testTanhF32_4() {
-        script_f32_4 = new ScriptC_tanh_f32_4(mRS, mRes, R.raw.tanh_f32_4);
         doF32_4(0x81, 5);
     }
 }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/TruncTest.java b/tests/tests/renderscript/src/android/renderscript/cts/TruncTest.java
index 46bc8821b7f..15878ba04a8 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/TruncTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/TruncTest.java
@@ -22,24 +22,27 @@ import android.renderscript.RSRuntimeException;
 
 public class TruncTest extends RSBaseCompute {
     private ScriptC_trunc_f32 script_f32;
-    private ScriptC_trunc_f32_2 script_f32_2;
-    private ScriptC_trunc_f32_3 script_f32_3;
-    private ScriptC_trunc_f32_4 script_f32_4;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_trunc_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            script_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_trunc_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            script_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_trunc_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            script_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_trunc_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            script_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_trunc_f32_4(mIn, mOut);
             break;
         }
     }
@@ -66,7 +69,6 @@ public class TruncTest extends RSBaseCompute {
      * trunc test for float
      */
     public void testTruncF32() {
-        script_f32 = new ScriptC_trunc_f32(mRS, mRes, R.raw.trunc_f32);
         doF32(0x12345678, 0);
     }
 
@@ -74,7 +76,6 @@ public class TruncTest extends RSBaseCompute {
      * trunc test for float2
      */
     public void testTruncF32_2() {
-        script_f32_2 = new ScriptC_trunc_f32_2(mRS, mRes, R.raw.trunc_f32_2);
         doF32_2(0x12345a78, 0);
     }
 
@@ -82,7 +83,6 @@ public class TruncTest extends RSBaseCompute {
      * trunc test for float3
      */
     public void testTruncF32_3() {
-        script_f32_3 = new ScriptC_trunc_f32_3(mRS, mRes, R.raw.trunc_f32_3);
         doF32_3(0x12f45678, 0);
     }
 
@@ -90,7 +90,6 @@ public class TruncTest extends RSBaseCompute {
      * trunc test for float4
      */
     public void testTruncF32_4() {
-        script_f32_4 = new ScriptC_trunc_f32_4(mRS, mRes, R.raw.trunc_f32_4);
         doF32_4(0x123c5678, 0);
     }
 }