diff --git a/pkg/types/hex_address.go b/pkg/types/hex_address.go
index 5d445a0b..73b0c509 100644
--- a/pkg/types/hex_address.go
+++ b/pkg/types/hex_address.go
@@ -47,15 +47,7 @@ type HexType struct {
 
 // Explicitly quote hex addresses so that they are interpreted as string (not int)
 func (ht *HexType) MarshalYAML() (interface{}, error) {
-	//convert to byte type
-	hexBytes, err := hex.DecodeString(string(ht.HexValue[2:]))
-	if err != nil {
-		return nil, err
-	}
-	//copy bytes to fixed array
-	var hexArray []byte
-	copy(hexArray[:], hexBytes)
-	hexAddr, err := ht.HexWrap.WrapHexAddress([]byte(hexArray))
+	hexAddr, err := ht.HexWrap.WrapHexAddress([]byte(ht.HexValue))
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/types/hex_address_test.go b/pkg/types/hex_address_test.go
deleted file mode 100644
index 71e26783..00000000
--- a/pkg/types/hex_address_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package types
-
-import (
-	"encoding/hex"
-	"testing"
-
-	"github.com/hyperledger/firefly-signer/pkg/ethtypes"
-	"github.com/stretchr/testify/assert"
-	"gopkg.in/yaml.v3"
-)
-
-func TestWrapHexAddress(t *testing.T) {
-	tests := []struct {
-		Name     string
-		Hexvalue string `yaml:"hexvalue"`
-	}{
-		{
-			Name:     "Case 16-Bits",
-			Hexvalue: "0x1f2a000000000000000000000000000000000000",
-		},
-		{
-			Name:     "Case 24-Bits",
-			Hexvalue: "0x123abc0000000000000000000000000000000000",
-		},
-		{
-			Name:     "Case 32-Bits",
-			Hexvalue: "0xabcdeffedcba9876543210abcdeffedc00000000",
-		},
-		{
-			Name:     "Case 64-Bits",
-			Hexvalue: "0x1234567890abcdef012345670000000000000000",
-		},
-		{
-			Name:     "Case 65-Bits",
-			Hexvalue: "0x1234567890abcdef0123456789abcdef6789abcd",
-		},
-		{
-			Name:     "Case 128-Bits",
-			Hexvalue: "0x1234567890abcdef0123456789abcdef00000000",
-		},
-		{
-			Name:     "Case 152-Bits",
-			Hexvalue: "0x549b5f43a40e1a0522864a004cfff2b0ca473a65",
-		},
-	}
-	for _, tc := range tests {
-		t.Run(tc.Name, func(t *testing.T) {
-			var hexType HexType
-			//[2:] is used to skip the "0x" prefix before decoding the hexadecimal string into a byte slice.
-			//because x isnt a valid hexadecimal digit
-			hexBytes, err := hex.DecodeString(tc.Hexvalue[2:])
-			if err != nil {
-				t.Log("Unable to decode values:", err)
-			}
-			if len(hexBytes) != 20 {
-				t.Fatalf("expected 20 bytes, got %d bytes", len(hexBytes))
-			}
-			// Copy bytes to a fixed-size array
-			var hexArray []byte
-			copy(hexArray[:], hexBytes)
-			//encodes the decoded values to hexadecimal and returns string
-			//Ethereum convention for representing hexadecimal values, the prefix must have "0x"
-			result, err := hexType.HexWrap.WrapHexAddress([]byte(hexArray))
-			if err != nil {
-				t.Log("error in generating result", err)
-				t.Fail()
-				return
-			}
-			assert.Equal(t, tc.Hexvalue, result)
-		})
-
-	}
-}
-
-type HexAddr struct {
-	ethtypes.Address0xHex
-}
-
-func TestYamlMarshal(t *testing.T) {
-	testAddress := []struct {
-		Name     string
-		Hexvalue string `yaml:"hexvalue"`
-	}{
-		{
-			Name:     "Case 16-Bits",
-			Hexvalue: "0x1f2a000000000000000000000000000000000000",
-		},
-		{
-			Name:     "Case 24-Bits",
-			Hexvalue: "0x123abc0000000000000000000000000000000000",
-		},
-		{
-			Name:     "Case 32-Bits",
-			Hexvalue: "0xabcdeffedcba9876543210abcdeffedc00000000",
-		},
-		{
-			Name:     "Case 64-Bits",
-			Hexvalue: "0x1234567890abcdef012345670000000000000000",
-		},
-	}
-	for _, tc := range testAddress {
-		t.Run(tc.Name, func(t *testing.T) {
-			var hexType HexType
-			hexbyte, err := hex.DecodeString(tc.Hexvalue[2:])
-			if err != nil {
-				t.Log("unable to decode values")
-			}
-			var hexArray []byte
-			copy(hexArray[:], hexbyte)
-			YamlHex, err := hexType.HexWrap.WrapHexAddress([]byte(hexArray))
-			if err != nil {
-				t.Log("unable to generate yaml string")
-			}
-
-			YamlNode := yaml.Node{
-				Value: YamlHex,
-			}
-			assert.YAMLEq(t, YamlNode.Value, YamlHex)
-		})
-
-	}
-}