diff --git a/interfaces/preimage/generate.go b/interfaces/preimage/generate.go
index f410e087332478d09dcff8ce32c33af5a4263855..476e6b7157c8953ac82a572e119f725c0a081475 100644
--- a/interfaces/preimage/generate.go
+++ b/interfaces/preimage/generate.go
@@ -6,6 +6,10 @@ import (
 )
 
 func Generate(data []byte, t string) []byte {
+
+	if t==Default{
+		return data
+	}
 	// Hash fingerprints
 	h, _ := blake2b.New256(nil)
 	h.Write(data)
diff --git a/storage/edge/edge_test.go b/storage/edge/edge_test.go
index e059e749666f0f30223e78e584a5af995a91092a..c7823245f47a29d839622a63200ea46dfcba9185 100644
--- a/storage/edge/edge_test.go
+++ b/storage/edge/edge_test.go
@@ -149,7 +149,7 @@ func TestStore_Add(t *testing.T) {
 			"\nexpected: %d\nreceived: %d", identities[0], 3, len(pis))
 	}
 
-	expected := Preimage{preimage.Generate(identities[0].Bytes(), preimage.Default), preimage.Default, identities[0].Bytes()}
+	expected := Preimage{preimage.MakeDefault(identities[0]), preimage.Default, identities[0].Bytes()}
 	if !reflect.DeepEqual(pis[expected.key()], expected) {
 		t.Errorf("First Preimage of first Preimages does not match expected."+
 			"\nexpected: %+v\nreceived: %+v", expected, pis[expected.key()])
@@ -174,7 +174,7 @@ func TestStore_Add(t *testing.T) {
 			"\nexpected: %d\nreceived: %d", identities[1], 2, len(pis))
 	}
 
-	expected = Preimage{preimage.Generate(identities[1].Bytes(), preimage.Default), preimage.Default, identities[1].Bytes()}
+	expected = Preimage{preimage.MakeDefault(identities[1]), preimage.Default, identities[1].Bytes()}
 	if !reflect.DeepEqual(pis[expected.key()], expected) {
 		t.Errorf("First Preimage of second Preimages does not match expected."+
 			"\nexpected: %+v\nreceived: %+v", expected, pis[expected.key()])
@@ -292,7 +292,7 @@ func TestStore_Remove(t *testing.T) {
 		t.Errorf("Remove returned an error: %+v", err)
 	}
 
-	if len(s.edge) != 3 {
+	if len(s.edge) != 2 {
 		t.Errorf("Length of edge incorrect.\nexpected: %d\nreceived: %d",
 			2, len(s.edge))
 	}
@@ -318,9 +318,9 @@ func TestStore_Remove(t *testing.T) {
 
 	pis = s.edge[*identities[1]]
 
-	if len(pis) != 1 {
+	if len(pis) != 0 {
 		t.Errorf("Length of preimages for identity %s inocrrect."+
-			"\nexpected: %d\nreceived: %d", identities[1], 1, len(pis))
+			"\nexpected: %d\nreceived: %d", identities[1], 0, len(pis))
 	}
 
 	wg.Wait()
@@ -349,7 +349,7 @@ func TestStore_Get(t *testing.T) {
 	}
 
 	expected := []Preimage{
-		{preimage.Generate(identities[0].Bytes(), preimage.Default), preimage.Default, identities[0].Bytes()},
+		{preimage.MakeDefault(identities[0]), preimage.Default, identities[0].Bytes()},
 		preimages[0],
 		preimages[2],
 	}
@@ -375,7 +375,7 @@ top:
 	}
 
 	expected = []Preimage{
-		{preimage.Generate(identities[1].Bytes(), preimage.Default), preimage.Default, identities[1].Bytes()},
+		{preimage.MakeDefault(identities[1]), preimage.Default, identities[1].Bytes()},
 		preimages[1],
 	}
 
@@ -475,12 +475,12 @@ func TestLoadStore(t *testing.T) {
 
 	expectedPis := [][]Preimage{
 		{
-			Preimage{preimage.Generate(identities[0].Bytes(), preimage.Default), preimage.Default, identities[0].Bytes()},
+			Preimage{preimage.MakeDefault(identities[0]), preimage.Default, identities[0].Bytes()},
 			preimages[0],
 			preimages[2],
 		},
 		{
-			Preimage{preimage.Generate(identities[1].Bytes(), preimage.Default), preimage.Default, identities[1].Bytes()},
+			Preimage{preimage.MakeDefault(identities[1]), preimage.Default, identities[1].Bytes()},
 			preimages[1],
 		},
 	}