diff --git a/tests/suites/test_suite_ecdsa.data b/tests/suites/test_suite_ecdsa.data
index d59355e..f07483d 100644
--- a/tests/suites/test_suite_ecdsa.data
+++ b/tests/suites/test_suite_ecdsa.data
@@ -362,62 +362,62 @@
 depends_on:MBEDTLS_ECP_DP_SECP521R1_ENABLED
 ecdsa_prim_test_vectors:MBEDTLS_ECP_DP_SECP521R1:"0065FDA3409451DCAB0A0EAD45495112A3D813C17BFD34BDF8C1209D7DF5849120597779060A7FF9D704ADF78B570FFAD6F062E95C7E0C5D5481C5B153B48B375FA11":"0151518F1AF0F563517EDD5485190DF95A4BF57B5CBA4CF2A9A3F6474725A35F7AFE0A6DDEB8BEDBCD6A197E592D40188901CECD650699C9B5E456AEA5ADD19052A8":"006F3B142EA1BFFF7E2837AD44C9E4FF6D2D34C73184BBAD90026DD5E6E85317D9DF45CAD7803C6C20035B2F3FF63AFF4E1BA64D1C077577DA3F4286C58F0AEAE643":"00C1C2B305419F5A41344D7E4359933D734096F556197A9B244342B8B62F46F9373778F9DE6B6497B1EF825FF24F42F9B4A4BD7382CFC3378A540B1B7F0C1B956C2F":"DDAF35A193617ABACC417349AE20413112E6FA4E89A97EA20A9EEEE64B55D39A2192992A274FC1A836BA3C23A3FEEBBD454D4423643CE80E2A9AC94FA54CA49F":"0154FD3836AF92D0DCA57DD5341D3053988534FDE8318FC6AAAAB68E2E6F4339B19F2F281A7E0B22C269D93CF8794A9278880ED7DBB8D9362CAEACEE544320552251":"017705A7030290D1CEB605A9A1BB03FF9CDD521E87A696EC926C8C10C8362DF4975367101F67D1CF9BCCBF2F3D239534FA509E70AAC851AE01AAC68D62F866472660":MBEDTLS_ERR_ECP_INVALID_KEY
 
-ECDSA verify invalid public key, zero bytes of data
+ECDSA verify invalid pub key (not on curve), zero bytes of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"1":"2":"1":"1":"":0:MBEDTLS_ERR_ECP_INVALID_KEY
 
-ECDSA verify invalid public key, one byte of data
+ECDSA verify invalid pub key (not on curve), one byte of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"1":"2":"1":"1":"00":0:MBEDTLS_ERR_ECP_INVALID_KEY
 
-ECDSA verify invalid public key (a), 32 bytes of data
+ECDSA verify invalid pub key (not on curve), r=1, s=1
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"1":"2":"1":"1":"0000000000000000000000000000000000000000000000000000000000000000":0:MBEDTLS_ERR_ECP_INVALID_KEY
 
-ECDSA verify invalid public key (b), 32 bytes of data
+ECDSA verify invalid pub key (also not on curve), r=1, s=1
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"1":"12345":"1":"1":"0000000000000000000000000000000000000000000000000000000000000000":0:MBEDTLS_ERR_ECP_INVALID_KEY
 
-ECDSA verify invalid public key (c), 32 bytes of data
+ECDSA verify invalid pub key (not on curve), r=12345, s=1
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"1":"2":"12345":"1":"0000000000000000000000000000000000000000000000000000000000000000":0:MBEDTLS_ERR_ECP_INVALID_KEY
 
-ECDSA verify invalid public key (d), 32 bytes of data
+ECDSA verify invalid pub key (not on curve), r=1, s=12345
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"1":"2":"1":"12345":"0000000000000000000000000000000000000000000000000000000000000000":0:MBEDTLS_ERR_ECP_INVALID_KEY
 
-ECDSA verify valid public key, invalid signature, 0 bytes of data
+ECDSA verify valid pub key, invalid sig (r=0), 0 bytes of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798":"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8":"0":"1":"":1:MBEDTLS_ERR_ECP_VERIFY_FAILED
 
-ECDSA verify valid public key, invalid signature, 1 byte of data
+ECDSA verify valid pub key, invalid sig (r=0), 1 byte of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798":"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8":"0":"1":"00":1:MBEDTLS_ERR_ECP_VERIFY_FAILED
 
-ECDSA verify valid public key, invalid signature, 32 bytes of data
+ECDSA verify valid pub key, invalid sig (r>n-1), 32 bytes of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798":"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8":"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141":"12":"0000000000000000000000000000000000000000000000000000000000000000":1:MBEDTLS_ERR_ECP_VERIFY_FAILED
 
-ECDSA verify valid public key, valid/incorrect signature, 0 bytes of data
+ECDSA verify valid pub key, valid/incorrect sig, 0 bytes of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798":"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8":"ed3bace23c5e17652e174c835fb72bf53ee306b3406a26890221b4cef7500f88":"84eead3fb3cdbdac882412af64cc125b6784690bebf575f1c32162ab65080037":"":1:MBEDTLS_ERR_ECP_VERIFY_FAILED
 
-ECDSA verify valid public key, valid/incorrect signature, 1 byte of data
+ECDSA verify valid pub key, valid/incorrect sig, 1 byte of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798":"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8":"ed3bace23c5e17652e174c835fb72bf53ee306b3406a26890221b4cef7500f88":"84eead3fb3cdbdac882412af64cc125b6784690bebf575f1c32162ab65080037":"00":1:MBEDTLS_ERR_ECP_VERIFY_FAILED
 
-ECDSA verify valid public key, valid/incorrect signature, 32 bytes of data
+ECDSA verify valid pub key, valid/incorrect sig, 32 bytes of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798":"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8":"ed3bace23c5e17652e174c835fb72bf53ee306b3406a26890221b4cef7500f88":"84eead3fb3cdbdac882412af64cc125b6784690bebf575f1c32162ab65080037":"0000000000000000000000000000000000000000000000000000000000000000":1:MBEDTLS_ERR_ECP_VERIFY_FAILED
 
-ECDSA verify valid public key, correct signature, 0 bytes of data
+ECDSA verify valid public key, correct sig, 0 bytes of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798":"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8":"ed3bace23c5e17652e174c835fb72bf53ee306b3406a26890221b4cef7500f88":"c9cc1ba95156bc103055a5d7946f3a3ae7f0657d1e53f1d5c2c9782950aa69b":"":1:0
 
-ECDSA verify valid public key, correct signature, 1 byte of data
+ECDSA verify valid pub key, correct sig, 1 byte of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798":"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8":"ed3bace23c5e17652e174c835fb72bf53ee306b3406a26890221b4cef7500f88":"c9cc1ba95156bc103055a5d7946f3a3ae7f0657d1e53f1d5c2c9782950aa69b":"00":1:0
 
-ECDSA verify valid public key, correct signature, 32 bytes of data
+ECDSA verify valid pub key, correct sig, 32 bytes of data
 depends_on:MBEDTLS_ECP_DP_SECP256K1_ENABLED
 ecdsa_verify:MBEDTLS_ECP_DP_SECP256K1:"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798":"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8":"ed3bace23c5e17652e174c835fb72bf53ee306b3406a26890221b4cef7500f88":"c9cc1ba95156bc103055a5d7946f3a3ae7f0657d1e53f1d5c2c9782950aa69b":"0000000000000000000000000000000000000000000000000000000000000000":1:0