diff --git a/elkrem/elkrem_test.go b/elkrem/elkrem_test.go
index f8646344..0cf9ef89 100644
--- a/elkrem/elkrem_test.go
+++ b/elkrem/elkrem_test.go
@@ -8,64 +8,50 @@ import (
 
 // TestElkremBig tries 10K hashes
 func TestElkremBig(t *testing.T) {
-	sndr := NewElkremSender(wire.DoubleSha256SH([]byte("elktest")))
 	var rcv ElkremReceiver
-	//	SenderSerdesTest(t, sndr)
+
+	sndr := NewElkremSender(wire.DoubleSha256SH([]byte("elktest")))
+
 	for n := uint64(0); n < 10000; n++ {
 		sha, err := sndr.AtIndex(n)
 		if err != nil {
 			t.Fatal(err)
 		}
-		err = rcv.AddNext(sha)
-		if err != nil {
+
+		if err = rcv.AddNext(sha); err != nil {
 			t.Fatal(err)
 		}
-		if n%1000 == 999 {
-			t.Logf("stack with %d received hashes\n", n+1)
-			for i, n := range rcv.s {
-				t.Logf("Stack element %d: index %d height %d %s\n",
-					i, n.i, n.h, n.sha.String())
-			}
-		}
 	}
-	//	SenderSerdesTest(t, sndr)
+
 	ReceiverSerdesTest(t, &rcv)
+
 	for n := uint64(0); n < 10000; n += 500 {
-		sha, err := rcv.AtIndex(n)
-		if err != nil {
+		if _, err := rcv.AtIndex(n); err != nil {
 			t.Fatal(err)
 		}
-		t.Logf("Retreived index %d %s\n", n, sha.String())
 	}
 }
 
 // TestElkremLess tries 10K hashes
 func TestElkremLess(t *testing.T) {
-	sndr := NewElkremSender(wire.DoubleSha256SH([]byte("elktest2")))
 	var rcv ElkremReceiver
+
+	sndr := NewElkremSender(wire.DoubleSha256SH([]byte("elktest2")))
+
 	for n := uint64(0); n < 5000; n++ {
 		sha, err := sndr.AtIndex(n)
 		if err != nil {
 			t.Fatal(err)
 		}
-		err = rcv.AddNext(sha)
-		if err != nil {
+
+		if err = rcv.AddNext(sha); err != nil {
 			t.Fatal(err)
 		}
-		if n%1000 == 999 {
-			t.Logf("stack with %d received hashes\n", n+1)
-			for i, n := range rcv.s {
-				t.Logf("Stack element %d: index %d height %d %s\n",
-					i, n.i, n.h, n.sha.String())
-			}
-		}
 	}
+
 	for n := uint64(0); n < 5000; n += 500 {
-		sha, err := rcv.AtIndex(n)
-		if err != nil {
+		if _, err := rcv.AtIndex(n); err != nil {
 			t.Fatal(err)
 		}
-		t.Logf("Retreived index %d %s\n",
-			n, sha.String())
 	}
 }