diff --git a/test/de/inetsoftware/jwebassembly/ScriptEngine.java b/test/de/inetsoftware/jwebassembly/ScriptEngine.java
index 46e6b56..11730eb 100644
--- a/test/de/inetsoftware/jwebassembly/ScriptEngine.java
+++ b/test/de/inetsoftware/jwebassembly/ScriptEngine.java
@@ -15,7 +15,7 @@
  */
 package de.inetsoftware.jwebassembly;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Collection;
 
 /**
@@ -29,15 +29,23 @@ public enum ScriptEngine {
     Wat2Wasm,
     ;
 
-    public static Collection<ScriptEngine[]> testParams() {
-        ScriptEngine[][] val = { //
-                        { ScriptEngine.SpiderMonkey }, //
-                        { ScriptEngine.NodeJS }, //
-                        { ScriptEngine.NodeWat }, //
-                        { ScriptEngine.SpiderMonkeyWat },//
-                        { ScriptEngine.Wat2Wasm }, //
+    public static ScriptEngine[] testEngines() {
+        ScriptEngine[] val = { //
+                        SpiderMonkey, //
+                        NodeJS, //
+                        NodeWat, //
+                        SpiderMonkeyWat,//
+                        Wat2Wasm, //
         };
-        return Arrays.asList(val);
+        return val;
+    }
+
+    public static Collection<ScriptEngine[]> testParams() {
+        ArrayList<ScriptEngine[]> val = new ArrayList<>();
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
+            val.add( new ScriptEngine[] { script } );
+        }
+        return val;
     }
 }
 
diff --git a/test/de/inetsoftware/jwebassembly/runtime/Arrays.java b/test/de/inetsoftware/jwebassembly/runtime/Arrays.java
index 1fa69cb..5ce4041 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/Arrays.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/Arrays.java
@@ -40,8 +40,7 @@ public class Arrays extends AbstractBaseTest {
     @Parameters( name = "{0}-{1}" )
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = val[0];
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
             addParam( list, script, "length" );
             addParam( list, script, "loopByte" );
             addParam( list, script, "loopShort" );
diff --git a/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java b/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java
index e5db495..4d7d453 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java
@@ -42,8 +42,7 @@ public class CallFunctions extends AbstractBaseTest {
     @Parameters(name="{0}-{1}")
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = val[0];
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
             addParam( list, script, "intCall" );
             addParam( list, script, "nativeCall" );
         }
diff --git a/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java b/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java
index f54fed4..0e46a68 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java
@@ -40,8 +40,7 @@ public class ControlFlowOperators extends AbstractBaseTest {
     @Parameters( name = "{0}-{1}" )
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = val[0];
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
             addParam( list, script, "ifeq" );
             addParam( list, script, "ifne" );
             addParam( list, script, "iflt" );
diff --git a/test/de/inetsoftware/jwebassembly/runtime/Exceptions.java b/test/de/inetsoftware/jwebassembly/runtime/Exceptions.java
index 9d1acfd..b53d322 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/Exceptions.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/Exceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Volker Berlin (i-net software)
+ * Copyright 2018 - 2019 Volker Berlin (i-net software)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,8 +39,7 @@ public class Exceptions extends AbstractBaseTest {
     @Parameters( name = "{0}-{1}" )
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = val[0];
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
             addParam( list, script, "simple" );
             addParam( list, script, "direct" );
             addParam( list, script, "rethrow" );
diff --git a/test/de/inetsoftware/jwebassembly/runtime/MathAPI.java b/test/de/inetsoftware/jwebassembly/runtime/MathAPI.java
index 546d56e..197ff8d 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/MathAPI.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/MathAPI.java
@@ -40,8 +40,7 @@ public class MathAPI extends AbstractBaseTest {
     @Parameters(name="{0}-{1}")
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = val[0];
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
             addParam( list, script, "floatToIntBits" );
             addParam( list, script, "intBitsToFloat" );
             addParam( list, script, "doubleToLongBits" );
diff --git a/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java b/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java
index c852ae5..36d5353 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2018 Volker Berlin (i-net software)
+ * Copyright 2017 - 2019 Volker Berlin (i-net software)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,8 +40,7 @@ public class MathOperations extends AbstractBaseTest {
     @Parameters(name="{0}-{1}")
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = val[0];
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
             addParam( list, script, "intConst" );
             addParam( list, script, "floatConst" );
             addParam( list, script, "doubleConst" );
diff --git a/test/de/inetsoftware/jwebassembly/runtime/Stacks.java b/test/de/inetsoftware/jwebassembly/runtime/Stacks.java
index 48957e2..1a31c6c 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/Stacks.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/Stacks.java
@@ -37,8 +37,7 @@ public class Stacks extends AbstractBaseTest {
     @Parameters( name = "{0}-{1}" )
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = val[0];
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
             addParam( list, script, "dupInt" );
             addParam( list, script, "dupFloat" );
             addParam( list, script, "dupDouble" );
diff --git a/test/de/inetsoftware/jwebassembly/runtime/StaticValues.java b/test/de/inetsoftware/jwebassembly/runtime/StaticValues.java
index c066a8d..bd080ec 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/StaticValues.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/StaticValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Volker Berlin (i-net software)
+ * Copyright 2018 - 2019 Volker Berlin (i-net software)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,7 @@ public class StaticValues extends AbstractBaseTest {
     @Parameters( name = "{0}-{1}" )
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = val[0];
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
             addParam( list, script, "abc" );
         }
         rule.setTestParameters( list );
diff --git a/test/de/inetsoftware/jwebassembly/runtime/Structs.java b/test/de/inetsoftware/jwebassembly/runtime/Structs.java
index 7106db6..286d76c 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/Structs.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/Structs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Volker Berlin (i-net software)
+ * Copyright 2018 - 2019 Volker Berlin (i-net software)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,8 +40,7 @@ public class Structs extends AbstractBaseTest {
     @Parameters( name = "{0}-{1}" )
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = val[0];
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
             addParam( list, script, "isNull" );
             addParam( list, script, "isNotNull" );
             addParam( list, script, "isSame" );
diff --git a/test/de/inetsoftware/jwebassembly/runtime/Wide.java b/test/de/inetsoftware/jwebassembly/runtime/Wide.java
index dc3b9ed..e8a7d2b 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/Wide.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/Wide.java
@@ -37,8 +37,7 @@ public class Wide extends AbstractBaseTest {
     @Parameters( name = "{0}-{1}" )
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = val[0];
+        for( ScriptEngine script : ScriptEngine.testEngines() ) {
             addParam( list, script, "thenBranch" );
             addParam( list, script, "elseBranch" );
         }