diff --git a/internal/pkg/node/transformer_test.go b/internal/pkg/node/transformer_test.go
index 204b44a4..3c642e50 100644
--- a/internal/pkg/node/transformer_test.go
+++ b/internal/pkg/node/transformer_test.go
@@ -137,7 +137,7 @@ func Test_nodeYaml_SetFrom(t *testing.T) {
 	t.Run("Get() default network mask", func(t *testing.T) {
 		value := test_node1.NetDevs["net0"].Netmask.Get()
 		if value != "255.255.255.0" {
-			t.Errorf("Get() returned wrong default netmask: %s", value)
+			t.Errorf("Get() returned wrong default netmask, got: %s want: 255.255.255.0", value)
 		}
 	})
 	t.Run("Get() default network mask", func(t *testing.T) {
@@ -310,8 +310,7 @@ ipmi: {}
 
 	})
 	t.Run("Set() netdev foo with device name baar for flattened empty node", func(t *testing.T) {
-		netdev := NewNetDevEntry()
-		test_node4.NetDevs["foo"] = &netdev
+		test_node4.NetDevs["foo"] = new(NetDevEntry)
 		test_node4.NetDevs["foo"].Device.Set("baar")
 		nodeConf := NewConf()
 		nodeConf.GetFrom(test_node4)
@@ -324,7 +323,8 @@ ipmi: {}
 		if !(wanted == string(ymlByte)) {
 			t.Errorf("Got wrong yml, wanted:\n'%s'\nGot:\n'%s'", wanted, string(ymlByte))
 		}
-		test_node4.NetDevs["foo"].Tags["netfoo"] = &Entry{}
+		test_node4.NetDevs["foo"].Tags = make(map[string]*Entry)
+		test_node4.NetDevs["foo"].Tags["netfoo"] = new(Entry)
 		test_node4.NetDevs["foo"].Tags["netfoo"].Set("netbaar")
 		nodeConf.GetFrom(test_node4)
 		nodeConf.Flatten()
@@ -336,10 +336,11 @@ ipmi: {}
 `
 		ymlByte, _ = yaml.Marshal(nodeConf)
 		if string(ymlByte) != wanted {
-			t.Errorf("Couldn set nettag: '%s' got: '%s'", wanted, string(ymlByte))
+			t.Errorf("Couldn't set nettag: '%s' got: '%s'", wanted, string(ymlByte))
 		}
 
 		delete(test_node4.NetDevs, "foo")
+		nodeConf = NewConf()
 		nodeConf.GetFrom(test_node4)
 		nodeConf.Flatten()
 		ymlByte, _ = yaml.Marshal(nodeConf)