53 files changed, 287 insertions, 169 deletions

diff --git a/README.md b/README.md
index bed5e62..5118c31 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,9 @@ For format of this file see [FORMAT](docs/FORMAT.md).
 
 Perform support,performance and vulnerability tests of ECC.
 
+To select which tests will be performed, it is possible to enter the test suite name with a suffix
+which specifies the number of the first test to be run, and optionally the number of the last test to be run as `-t <test_suite>[:start_index[:stop_index]]`.
+
 Use with `-o / --output [out_type:]<out_file>` to output the test results to a file.
 For possible formats of this file see [FORMAT](docs/FORMAT.md).
 For more info about the test suites see [TESTS](docs/TESTS.md).
diff --git a/docs/TESTS.md b/docs/TESTS.md
index b4927c6..2d535f8 100644
--- a/docs/TESTS.md
+++ b/docs/TESTS.md
@@ -6,10 +6,10 @@
  - `miscellaneous`
  - `signature`
  - `wrong`*
- - `composite`*
  - `invalid`*
  - `twist`*
  - `degenerate`*
+ - `composite`*
  - `cofactor`*
  - `edge-cases`*
 
@@ -23,12 +23,6 @@ with a compressed public key to test support for compressed points.
 
 This test suite is run if no argument is provided to `-t / --test`.
 
-For example:
-```bash
-java -jar ECTesterReader.jar -t
-```
-tests prime field and binary field curves, using the default test suite.
-
 
 ## Test-Vectors
 Tests using known test vectors provided by NIST/SECG/Brainpool:
@@ -41,20 +35,37 @@ Tests using known test vectors provided by NIST/SECG/Brainpool:
 
 [Brainpool - RFC7027](https://tools.ietf.org/html/rfc7027#appendix-A)
 
-For example:
-```bash
-java -jar ECTesterReader.jar -t test-vectors
-```
-tests all curves for which test-vectors are provided.
 
 ## Compression
 Tests support for compression of public points in ECDH as specified in ANSI X9.62. Tests ECDH with points in compressed
 and hybrid form. Also tests card response to a hybrid point with wrong `y` coordinate and to the point at infinity(as public key in ECDH).
 
-For example:
-```bash
-java -jar ECTesterReader.jar -t compression
-```
+
+## Miscellaneous
+Some miscellaneous tests, tries ECDH and ECDSA over supersingular curves, anomalous curves and Barreto-Naehrig curves with small embedding degree and CM discriminant.
+
+
+## Signature
+Tests ECDSA verification, with invalid signatures.
+
+   - Well-formed(DER) invalid signatures:
+       - r = random, s = random
+       - r = 0, s = random
+       - r = random, s = 0
+       - r = 1, s = random
+       - r = random, s = 1
+       - r = 0, s = 0
+       - r = 0, s = 1
+       - r = 1, s = 0
+       - r = 1, s = 1
+       - s = p
+       - s = 2 * p
+   - Invalid signatures:
+       - Signature shorter than specified in ASN.1 SEQUENCE header.
+       - Signature longer than specified in ASN.1 SEQUENCE header.
+       - r shorter/longer than specified in its ASN.1 header.
+       - s shorter/longer than specified in its ASN.1 header.
+
 
 ## Wrong
 Tests on a category of wrong curves. These curves are not really curves as they have:
@@ -74,9 +85,9 @@ This test suite also does some additional tests with corrupting the parameters:
     - G = infinity
     - r = 0
     - r = 1
-    - r = some prime larger than original r (and [r]G != infinity)
-    - r = some prime smaller than original r (and [r]G != infninity)
-    - r = some composite number (and [r]G != infinity)
+    - r = some prime larger than original r (and \[r\]G != infinity)
+    - r = some prime smaller than original r (and \[r\]G != infninity)
+    - r = some composite number (and \[r\]G != infinity)
     - k = 0xff
     - k = 0
 
@@ -84,30 +95,22 @@ This test suite also does some additional tests with corrupting the parameters:
     - e1 = e2 = e3 = 0
     - m < e1 < e2 < e3
 
-These tests should fail generally.
-
-For example:
-```bash
-java -jar ECTesterReader.jar -t wrong
-```
-does all wrong curve tests.
-
 
 ## Composite
 Tests using curves that don't have a prime order/nearly prime order.
 These tests should generally fail, a success here implies the card will use a non-secure curve if such curve is set
 by the applet. Operations over such curves are susceptible to small-subgroup attacks.
 
-   - r = quite a smooth number, many small factors, r = |G|
-   - r = prime(of increasing bit lengths), r = |G|
-   - r = p * q = |G|
-   - r = G = Carmichael number = p * q * s
-   - [r]G = infinity but r != |G|, so |G| divides r
+   - r = quite a smooth number, many small factors, r = \|G\|
+   - r = prime(of increasing bit lengths), r = \|G\|
 
-For example:
-```bash
-java -jar ECTesterReader.jar -t composite
-```
+     This is performed over a 160 bit field size, in two passes:
+      - First pass tests the full range from 2 bits to 152, with more frequent tests towards the beginning and end.
+      - The second pass tests the range 140 - 158 bits with one bit steps.
+       
+   - r = p * q = \|G\|
+   - r = G = Carmichael number = p * q * s
+   - \[r\]G = infinity but r != \|G\|, so \|G\| divides r
 
 
 ## Invalid
@@ -116,12 +119,6 @@ ECDH should definitely fail, a success here implies the card is susceptible to i
 
 See [Practical Invalid Curve Attacks on TLS-ECDH](https://www.nds.rub.de/media/nds/veroeffentlichungen/2015/09/14/main-full.pdf) for more information.
 
-For example:
-```bash
-java -jar ECTesterReader.jar -t invalid
-```
-tests using all curves with pregenerated *invalid* public keys for these curves.
-
 
 ## Twist
 Tests using known named curves froms several categories(SECG/NIST) against pre-generated points on twists of said curves.
@@ -130,10 +127,6 @@ the card might compute on the twist, if a point on the twist is supplied.
 
 See [SafeCurves on twist security](https://safecurves.cr.yp.to/twist.html) for more information.
 
-For example:
-```bash
-java -jar ECTesterReader.jar -t twist
-```
 
 ## Degenerate
 Tests using known named curves froms several categories(SECG/NIST) against pre-generated points on the degenerate line
@@ -142,74 +135,30 @@ and uses a curve model vulnerable to such degenerate points.
 
 See [Degenerate Curve Attacks - Extending Invalid Curve Attacks to Edwards Curves and Other Models](https://eprint.iacr.org/2015/1233.pdf) for more information.
 
-For example:
-```bash
-java -jar ECTesterReader.jar -t degenerate
-```
 
 ## Cofactor
 Tests whether the card correctly rejects points that lie on the curve but not on the subgroup generated by the specified generator
 during ECDH. Does this with curves where the cofactor subgroup has small order, then with curves that have order equal to the product
 of two large primes, sets the generator with order of one prime and tries points on the subgroup of the other prime order.
 
-For example:
-```bash
-java -jar ECTesterReader.jar -t cofactor
-```
 
 ## Edge-Cases
 Tests various inputs to ECDH which may cause an implementation to achieve a certain edge-case state during ECDH.
 Some of the data is from the google/Wycheproof project. Tests include [CVE-2017-10176](https://nvd.nist.gov/vuln/detail/CVE-2017-10176) and [CVE-2017-8932](https://nvd.nist.gov/vuln/detail/CVE-2017-8932).
 Various custom edge private key values are also tested.
 
-CVE-2017-10176 was in implementation issue in the SunEC Java library (and NSS(CVE-2017-7781), thus also anything that used it) that caused the implementation to reach the point at infinity during ECDH computation.
+CVE-2017-10176 was in implementation issue in the SunEC Java library (and NSS ([CVE-2017-7781](https://nvd.nist.gov/vuln/detail/CVE-2017-7781)), thus also anything that used it) that caused the implementation to reach the point at infinity during ECDH computation.
 See [blog](http://blog.intothesymmetry.com/2017/08/cve-2017-7781cve-2017-10176-issue-with.html) for more info.
 
 CVE-2017-8932 was an implementation issue in the Go standard library, in particular its scalar multiplication algorithm on the
 P-256 curve which leaked information about the private key.
 
-Custom private key values over SECG curves are tested:
+Custom edge-case private key values over SECG curves are tested:
 
    - s = 0, s = 1
    - s < r, s = r, s > r
    - s = r - 1, s = r + 1
    - s = k\*r - 1, s = k\*r, s = k\*r + 1
-
-For example:
-```bash
-java -jar ECTesterReader.jar -t edge-cases
-```
-
-## Miscellaneous
-Some miscellaneous tests, tries ECDH and ECDSA over supersingular curves, anomalous curves and Barreto-Naehrig curves with small embedding degree and CM discriminant.
-
-For example:
-```bash
-java -jar ECTesterReader.jar -t miscellaneous
-```
-
-## Signature
-Tests ECDSA verification, with invalid signatures.
-
-   - Well-formed(DER) invalid signatures:
-       - r = random, s = random
-       - r = 0, s = random
-       - r = random, s = 0
-       - r = 1, s = random
-       - r = random, s = 1
-       - r = 0, s = 0
-       - r = 0, s = 1
-       - r = 1, s = 0
-       - r = 1, s = 1
-       - s = p
-       - s = 2 * p
-   - Invalid signatures:
-       - Signature shorter than specified in ASN.1 SEQUENCE header.
-       - Signature longer than specified in ASN.1 SEQUENCE header.
-       - r shorter/longer than specified in its ASN.1 header.
-       - s shorter/longer than specified in its ASN.1 header.
-
-For example:
-```bash
-java -jar ECTesterReader.jar -t signature
-```
\ No newline at end of file
+   - s around r (s < r, on a curve where \|r\| > \|p\|)
+   - s around p (on a curve where where \|r\| > \|p\|)
+   - s around 0 (s > 0, on a curve where \|r\| > \|p\|)
diff --git a/src/cz/crcs/ectester/data/composite/curves.xml b/src/cz/crcs/ectester/data/composite/curves.xml
index f77159c..d4ef2ce 100644
--- a/src/cz/crcs/ectester/data/composite/curves.xml
+++ b/src/cz/crcs/ectester/data/composite/curves.xml
@@ -41,14 +41,18 @@
         <bits>384</bits>
         <field>prime</field>
         <file>composite384.csv</file>
-        <desc>r = order = 0x05 * 0x0b * 0x3d * 0xb16aa7dc50145337cf1b2f38018ccb5cf44c22a2f7d7c22bbe5c572d2cb9a04cb1081357c6a1c97cc39ab62596867</desc>
+        <desc>r = order = 0x05 * 0x0b * 0x3d *
+            0xb16aa7dc50145337cf1b2f38018ccb5cf44c22a2f7d7c22bbe5c572d2cb9a04cb1081357c6a1c97cc39ab62596867
+        </desc>
     </curve>
     <curve>
         <id>whole/composite521</id>
         <bits>521</bits>
         <field>prime</field>
         <file>composite521.csv</file>
-        <desc>r = order = 0x02 * 0x05 * 0x1f * 0x4a5aac4fac3ea253b66c3e650f5173b30467f28b8e841d37ce69bb0831a5939ad3dd082b750577ec4592d4d58916c87a9b732d8ddae435c26f8f779d2467f50f</desc>
+        <desc>r = order = 0x02 * 0x05 * 0x1f *
+            0x4a5aac4fac3ea253b66c3e650f5173b30467f28b8e841d37ce69bb0831a5939ad3dd082b750577ec4592d4d58916c87a9b732d8ddae435c26f8f779d2467f50f
+        </desc>
     </curve>
 
     <curve>
@@ -190,7 +194,7 @@
         <file>composite192_rg0.csv</file>
         <desc>|G| divides r(so [r]G = infinity), but r != |G| = 0x302b72431ff070e7e06799</desc>
     </curve>
-    
+
     <curve>
         <id>pq/composite224</id>
         <bits>224</bits>
@@ -252,11 +256,11 @@
     </curve>
 
     <curve>
-    	<id>pp/carmichael128</id>
-    	<bits>128</bits>
-    	<field>prime</field>
-    	<file>carmichael_128.csv</file>
-    	<desc>r = Carmichael pseudoprime = 0x2ddbfe0f1f7 * 0x5bb7fc1e3ed * 0x8993fa2d5e3</desc>
+        <id>pp/carmichael128</id>
+        <bits>128</bits>
+        <field>prime</field>
+        <file>carmichael_128.csv</file>
+        <desc>r = Carmichael pseudoprime = 0x2ddbfe0f1f7 * 0x5bb7fc1e3ed * 0x8993fa2d5e3</desc>
     </curve>
     <curve>
         <id>pp/carmichael192</id>
@@ -277,245 +281,388 @@
         <bits>256</bits>
         <field>prime</field>
         <file>carmichael_256.csv</file>
-        <desc>r = Carmichael pseudoprime = 0x129e94800bf86bd2d04ce1 * 0x253d290017f0d7a5a099c1 * 0x37dbbd8023e9437870e6a1</desc>
+        <desc>r = Carmichael pseudoprime = 0x129e94800bf86bd2d04ce1 * 0x253d290017f0d7a5a099c1 *
+            0x37dbbd8023e9437870e6a1
+        </desc>
     </curve>
     <curve>
         <id>pp/carmichael384</id>
         <bits>384</bits>
         <field>prime</field>
         <file>carmichael_384.csv</file>
-        <desc>r = Carmichael pseudoprime = 0x78b4fa97e97300a5c46b32fb522cf76f * 0xf169f52fd2e6014b88d665f6a459eedd * 0x16a1eefc7bc5901f14d4198f1f686e64b</desc>
+        <desc>r = Carmichael pseudoprime = 0x78b4fa97e97300a5c46b32fb522cf76f * 0xf169f52fd2e6014b88d665f6a459eedd *
+            0x16a1eefc7bc5901f14d4198f1f686e64b
+        </desc>
     </curve>
     <curve>
         <id>pp/carmichael512</id>
         <bits>512</bits>
         <field>prime</field>
         <file>carmichael_512.csv</file>
-        <desc>r = Carmichael pseudoprime = 0x2f6e41969c169b4e97b0a1c46ca4fb3a8f294afaefb * 0x5edc832d382d369d2f614388d949f6751e5295f5df5 * 0x8e4ac4c3d443d1ebc711e54d45eef1afad7be0f0cef</desc>
+        <desc>r = Carmichael pseudoprime = 0x2f6e41969c169b4e97b0a1c46ca4fb3a8f294afaefb *
+            0x5edc832d382d369d2f614388d949f6751e5295f5df5 * 0x8e4ac4c3d443d1ebc711e54d45eef1afad7be0f0cef
+        </desc>
     </curve>
     <curve>
         <id>pp/carmichael521</id>
         <bits>521</bits>
         <field>prime</field>
         <file>carmichael_521.csv</file>
-        <desc>r = Carmichael pseudoprime = 0x170ac4fd154250e674f9ac6e0c29a214c6d6553e4f11 * 0x2e1589fa2a84a1cce9f358dc185344298dacaa7c9e21 * 0x45204ef73fc6f2b35eed054a247ce63e5482ffbaed31</desc>
+        <desc>r = Carmichael pseudoprime = 0x170ac4fd154250e674f9ac6e0c29a214c6d6553e4f11 *
+            0x2e1589fa2a84a1cce9f358dc185344298dacaa7c9e21 * 0x45204ef73fc6f2b35eed054a247ce63e5482ffbaed31
+        </desc>
     </curve>
 
     <curve>
-        <id>varying/160/1</id>
+        <id>varying/160/first/1</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/2a.csv</file>
+        <file>varying/160/first/2a.csv</file>
         <desc>r = 2 bit prime = 2</desc>
     </curve>
     <curve>
-        <id>varying/160/2</id>
+        <id>varying/160/first/2</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/2b.csv</file>
+        <file>varying/160/first/2b.csv</file>
         <desc>r = 2 bit prime = 3</desc>
     </curve>
     <curve>
-        <id>varying/160/3</id>
+        <id>varying/160/first/3</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/3.csv</file>
+        <file>varying/160/first/3.csv</file>
         <desc>r = 3 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/4</id>
+        <id>varying/160/first/4</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/4.csv</file>
+        <file>varying/160/first/4.csv</file>
         <desc>r = 4 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/5</id>
+        <id>varying/160/first/5</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/5.csv</file>
+        <file>varying/160/first/5.csv</file>
         <desc>r = 5 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/6</id>
+        <id>varying/160/first/6</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/6.csv</file>
+        <file>varying/160/first/6.csv</file>
         <desc>r = 6 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/7</id>
+        <id>varying/160/first/7</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/7.csv</file>
+        <file>varying/160/first/7.csv</file>
         <desc>r = 7 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/8</id>
+        <id>varying/160/first/8</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/8.csv</file>
+        <file>varying/160/first/8.csv</file>
         <desc>r = 8 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/10</id>
+        <id>varying/160/first/10</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/10.csv</file>
+        <file>varying/160/first/10.csv</file>
         <desc>r = 10 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/12</id>
+        <id>varying/160/first/12</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/12.csv</file>
+        <file>varying/160/first/12.csv</file>
         <desc>r = 12 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/14</id>
+        <id>varying/160/first/14</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/14.csv</file>
+        <file>varying/160/first/14.csv</file>
         <desc>r = 14 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/16</id>
+        <id>varying/160/first/16</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/16.csv</file>
+        <file>varying/160/first/16.csv</file>
         <desc>r = 16 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/20</id>
+        <id>varying/160/first/20</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/20.csv</file>
+        <file>varying/160/first/20.csv</file>
         <desc>r = 20 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/25</id>
+        <id>varying/160/first/25</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/25.csv</file>
+        <file>varying/160/first/25.csv</file>
         <desc>r = 25 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/32</id>
+        <id>varying/160/first/32</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/32.csv</file>
+        <file>varying/160/first/32.csv</file>
         <desc>r = 32 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/48</id>
+        <id>varying/160/first/48</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/48.csv</file>
+        <file>varying/160/first/48.csv</file>
         <desc>r = 48 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/64</id>
+        <id>varying/160/first/64</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/64.csv</file>
+        <file>varying/160/first/64.csv</file>
         <desc>r = 64 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/70</id>
+        <id>varying/160/first/70</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/70.csv</file>
+        <file>varying/160/first/70.csv</file>
         <desc>r = 70 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/80</id>
+        <id>varying/160/first/80</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/80.csv</file>
+        <file>varying/160/first/80.csv</file>
         <desc>r = 80 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/90</id>
+        <id>varying/160/first/90</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/90.csv</file>
+        <file>varying/160/first/90.csv</file>
         <desc>r = 90 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/96</id>
+        <id>varying/160/first/96</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/96.csv</file>
+        <file>varying/160/first/96.csv</file>
         <desc>r = 96 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/112</id>
+        <id>varying/160/first/112</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/112.csv</file>
+        <file>varying/160/first/112.csv</file>
         <desc>r = 112 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/128</id>
+        <id>varying/160/first/128</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/128.csv</file>
+        <file>varying/160/first/128.csv</file>
         <desc>r = 128 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/135</id>
+        <id>varying/160/first/135</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/135.csv</file>
+        <file>varying/160/first/135.csv</file>
         <desc>r = 135 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/140</id>
+        <id>varying/160/first/140</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/140.csv</file>
+        <file>varying/160/first/140.csv</file>
         <desc>r = 140 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/144</id>
+        <id>varying/160/first/144</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/144.csv</file>
+        <file>varying/160/first/144.csv</file>
         <desc>r = 144 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/146</id>
+        <id>varying/160/first/146</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/146.csv</file>
+        <file>varying/160/first/146.csv</file>
         <desc>r = 146 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/148</id>
+        <id>varying/160/first/148</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/148.csv</file>
+        <file>varying/160/first/148.csv</file>
         <desc>r = 148 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/150</id>
+        <id>varying/160/first/150</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/150.csv</file>
+        <file>varying/160/first/150.csv</file>
         <desc>r = 150 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/152</id>
+        <id>varying/160/first/152</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/152.csv</file>
+        <file>varying/160/first/152.csv</file>
         <desc>r = 152 bit prime</desc>
     </curve>
     <curve>
-        <id>varying/160/152cofactor</id>
+        <id>varying/160/first/152cofactor</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>varying/160/152_cofactor.csv</file>
+        <file>varying/160/first/152_cofactor.csv</file>
         <desc>r = 152 bit prime, with correct cofactor</desc>
     </curve>
+
+    <curve>
+        <id>varying/160/second/140</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/140.csv</file>
+        <desc>r = 140 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/141</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/141.csv</file>
+        <desc>r = 141 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/142</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/142.csv</file>
+        <desc>r = 142 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/143</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/143.csv</file>
+        <desc>r = 143 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/144</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/144.csv</file>
+        <desc>r = 144 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/145</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/145.csv</file>
+        <desc>r = 145 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/146</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/146.csv</file>
+        <desc>r = 146 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/147</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/147.csv</file>
+        <desc>r = 147 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/148</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/148.csv</file>
+        <desc>r = 148 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/149</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/149.csv</file>
+        <desc>r = 149 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/150</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/150.csv</file>
+        <desc>r = 150 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/151</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/151.csv</file>
+        <desc>r = 151 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/152</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/152.csv</file>
+        <desc>r = 152 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/153</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/153.csv</file>
+        <desc>r = 153 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/154</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/154.csv</file>
+        <desc>r = 154 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/155</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/155.csv</file>
+        <desc>r = 155 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/156</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/156.csv</file>
+        <desc>r = 156 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/157</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/157.csv</file>
+        <desc>r = 157 bit prime.</desc>
+    </curve>
+    <curve>
+        <id>varying/160/second/158</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/second/158.csv</file>
+        <desc>r = 158 bit prime.</desc>
+    </curve>
+
 </curves>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/10.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/10.csv
index 5fa842a..5fa842a 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/10.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/10.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/112.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/112.csv
index 633ccd5..633ccd5 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/112.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/112.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/12.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/12.csv
index 62bb1a0..62bb1a0 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/12.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/12.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/128.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/128.csv
index 5f8c532..5f8c532 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/128.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/128.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/135.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/135.csv
index 232abff..232abff 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/135.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/135.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/14.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/14.csv
index c8df53e..c8df53e 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/14.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/14.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/140.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/140.csv
index 4d59858..4d59858 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/140.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/140.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/144.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/144.csv
index e8c6492..e8c6492 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/144.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/144.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/146.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/146.csv
index f656c72..f656c72 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/146.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/146.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/148.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/148.csv
index b292889..b292889 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/148.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/148.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/150.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/150.csv
index c1bf12e..c1bf12e 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/150.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/150.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/152.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/152.csv
index 24a03ba..24a03ba 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/152.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/152.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/152_cofactor.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/152_cofactor.csv
index 7861bbd..7861bbd 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/152_cofactor.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/152_cofactor.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/16.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/16.csv
index fd76ff7..fd76ff7 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/16.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/16.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/20.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/20.csv
index 940d10c..940d10c 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/20.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/20.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/25.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/25.csv
index 318099b..318099b 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/25.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/25.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/2a.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/2a.csv
index 670f4bc..670f4bc 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/2a.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/2a.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/2b.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/2b.csv
index 216827b..216827b 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/2b.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/2b.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/3.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/3.csv
index 18ec491..18ec491 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/3.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/3.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/32.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/32.csv
index fddfeee..fddfeee 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/32.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/32.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/4.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/4.csv
index a5b9e09..a5b9e09 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/4.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/4.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/48.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/48.csv
index 202a15b..202a15b 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/48.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/48.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/5.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/5.csv
index 5f0597c..5f0597c 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/5.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/5.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/6.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/6.csv
index 9c1528f..9c1528f 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/6.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/6.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/64.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/64.csv
index 94a2709..94a2709 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/64.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/64.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/7.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/7.csv
index 170b180..170b180 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/7.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/7.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/70.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/70.csv
index 1dbf9c0..1dbf9c0 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/70.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/70.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/8.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/8.csv
index 232df05..232df05 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/8.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/8.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/80.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/80.csv
index da082ef..da082ef 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/80.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/80.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/90.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/90.csv
index d67e673..d67e673 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/90.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/90.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/96.csv b/src/cz/crcs/ectester/data/composite/varying/160/first/96.csv
index 5dd2d5c..5dd2d5c 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/96.csv
+++ b/src/cz/crcs/ectester/data/composite/varying/160/first/96.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/140.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/140.csv
new file mode 100644
index 0000000..b9d7ef4
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/140.csv
@@ -0,0 +1 @@
+0xcb0fbd7d31f129c9445949ac2a53313dc664dcf5,0xbac859aab1168154552b678c5710381db579e093,0xa6bba8fe9ce31053ef6df534c0f51abf7f2b84f6,0x89ddb9394b1e7aa83435762bd9fb10b382112c9d,0x0195f79a927f4933fc96fd11d22f645fd2a6165e,0xd27f195fd2b5a2ce76e0a0883493af40f29,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/141.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/141.csv
new file mode 100644
index 0000000..6e1bbae
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/141.csv
@@ -0,0 +1 @@
+0xad848c5b6dd0a0a4069abc227c1067e0181b2737,0x19ee65c4d27dbb11e6209ca476e192d09b2d1c63,0x764d165a2dade5d7a08a76111d7fbbc2d11ef0e0,0x5bcd89823c97b60ad38738fe720f185f3b40b45e,0x09a715128167a9c88c740460bd69458fa9d4fe46,0x1998e626a1aed4c95d9d4b4c2b7a7f7a9db7,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/142.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/142.csv
new file mode 100644
index 0000000..6232e83
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/142.csv
@@ -0,0 +1 @@
+0xb5d6a607a39940bc0048f4aa5ccdc4d5a5ce610d,0x2a1ae87f817fa325f32f2e0105f282027b2ba43f,0x659ed881b0d7116353d5f7a915d2f19e893d69aa,0x1b334db8e98df484ad04272df15f3e86d39ef22e,0x4cd77e9caad63bd4607eb0ed55e6beb23ff450ac,0x3a204ba60e40fa9b658d3a1a8b2a9bc3cf59,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/143.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/143.csv
new file mode 100644
index 0000000..8446888
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/143.csv
@@ -0,0 +1 @@
+0xd4b9159c7fc2792372543d143613b52f59998f97,0x2d42a2dfc137411a8c70ade2bdf0592b40943710,0x05e4b77414fb3c55c130f2bcaef25f3d151bd099,0x5a756a4341b6a3e22dead483df6f181e8b9a2a11,0xcd4da9413d50e4d5215e6bbcf6d5a7b0e3a3daad,0x72ff5242224738c7ce5b71bc1f89fd2b4b37,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/144.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/144.csv
new file mode 100644
index 0000000..1b1a067
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/144.csv
@@ -0,0 +1 @@
+0xb1782dbf5f2c4021d8b9b5b363c82e0ca3b6777d,0x6076e1773b2c55518400dc32e80be429edcb965a,0x42ea1ee077a97b47a0e1e768e6926639b66ce893,0x9c662a05f65b34ddc7f87b6b7684a07b898a1c34,0x2845b2b399e0159f6096acb982ef4db0914088c9,0xc87bb99f30317e9dac369288e804184aa599,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/145.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/145.csv
new file mode 100644
index 0000000..6c9143d
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/145.csv
@@ -0,0 +1 @@
+0xb527a5bd64b0565b27ff7cf9602983f1614fffa3,0x19d78ae1d883b88aa6f0f7858d4e1be5a8f7e3fb,0x209c90f1e463fe85994da3a49bf1573b51174a1a,0x19d11cc60298336167b838b1980f7220c4a38ae4,0x370c05e2d1b3f2da9f0c7613a156c079ede829a7,0x1dbc7f60ad202d5d0beea6a46ba5e0cfdb415,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/146.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/146.csv
new file mode 100644
index 0000000..e56c367
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/146.csv
@@ -0,0 +1 @@
+0xee5432006a4e6cbe37b806adb8caa4ea3db20871,0x8840485629c0217fe0c06136960a8ee0ff052cf6,0x4c2d28b41bf1195979928396a38349fba3f8790c,0x7d220bdba9cccd7ac1eff4c0faa15943df8c5661,0xafac34dd20bc52fc5d591ba7b3ba61804573cea7,0x3e4f1ab7695bf568e94399144ba99087b8b43,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/147.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/147.csv
new file mode 100644
index 0000000..a2d3a7c
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/147.csv
@@ -0,0 +1 @@
+0xd4af3495a36eaecf01f5333d4ed9c0557e7d290f,0x8009417988238ec78161b22a5193683dd3a30db1,0x78194aed072799ea84118a326f19db81c96cc133,0x43c7510009f2a50acf960aee86f8e5f4680bb399,0x63e3c2609b3cb63a0bfabe048d4910b98806f986,0x768a687b40a678e8b32a197c56a5e8e73c2e9,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/148.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/148.csv
new file mode 100644
index 0000000..898e8f0
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/148.csv
@@ -0,0 +1 @@
+0xb4b26d3a176014e5e78384429e7cfb7fc54e5977,0x3314626f01d24d21beda9d48df49e3ecbc7cb71e,0x3756db6c83ddaa8e67c67e58359cc9a9cf0fd855,0x8622b6abfae956ec4340565a8441e3829553dc9d,0x548d45e6ed7673b271076e14c3d6e56b58edbc95,0xc1b3ad6efad76b6c3bc52edecbe9558da19c5,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/149.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/149.csv
new file mode 100644
index 0000000..0d7aedb
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/149.csv
@@ -0,0 +1 @@
+0xceceeaa7a8152749b1ecf9bc92f6fdc6e9b6090d,0x8ae42228a534ba5893260370f28090fb64e9946e,0x638476b65f061b9519065ca3dee37d03ee253b6f,0xca0c26fa582635625744d77e72134099aacc7d51,0x22342b88baf41bb6d4b8d61f9e7e2d767838ae49,0x1aa507af8faa15cf84906cef78d950265b459d,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/150.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/150.csv
new file mode 100644
index 0000000..f739032
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/150.csv
@@ -0,0 +1 @@
+0xb7adb7da47532691380d279b714329a18c73bf5b,0x62b5535930b3b6291724d2931c6d6e77b9e7603e,0xa6e5735c172868621e282c8606f0f7bf69196b98,0x936da9db53a9cdf04603e3e74dfd597e17159c47,0x0e57b546f6b8fce730f9eb62a15047533b0866e5,0x38dbb1f277473e654a9df7571e61d3d954144d,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/151.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/151.csv
new file mode 100644
index 0000000..febab80
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/151.csv
@@ -0,0 +1 @@
+0xb43604e48b105f7a9a3b48c7bfd6d3e0ac093e29,0x444d3467678862170058dd92531a9e2bbe28ca79,0x89c6c1006cf8d019db1813b81549d7ddeff6bfd0,0x48faa03d1bd1142749c886ff0ed8cf990cfae57e,0x7188beb85a7c04ca83328b66f74d284b8d4ab1c5,0x6b0a1bda4f09218bf0b0c4db0eda6a4452e5e5,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/152.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/152.csv
new file mode 100644
index 0000000..95628ad
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/152.csv
@@ -0,0 +1 @@
+0xd998f399cb387874de3a6a56d1babc55720e5abf,0x9c8f7ea6edb66b2570d884fd8eb6b7bfa832fe5a,0xa2a58c9670ac7a17713263ccf56187f4b3a9538c,0x37a374fcc33795ab48f2c5cefb55059e4047a5bd,0x688bb2276ffbdb652f5a9adb8f6861fa58f0a348,0xddee9ca918b3fc62cc35c868f2841bce9f9587,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/153.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/153.csv
new file mode 100644
index 0000000..2cc60aa
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/153.csv
@@ -0,0 +1 @@
+0xcb5e3c67cebdcab6da9abee717934147f573e455,0x8528cb57477cb9daf1b39f210ec4305e38d59af9,0x625bc0553d8acf552224e9ef4a0d680bd097af1a,0x7cd27cf687a0f4cb8b192d2a301dc155e382a51a,0x79b81b30498366d71e34a6e73d7fc1acb70d887e,0x199f05982a2c1179cef17249652a9866f31ffe5,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/154.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/154.csv
new file mode 100644
index 0000000..abbc06f
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/154.csv
@@ -0,0 +1 @@
+0xc790ce0bbeb04fc50f56ffa90ac697664b33a0c5,0x3c27b2c2fef3181c1b7b342f5d0b141e9b1fa083,0x643c56c57d4dd643ce041ea26bf84ad607b768cf,0x03ac9106b43aefc2474993dc00ca435526e62dbd,0x218216a290e95e1d06ce4a633604067084226b3e,0x3458579e5bfbe29004061a83bdcbf9f03b740df,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/155.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/155.csv
new file mode 100644
index 0000000..5268be3
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/155.csv
@@ -0,0 +1 @@
+0xb291f1d68a548cb930da845e4dddde4a459fca55,0x3ff55740d89a34a571572edfd9603ac231420227,0x17109ebf052464e986afe2008ae70355b585b07d,0x27d235656b6608a9df667f7ee99f76e9c6001d8d,0x1cf7d6d12b86ef2fd9b9fb032ab38a902d28fcb2,0x62857c99ad6c70f36a668b6cb0b39ca3859ee3d,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/156.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/156.csv
new file mode 100644
index 0000000..b48d7de
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/156.csv
@@ -0,0 +1 @@
+0xb5753cb547a5fe317e9e85a7b0ecf7bcc8358b89,0x39c31f1f78b01c7ab7010de50026f25884ecfac1,0x5acf7eaab9c2bbb84dfdcf6253983c75e3f892a9,0x8c109fac40ecf79c874b1347c89bdd0b1e32bd58,0x198bc391b21d8be4e9b47250a86f03d3bfb4cd61,0xdf5537067f9138da74724f682ce1971c0319dff,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/157.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/157.csv
new file mode 100644
index 0000000..06cd933
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/157.csv
@@ -0,0 +1 @@
+0xd7e7392c25ed14a0c4f61532461ebb36e8aac95d,0xbfa946439770d5832c224072c35a523550c63470,0x6cc6a5296eae2706bd6acfff1c6ca1e20be17f15,0x30fafbc8479b28fe86fe336f67035094e74deaaa,0x3621025307234ee276a45b78f101f88353d1ddf9,0x1ed7e39897b42784ae6c29501574867ebf7c3d5b,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/158.csv b/src/cz/crcs/ectester/data/composite/varying/160/second/158.csv
new file mode 100644
index 0000000..c35a628
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/second/158.csv
@@ -0,0 +1 @@
+0xa686fb6e6f34c9e85dc6ae22a1d84a17b547b82d,0xa5c25d0cf5bd6443f3342843108b9b4b795be6ca,0x59c73b85c6591dd41f185e6cb009a3068717197b,0x4dc987eec93319f036dea2ec3d2ae58639c44574,0x6799aaad16a911c57f9643c38fe3cabf2e41644b,0x378253cf7a66edf81f41bedf086cec98847ad68b,0x01