14 files changed, 114 insertions, 71 deletions

diff --git a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
index af76927..955a144 100644
--- a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
@@ -33,7 +33,7 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
         testSuite.put("desc", suite.getDescription());
 
         testRun.put("suite", testSuite);
-        testRun.put("tests", tests);
+        testRun.put("run", tests);
     }
 
     abstract protected Map<String, Object> testableObject(Testable t);
@@ -48,7 +48,7 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
             for (Test innerTest : test.getTests()) {
                 innerTests.add(testObject(innerTest));
             }
-            testObj.put("tests", innerTests);
+            testObj.put("run", innerTests);
         } else {
             SimpleTest test = (SimpleTest) t;
             testObj = testableObject(test.getTestable());
diff --git a/src/cz/crcs/ectester/common/test/BaseRunnable.java b/src/cz/crcs/ectester/common/test/BaseRunnable.java
new file mode 100644
index 0000000..3e18208
--- /dev/null
+++ b/src/cz/crcs/ectester/common/test/BaseRunnable.java
@@ -0,0 +1,31 @@
+package cz.crcs.ectester.common.test;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class BaseRunnable implements Runnable {
+    private boolean hasRun = false;
+    private Func runImplicit;
+
+    public BaseRunnable(Func runImplicit) {
+        this.runImplicit = runImplicit;
+    }
+
+    @Override
+    public boolean hasRun() {
+        return hasRun;
+    }
+
+    @Override
+    public void run() throws TestException {
+        if (!hasRun) {
+            runImplicit.run();
+        }
+        hasRun = true;
+    }
+
+    @FunctionalInterface
+    public interface Func {
+        void run() throws TestException;
+    }
+}
diff --git a/src/cz/crcs/ectester/common/test/Runnable.java b/src/cz/crcs/ectester/common/test/Runnable.java
new file mode 100644
index 0000000..6f0efb0
--- /dev/null
+++ b/src/cz/crcs/ectester/common/test/Runnable.java
@@ -0,0 +1,18 @@
+package cz.crcs.ectester.common.test;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public interface Runnable {
+    /**
+     * @return Whether this runnable was run.
+     */
+    boolean hasRun();
+
+    /**
+     * Run this Runnable.
+     *
+     * @throws TestException
+     */
+    void run() throws TestException;
+}
diff --git a/src/cz/crcs/ectester/common/test/TestRunner.java b/src/cz/crcs/ectester/common/test/TestRunner.java
index ef448c2..cd71bcd 100644
--- a/src/cz/crcs/ectester/common/test/TestRunner.java
+++ b/src/cz/crcs/ectester/common/test/TestRunner.java
@@ -16,10 +16,12 @@ public class TestRunner {
 
     public void run() throws TestException {
         writer.begin(suite);
-        for (Test t : suite.getTests()) {
+        for (Runnable t : suite.getRunnables()) {
             if (!t.hasRun()) {
                 t.run();
-                writer.outputTest(t);
+                if (t instanceof Test) {
+                    writer.outputTest((Test) t);
+                }
             }
         }
         writer.end();
diff --git a/src/cz/crcs/ectester/common/test/TestSuite.java b/src/cz/crcs/ectester/common/test/TestSuite.java
index 74a24af..1a7c914 100644
--- a/src/cz/crcs/ectester/common/test/TestSuite.java
+++ b/src/cz/crcs/ectester/common/test/TestSuite.java
@@ -5,6 +5,7 @@ import cz.crcs.ectester.data.EC_Store;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
@@ -12,7 +13,7 @@ import java.util.List;
 public abstract class TestSuite {
     protected String name;
     protected String description;
-    protected List<Test> tests = new LinkedList<>();
+    protected List<Runnable> run = new LinkedList<>();
     protected EC_Store dataStore;
 
     public TestSuite(EC_Store dataStore, String name, String description) {
@@ -21,8 +22,16 @@ public abstract class TestSuite {
         this.description = description;
     }
 
+    public List<Runnable> getRunnables() {
+        return Collections.unmodifiableList(run);
+    }
+
+    @SuppressWarnings("unchecked")
     public List<Test> getTests() {
-        return Collections.unmodifiableList(tests);
+        return Collections.unmodifiableList((List<Test>)(List<?>) run
+                .stream()
+                .filter(runnable -> (runnable instanceof Test))
+                .collect(Collectors.toList()));
     }
 
     public String getName() {
diff --git a/src/cz/crcs/ectester/common/test/Testable.java b/src/cz/crcs/ectester/common/test/Testable.java
index 001121b..cc7a5de 100644
--- a/src/cz/crcs/ectester/common/test/Testable.java
+++ b/src/cz/crcs/ectester/common/test/Testable.java
@@ -3,20 +3,7 @@ package cz.crcs.ectester.common.test;
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public interface Testable {
-
-    /**
-     * @return Whether this testable was run.
-     */
-    boolean hasRun();
-
-    /**
-     * Run this Testable.
-     *
-     * @throws TestException
-     */
-    void run() throws TestException;
-
+public interface Testable extends Runnable {
     /**
      * @return Whether this Testable was OK.
      */
diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java
index c9d083c..4699c96 100644
--- a/src/cz/crcs/ectester/reader/ECTesterReader.java
+++ b/src/cz/crcs/ectester/reader/ECTesterReader.java
@@ -425,9 +425,9 @@ public class ECTesterReader {
                 suite = new CardTestVectorSuite(dataStore, cfg);
                 break;
             default:
-                // These tests are dangerous, prompt before them.
+                // These run are dangerous, prompt before them.
                 System.out.println("The test you selected (" + cfg.testSuite + ") is potentially dangerous.");
-                System.out.println("Some of these tests have caused temporary DoS of some cards.");
+                System.out.println("Some of these run have caused temporary DoS of some cards.");
                 if (!cfg.yes) {
                     System.out.print("Do you want to proceed? (y/n): ");
                     Scanner in = new Scanner(System.in);
diff --git a/src/cz/crcs/ectester/reader/test/CardCompositeCurvesSuite.java b/src/cz/crcs/ectester/reader/test/CardCompositeCurvesSuite.java
index 08e45ac..2c2ba26 100644
--- a/src/cz/crcs/ectester/reader/test/CardCompositeCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardCompositeCurvesSuite.java
@@ -2,13 +2,13 @@ package cz.crcs.ectester.reader.test;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
+import cz.crcs.ectester.common.test.BaseRunnable;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.ECTesterReader;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.common.ec.EC_Curve;
 import cz.crcs.ectester.common.ec.EC_Key;
-import javacard.security.KeyAgreement;
 import javacard.security.KeyPair;
 
 import java.util.Map;
@@ -21,12 +21,12 @@ import static cz.crcs.ectester.common.test.Result.ExpectedValue;
 public class CardCompositeCurvesSuite extends CardTestSuite {
 
     public CardCompositeCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
-        super(dataStore, cfg, "composite", "The composite suite tests ECDH over curves with composite order. This should generally fail, as using such a curve is unsafe.");
+        super(dataStore, cfg, "composite", "The composite suite run ECDH over curves with composite order. This should generally fail, as using such a curve is unsafe.");
     }
 
     @Override
     public void setup(CardMngr cardManager) {
-        /* Do the default tests with the public keys set to provided smallorder keys
+        /* Do the default run with the public keys set to provided smallorder keys
          * over composite order curves. Essentially small subgroup attacks.
          * These should fail, the curves aren't safe so that if the computation with
          * a small order public key succeeds the private key modulo the public key order
@@ -42,12 +42,12 @@ public class CardCompositeCurvesSuite extends CardTestSuite {
                 continue;
             }
             if ((curve.getBits() == cfg.bits || cfg.all)) {
-                tests.add(CommandTest.expect(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, curve.getBits(), curve.getField()), ExpectedValue.SUCCESS));
-                tests.add(CommandTest.expect(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), ExpectedValue.ANY));
-                tests.add(CommandTest.expect(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_LOCAL), ExpectedValue.ANY));
+                run.add(CommandTest.expect(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, curve.getBits(), curve.getField()), ExpectedValue.SUCCESS));
+                run.add(CommandTest.expect(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), ExpectedValue.ANY));
+                run.add(CommandTest.expect(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_LOCAL), ExpectedValue.ANY));
                 Command ecdhCommand = new Command.ECDH_direct(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_NONE, ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DH, key.flatten());
-                tests.add(CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected to do ECDH over a composite order curve.", "Card incorrectly does ECDH over a composite order curve, leaks bits of private key."));
-                tests.add(CommandTest.expect(new Command.Cleanup(cardManager), ExpectedValue.ANY));
+                run.add(CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected to do ECDH over a composite order curve.", "Card incorrectly does ECDH over a composite order curve, leaks bits of private key."));
+                run.add(new BaseRunnable(() -> new Command.Cleanup(cardManager)));
             }
         }
     }
diff --git a/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java b/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java
index eb46de0..7e7adbb 100644
--- a/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java
@@ -2,6 +2,7 @@ package cz.crcs.ectester.reader.test;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
+import cz.crcs.ectester.common.test.BaseRunnable;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.ECTesterReader;
@@ -18,19 +19,19 @@ import static cz.crcs.ectester.common.test.Result.ExpectedValue;
 public class CardDefaultSuite extends CardTestSuite {
 
     public CardDefaultSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
-        super(dataStore, cfg, "default", "The default test suite tests basic support of ECDH and ECDSA.");
+        super(dataStore, cfg, "default", "The default test suite run basic support of ECDH and ECDSA.");
     }
 
     @Override
     public void setup(CardMngr cardManager) throws IOException {
-        //tests.add(CommandTest.expect(new Command.Support(cardManager), ExpectedValue.ANY));
+        //run.add(CommandTest.expect(new Command.Support(cardManager), ExpectedValue.ANY));
         if (cfg.namedCurve != null) {
-            String desc = "Default tests over the " + cfg.namedCurve + " curve category.";
+            String desc = "Default run over the " + cfg.namedCurve + " curve category.";
             if (cfg.primeField) {
-                tests.addAll(defaultCategoryTests(cardManager, cfg.namedCurve, KeyPair.ALG_EC_FP, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.ANY, ExpectedValue.SUCCESS, desc));
+                run.addAll(defaultCategoryTests(cardManager, cfg.namedCurve, KeyPair.ALG_EC_FP, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.ANY, ExpectedValue.SUCCESS, desc));
             }
             if (cfg.binaryField) {
-                tests.addAll(defaultCategoryTests(cardManager, cfg.namedCurve, KeyPair.ALG_EC_F2M, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.ANY, ExpectedValue.SUCCESS, desc));
+                run.addAll(defaultCategoryTests(cardManager, cfg.namedCurve, KeyPair.ALG_EC_F2M, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.ANY, ExpectedValue.SUCCESS, desc));
             }
         } else {
             if (cfg.all) {
@@ -59,11 +60,11 @@ public class CardDefaultSuite extends CardTestSuite {
     }
 
     private void defaultTests(CardMngr cardManager, short keyLength, byte keyType) throws IOException {
-        tests.add(CommandTest.expect(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, keyLength, keyType), ExpectedValue.SUCCESS));
+        run.add(CommandTest.expect(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, keyLength, keyType), ExpectedValue.SUCCESS));
         Command curve = Command.prepareCurve(cardManager, dataStore, cfg, ECTesterApplet.KEYPAIR_BOTH, keyLength, keyType);
         if (curve != null)
-            tests.add(CommandTest.expect(curve, ExpectedValue.SUCCESS));
-        tests.add(defaultCurveTests(cardManager, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.ANY, ExpectedValue.SUCCESS, "Default tests."));
-        tests.add(CommandTest.expect(new Command.Cleanup(cardManager), ExpectedValue.ANY));
+            run.add(CommandTest.expect(curve, ExpectedValue.SUCCESS));
+        run.add(defaultCurveTests(cardManager, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.ANY, ExpectedValue.SUCCESS, "Default run."));
+        run.add(new BaseRunnable(() -> new Command.Cleanup(cardManager)));
     }
 }
diff --git a/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java b/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
index 00e3a46..3c0795b 100644
--- a/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
@@ -2,6 +2,7 @@ package cz.crcs.ectester.reader.test;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
+import cz.crcs.ectester.common.test.BaseRunnable;
 import cz.crcs.ectester.common.test.CompoundTest;
 import cz.crcs.ectester.common.test.Test;
 import cz.crcs.ectester.data.EC_Store;
@@ -26,7 +27,7 @@ import static cz.crcs.ectester.common.test.Result.ExpectedValue;
 public class CardInvalidCurvesSuite extends CardTestSuite {
 
     public CardInvalidCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
-        super(dataStore, cfg, "invalid", "The invalid curve suite tests whether the card rejects points outside of the curve during ECDH.");
+        super(dataStore, cfg, "invalid", "The invalid curve suite run whether the card rejects points outside of the curve during ECDH.");
     }
 
     @Override
@@ -55,16 +56,16 @@ public class CardInvalidCurvesSuite extends CardTestSuite {
             EC_Curve curve = e.getKey();
             List<EC_Key.Public> keys = e.getValue();
 
-            tests.add(CommandTest.expect(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, curve.getBits(), curve.getField()), ExpectedValue.SUCCESS));
-            tests.add(CommandTest.expect(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), ExpectedValue.SUCCESS));
-            tests.add(CommandTest.expect(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_LOCAL), ExpectedValue.SUCCESS));
+            run.add(CommandTest.expect(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, curve.getBits(), curve.getField()), ExpectedValue.SUCCESS));
+            run.add(CommandTest.expect(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), ExpectedValue.SUCCESS));
+            run.add(CommandTest.expect(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_LOCAL), ExpectedValue.SUCCESS));
             List<Test> ecdhTests = new LinkedList<>();
             for (EC_Key.Public pub : keys) {
                 Command ecdhCommand = new Command.ECDH_direct(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_NONE, ECTesterApplet.KeyAgreement_ALG_EC_SVDP_DH, pub.flatten());
                 ecdhTests.add(CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected point on invalid curve." , "Card incorrectly accepted point on invalid curve."));
             }
-            tests.add(CompoundTest.all(ExpectedValue.SUCCESS, "Invalid curve test of " + curve.getId(), ecdhTests.toArray(new Test[0])));
-            tests.add(CommandTest.expect(new Command.Cleanup(cardManager), ExpectedValue.ANY));
+            run.add(CompoundTest.all(ExpectedValue.SUCCESS, "Invalid curve test of " + curve.getId(), ecdhTests.toArray(new Test[0])));
+            run.add(new BaseRunnable(() -> new Command.Cleanup(cardManager)));
         }
     }
 }
diff --git a/src/cz/crcs/ectester/reader/test/CardTestSuite.java b/src/cz/crcs/ectester/reader/test/CardTestSuite.java
index 5d34a13..7035ca2 100644
--- a/src/cz/crcs/ectester/reader/test/CardTestSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardTestSuite.java
@@ -3,10 +3,8 @@ package cz.crcs.ectester.reader.test;
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.common.ec.EC_Curve;
-import cz.crcs.ectester.common.test.CompoundTest;
-import cz.crcs.ectester.common.test.Result;
-import cz.crcs.ectester.common.test.Test;
-import cz.crcs.ectester.common.test.TestSuite;
+import cz.crcs.ectester.common.test.*;
+import cz.crcs.ectester.common.test.Runnable;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.ECTesterReader;
@@ -98,10 +96,10 @@ public abstract class CardTestSuite extends TestSuite {
      * @param ecdhCompressedExpected expected result of the ECDH command with a compressed point.
      * @param ecdsaExpected          expected result of the ordinary ECDSA command
      * @param description            compound test description
-     * @return tests to run
+     * @return run to run
      */
-    List<Test> defaultCategoryTests(CardMngr cardManager, String category, byte field, ExpectedValue setExpected, ExpectedValue generateExpected, ExpectedValue ecdhExpected, ExpectedValue ecdhCompressedExpected, ExpectedValue ecdsaExpected, String description) {
-        List<Test> tests = new LinkedList<>();
+    List<Runnable> defaultCategoryTests(CardMngr cardManager, String category, byte field, ExpectedValue setExpected, ExpectedValue generateExpected, ExpectedValue ecdhExpected, ExpectedValue ecdhCompressedExpected, ExpectedValue ecdsaExpected, String description) {
+        List<Runnable> tests = new LinkedList<>();
         Map<String, EC_Curve> curves = dataStore.getObjects(EC_Curve.class, category);
         if (curves == null)
             return tests;
@@ -111,7 +109,7 @@ public abstract class CardTestSuite extends TestSuite {
                 tests.add(CommandTest.expect(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, curve.getBits(), field), ExpectedValue.SUCCESS));
                 tests.add(CommandTest.expect(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), setExpected));
                 tests.add(defaultCurveTests(cardManager, generateExpected, ecdhExpected, ecdhCompressedExpected, ecdsaExpected, description));
-                tests.add(CommandTest.expect(new Command.Cleanup(cardManager), ExpectedValue.ANY));
+                run.add(new BaseRunnable(() -> new Command.Cleanup(cardManager)));
             }
         }
 
diff --git a/src/cz/crcs/ectester/reader/test/CardTestVectorSuite.java b/src/cz/crcs/ectester/reader/test/CardTestVectorSuite.java
index e1c499c..025cbe0 100644
--- a/src/cz/crcs/ectester/reader/test/CardTestVectorSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardTestVectorSuite.java
@@ -3,10 +3,7 @@ package cz.crcs.ectester.reader.test;
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.common.ec.*;
-import cz.crcs.ectester.common.test.CompoundTest;
-import cz.crcs.ectester.common.test.Result;
-import cz.crcs.ectester.common.test.Test;
-import cz.crcs.ectester.common.test.TestCallback;
+import cz.crcs.ectester.common.test.*;
 import cz.crcs.ectester.common.util.ByteUtil;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.CardMngr;
@@ -64,7 +61,7 @@ public class CardTestVectorSuite extends CardTestSuite {
 
             testVector.add(CommandTest.expect(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, curve.getBits(), curve.getField()), ExpectedValue.SUCCESS));
             testVector.add(CommandTest.expect(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), ExpectedValue.SUCCESS));
-            //tests.add(new Test.Simple(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_BOTH), ExpectedValue.SUCCESS));
+            //run.add(new Test.Simple(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_BOTH), ExpectedValue.SUCCESS));
             testVector.add(CommandTest.expect(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.CURVE_external, EC_Consts.PARAMETER_S, onekey.flatten(EC_Consts.PARAMETER_S)), ExpectedValue.SUCCESS));
             testVector.add(CommandTest.expect(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_REMOTE, EC_Consts.CURVE_external, EC_Consts.PARAMETER_W, otherkey.flatten(EC_Consts.PARAMETER_W)), ExpectedValue.SUCCESS));
             testVector.add(CommandTest.function(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_TRUE, EC_Consts.CORRUPTION_NONE, result.getJavaCardKA()), new TestCallback<CommandTestable>() {
@@ -82,9 +79,8 @@ public class CardTestVectorSuite extends CardTestSuite {
                     return new Result(Value.SUCCESS);
                 }
             }));
-            tests.add(CompoundTest.all(ExpectedValue.SUCCESS, "Test vector " + result.getId(), testVector.toArray(new Test[0])));
-            tests.add(CommandTest.expect(new Command.Cleanup(cardManager), ExpectedValue.ANY));
-
+            run.add(CompoundTest.all(ExpectedValue.SUCCESS, "Test vector " + result.getId(), testVector.toArray(new Test[0])));
+            run.add(new BaseRunnable(() -> new Command.Cleanup(cardManager)));
         }
     }
 }
diff --git a/src/cz/crcs/ectester/reader/test/CardWrongCurvesSuite.java b/src/cz/crcs/ectester/reader/test/CardWrongCurvesSuite.java
index 4c529da..8c21aef 100644
--- a/src/cz/crcs/ectester/reader/test/CardWrongCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardWrongCurvesSuite.java
@@ -15,20 +15,20 @@ import static cz.crcs.ectester.common.test.Result.ExpectedValue;
 public class CardWrongCurvesSuite extends CardTestSuite {
 
     public CardWrongCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
-        super(dataStore, cfg, "wrong", "The wrong curve suite tests whether the card rejects domain parameters which are not curves.");
+        super(dataStore, cfg, "wrong", "The wrong curve suite run whether the card rejects domain parameters which are not curves.");
     }
 
     @Override
     public void setup(CardMngr cardManager) throws IOException {
-        /* Just do the default tests on the wrong curves.
+        /* Just do the default run on the wrong curves.
          * These should generally fail, the curves aren't curves.
          */
-        String desc = "Default tests over wrong curve params.";
+        String desc = "Default run over wrong curve params.";
         if (cfg.primeField) {
-            tests.addAll(defaultCategoryTests(cardManager, cfg.testSuite, KeyPair.ALG_EC_FP, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, desc));
+            run.addAll(defaultCategoryTests(cardManager, cfg.testSuite, KeyPair.ALG_EC_FP, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, desc));
         }
         if (cfg.binaryField) {
-            tests.addAll(defaultCategoryTests(cardManager, cfg.testSuite, KeyPair.ALG_EC_F2M, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, desc));
+            run.addAll(defaultCategoryTests(cardManager, cfg.testSuite, KeyPair.ALG_EC_F2M, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, ExpectedValue.FAILURE, desc));
         }
     }
 }
diff --git a/src/cz/crcs/ectester/standalone/test/StandaloneDefaultSuite.java b/src/cz/crcs/ectester/standalone/test/StandaloneDefaultSuite.java
index 7056d69..b24244e 100644
--- a/src/cz/crcs/ectester/standalone/test/StandaloneDefaultSuite.java
+++ b/src/cz/crcs/ectester/standalone/test/StandaloneDefaultSuite.java
@@ -21,7 +21,7 @@ import java.security.spec.ECParameterSpec;
 public class StandaloneDefaultSuite extends StandaloneTestSuite {
 
     public StandaloneDefaultSuite(EC_Store dataStore, ECTesterStandalone.Config cfg, TreeCommandLine cli) {
-        super(dataStore, cfg, cli, "default", "The default test suite tests basic support of ECDH and ECDSA.");
+        super(dataStore, cfg, cli, "default", "The default test suite run basic support of ECDH and ECDSA.");
     }
 
     @Override
@@ -57,19 +57,19 @@ public class StandaloneDefaultSuite extends StandaloneTestSuite {
             kgtOther = new KeyGeneratorTestable(kpg);
         }
 
-        tests.add(KeyGeneratorTest.expect(kgtOne, Result.ExpectedValue.SUCCESS));
-        tests.add(KeyGeneratorTest.expect(kgtOther, Result.ExpectedValue.SUCCESS));
+        run.add(KeyGeneratorTest.expect(kgtOne, Result.ExpectedValue.SUCCESS));
+        run.add(KeyGeneratorTest.expect(kgtOther, Result.ExpectedValue.SUCCESS));
 
         for (KeyAgreementIdent kaIdent : cfg.selected.getKAs()) {
             if (kaAlgo == null || kaIdent.contains(kaAlgo)) {
                 KeyAgreement ka = kaIdent.getInstance(cfg.selected.getProvider());
-                tests.add(KeyAgreementTest.expect(new KeyAgreementTestable(ka, kgtOne, kgtOther, spec), Result.ExpectedValue.SUCCESS));
+                run.add(KeyAgreementTest.expect(new KeyAgreementTestable(ka, kgtOne, kgtOther, spec), Result.ExpectedValue.SUCCESS));
             }
         }
         for (SignatureIdent sigIdent : cfg.selected.getSigs()) {
             if (sigAlgo == null || sigIdent.contains(sigAlgo)) {
                 Signature sig = sigIdent.getInstance(cfg.selected.getProvider());
-                tests.add(SignatureTest.expect(new SignatureTestable(sig, kgtOne, null), Result.ExpectedValue.SUCCESS));
+                run.add(SignatureTest.expect(new SignatureTestable(sig, kgtOne, null), Result.ExpectedValue.SUCCESS));
             }
         }
     }