diff --git a/test_src/main-aes-test.c b/test_src/main-aes-test.c
index 71d7bef..67e928e 100644
--- a/test_src/main-aes-test.c
+++ b/test_src/main-aes-test.c
@@ -692,21 +692,6 @@ const const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ NULL,                NULL, NULL                            }
 };
 
-
-int main (void){
-	DEBUG_INIT();
-
-	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;
-	cmacvs_algolist=(bcdesc_t**)algolist;
-	cmacvs_algo=(bcdesc_t*)&aes128_desc;
-	for(;;){
-		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		cli_putstr(algo_name);
-		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-		cmd_interface(cmdlist);
-	}
-}
 int main(void) {
 	main_setup();
 
diff --git a/test_src/main-arcfour-test.c b/test_src/main-arcfour-test.c
index 30801f8..89df1c7 100644
--- a/test_src/main-arcfour-test.c
+++ b/test_src/main-arcfour-test.c
@@ -93,9 +93,6 @@ const cmdlist_entry_t cmdlist[] PROGMEM = {
 int main(void) {
 	main_setup();
 
-	shavs_algolist=(hfdesc_t**)algolist;
-	shavs_algo=(hfdesc_t*)&sha256_desc;
-
 	for(;;){
 		welcome_msg(algo_name);
 		cmd_interface(cmdlist);
diff --git a/test_src/main-present-test.c b/test_src/main-present-test.c
index 3a08c12..bd20b1e 100644
--- a/test_src/main-present-test.c
+++ b/test_src/main-present-test.c
@@ -141,9 +141,6 @@ const cmdlist_entry_t cmdlist[] PROGMEM = {
 int main(void) {
 	main_setup();
 
-	shavs_algolist=(hfdesc_t**)algolist;
-	shavs_algo=(hfdesc_t*)&sha256_desc;
-
 	for(;;){
 		welcome_msg(algo_name);
 		cmd_interface(cmdlist);
diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index 48d2634..44e8225 100644
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -77,10 +77,10 @@ void sha1_ctx_dump(sha1_ctx_t *s){
 }
 
 void testrun_sha1(void){
-	sha1_hash_t hash;
+	uint8_t hash[20];
 	sha1(&hash,"abc",3*8);
 	cli_putstr_P(PSTR("\r\nsha1(\"abc\") = \r\n\t"));
-	cli_hexdump(hash,SHA1_HASH_BITS/8);
+	cli_hexdump(hash, SHA1_HASH_BITS/8);
 
 	sha1(&hash,"\0\0\0\0\0\0\0\0", 8*8);
 	cli_putstr_P(PSTR("\r\nsha1(8 x 0x00) = \r\n\t"));
@@ -126,7 +126,7 @@ void testrun_sha1(void){
 
 void testrun_sha1_2(void){
 	sha1_ctx_t ctx;
-	sha1_hash_t hash;
+	uint8_t hash[20];
 	sha1(&hash,"",0);
 	cli_putstr_P(PSTR("\r\nsha1(NULL) = \r\n\t"));
 	cli_hexdump(hash,SHA1_HASH_BYTES);
@@ -159,7 +159,7 @@ void testrun_sha1_506(void){
 		0x72, 0x22, 0x46, 0xb0, 0x14, 0xaf, 0x03, 0xef,
 		0x3b, 0xa3, 0x13, 0x64, 0xfc, 0x73, 0x2a, 0x4a,
 		0xb8, 0xf3, 0x85, 0x87 };
-	sha1_hash_t hash;
+	uint8_t hash[20];
 	sha1(&hash,data,506);
 	cli_putstr_P(PSTR("\r\nsha1(<tv506>) = \r\n\t"));
 	cli_hexdump(hash,SHA1_HASH_BYTES);