diff --git a/pkg/amt/redirection/service.go b/pkg/amt/redirection/service.go
index bd46326e..55efb2c5 100644
--- a/pkg/amt/redirection/service.go
+++ b/pkg/amt/redirection/service.go
@@ -6,10 +6,38 @@
 package redirection
 
 import (
+	"encoding/json"
+	"encoding/xml"
+
 	"github.com/open-amt-cloud-toolkit/go-wsman-messages/internal/message"
 	"github.com/open-amt-cloud-toolkit/go-wsman-messages/pkg/amt/actions"
+	"github.com/open-amt-cloud-toolkit/go-wsman-messages/pkg/common"
+	"github.com/open-amt-cloud-toolkit/go-wsman-messages/pkg/wsman"
 )
 
+type (
+	Response struct {
+		*wsman.Message
+		XMLName xml.Name       `xml:"Envelope"`
+		Header  message.Header `xml:"Header"`
+		Body    Body           `xml:"Body"`
+	}
+	Body struct {
+		XMLName     xml.Name    `xml:"Body"`
+		Redirection Redirection `xml:"AMT_RedirectionService"`
+
+		EnumerateResponse common.EnumerateResponse
+	}
+	Redirection struct {
+		CreationClassName       string
+		ElementName             string
+		EnabledState            int
+		ListenerEnabled         bool
+		Name                    string
+		SystemCreationClassName string
+		SystemName              string
+	}
+)
 type RedirectionResponse struct {
 	AMT_RedirectionService RedirectionService
 }
@@ -58,7 +86,16 @@ const (
 )
 
 type Service struct {
-	base message.Base
+	base   message.Base
+	client wsman.WSManClient
+}
+
+func (w *Response) JSON() string {
+	jsonOutput, err := json.Marshal(w.Body)
+	if err != nil {
+		return ""
+	}
+	return string(jsonOutput)
 }
 
 func NewRedirectionService(wsmanMessageCreator *message.WSManMessageCreator) Service {
@@ -67,14 +104,57 @@ func NewRedirectionService(wsmanMessageCreator *message.WSManMessageCreator) Ser
 	}
 }
 
+func NewRedirectionServiceWithClient(wsmanMessageCreator *message.WSManMessageCreator, client wsman.WSManClient) Service {
+	return Service{
+		base:   message.NewBaseWithClient(wsmanMessageCreator, AMT_RedirectionService, client),
+		client: client,
+	}
+}
+
 // Get retrieves the representation of the instance
-func (RedirectionService Service) Get() string {
-	return RedirectionService.base.Get(nil)
+func (s Service) Get() (response Response, err error) {
+
+	response = Response{
+		Message: &wsman.Message{
+			XMLInput: s.base.Get(nil),
+		},
+	}
+
+	// send the message to AMT
+	err = s.base.Execute(response.Message)
+	if err != nil {
+		return
+	}
+
+	// put the xml response into the go struct
+	err = xml.Unmarshal([]byte(response.XMLOutput), &response)
+	if err != nil {
+		return
+	}
+
+	return
 }
 
 // Enumerates the instances of this class
-func (RedirectionService Service) Enumerate() string {
-	return RedirectionService.base.Enumerate()
+func (s Service) Enumerate() (response Response, err error) {
+	response = Response{
+		Message: &wsman.Message{
+			XMLInput: s.base.Enumerate(),
+		},
+	}
+	// send the message to AMT
+	err = s.base.Execute(response.Message)
+	if err != nil {
+		return
+	}
+
+	// put the xml response into the go struct
+	err = xml.Unmarshal([]byte(response.XMLOutput), &response)
+	if err != nil {
+		return
+	}
+
+	return
 }
 
 // Pulls instances of this class, following an Enumerate operation
diff --git a/pkg/amt/redirection/service_test.go b/pkg/amt/redirection/service_test.go
index 66515879..7de81ca7 100644
--- a/pkg/amt/redirection/service_test.go
+++ b/pkg/amt/redirection/service_test.go
@@ -6,45 +6,126 @@
 package redirection
 
 import (
+	"encoding/xml"
+	"fmt"
+	"io"
+	"os"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
 	"github.com/open-amt-cloud-toolkit/go-wsman-messages/internal/message"
+	"github.com/open-amt-cloud-toolkit/go-wsman-messages/pkg/common"
+	//"github.com/open-amt-cloud-toolkit/go-wsman-messages/pkg/wsman"
 	"github.com/open-amt-cloud-toolkit/go-wsman-messages/pkg/wsmantesting"
 )
 
+type MockClient struct {
+}
+
+const (
+	EnvelopeResponse = `<a:Envelope xmlns:a="http://www.w3.org/2003/05/soap-envelope" x-mlns:b="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:c="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd" xmlns:d="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:e="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:f="http://schemas.dmtf.org/wbem/wsman/1/cimbinding.xsd" xmlns:g="http://intel.com/wbem/wscim/1/amt-schema/1/AMT_RedirectionService" xmlns:h="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a:Header><b:To>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</b:To><b:RelatesTo>0</b:RelatesTo><b:Action a:mustUnderstand="true">`
+	GetBody          = `<g:AMT_RedirectionService><g:CreationClassName>AMT_RedirectionService</g:CreationClassName><g:ElementName>Intel(r) AMT Redirection Service</g:ElementName><g:Name>Intel(r) AMT Redirection Service</g:Name><g:SystemCreationClassName>CIM_ComputerSystem</g:SystemCreationClassName><g:SystemName>ManagedSystem</g:SystemName></g:AMT_RedirectionService`
+)
+
+var currentMessage = ""
+
+func (c *MockClient) Post(msg string) ([]byte, error) {
+	// read an xml file from disk:
+	xmlFile, err := os.Open("../../wsmantesting/responses/amt/redirection/" + strings.ToLower(currentMessage) + ".xml")
+	if err != nil {
+		fmt.Println("Error opening file:", err)
+		return nil, err
+	}
+	defer xmlFile.Close()
+	// read file into string
+	xmlData, err := io.ReadAll(xmlFile)
+	if err != nil {
+		fmt.Println("Error reading file:", err)
+		return nil, err
+	}
+	// strip carriage returns and new line characters
+	xmlData = []byte(strings.ReplaceAll(string(xmlData), "\r\n", ""))
+
+	// Simulate a successful response for testing.
+	return []byte(xmlData), nil
+}
 func TestAMT_RedirectionService(t *testing.T) {
 	messageID := 0
 	resourceUriBase := "http://intel.com/wbem/wscim/1/amt-schema/1/"
 	wsmanMessageCreator := message.NewWSManMessageCreator(resourceUriBase)
-	elementUnderTest := NewRedirectionService(wsmanMessageCreator)
+	client := MockClient{} // wsman.NewClient("http://localhost:16992/wsman", "admin", "P@ssw0rd", true)
+	//elementUnderTest := NewServiceWithClient(wsmanMessageCreator, &client)
+	// enumerationId := ""
+	//client := wsman.NewClient("http://localhost:16992/wsman", "admin", "Intel123!", true)
+	elementUnderTest := NewRedirectionServiceWithClient(wsmanMessageCreator, &client)
 
 	t.Run("amt_* Tests", func(t *testing.T) {
 		tests := []struct {
-			name         string
-			method       string
-			action       string
-			body         string
-			responseFunc func() string
+			name             string
+			method           string
+			action           string
+			body             string
+			responseFunc     func() (Response, error)
+			expectedResponse interface{}
 		}{
 			//GETS
-			{"should create a valid AMT_RedirectionService Get wsman message", "AMT_RedirectionService", wsmantesting.GET, "", elementUnderTest.Get},
+			{
+				"should create a valid AMT_RedirectionService Get wsman message",
+				"AMT_RedirectionService",
+				wsmantesting.GET,
+				"",
+				func() (Response, error) {
+					currentMessage = "Get"
+					return elementUnderTest.Get()
+				},
+				Body{
+					XMLName: xml.Name{Space: "http://www.w3.org/2003/05/soap-envelope", Local: "Body"},
+					Redirection: Redirection{
+						CreationClassName:       "AMT_RedirectionService",
+						ElementName:             "Intel(r) AMT Redirection Service",
+						EnabledState:            32771,
+						ListenerEnabled:         true,
+						Name:                    "Intel(r) AMT Redirection Service            ",
+						SystemCreationClassName: "CIM_ComputerSystem",
+						SystemName:              "Intel(r) AMT",
+					},
+				},
+			},
 			//ENUMERATES
-			{"should create a valid AMT_RedirectionService Enumerate wsman message", "AMT_RedirectionService", wsmantesting.ENUMERATE, wsmantesting.ENUMERATE_BODY, elementUnderTest.Enumerate},
+			{
+				"should create a valid AMT_RedirectionService Enumerate wsman message",
+				"AMT_RedirectionService",
+				wsmantesting.ENUMERATE,
+				wsmantesting.ENUMERATE_BODY,
+				func() (Response, error) {
+					currentMessage = "Enumerate"
+					return elementUnderTest.Enumerate()
+				},
+				Body{
+					XMLName: xml.Name{Space: "http://www.w3.org/2003/05/soap-envelope", Local: "Body"},
+					EnumerateResponse: common.EnumerateResponse{
+						EnumerationContext: "D3000000-0000-0000-0000-000000000000",
+					},
+				},
+			},
 			//PULLS
-			{"should create a valid AMT_RedirectionService Pull wsman message", "AMT_RedirectionService", wsmantesting.PULL, wsmantesting.PULL_BODY, func() string { return elementUnderTest.Pull(wsmantesting.EnumerationContext) }},
+			//{"should create a valid AMT_RedirectionService Pull wsman message", "AMT_RedirectionService", wsmantesting.PULL, wsmantesting.PULL_BODY, func() string { return elementUnderTest.Pull(wsmantesting.EnumerationContext) }},
 		}
-
 		for _, test := range tests {
 			t.Run(test.name, func(t *testing.T) {
-				correctResponse := wsmantesting.ExpectedResponse(messageID, resourceUriBase, test.method, test.action, "", test.body)
+				expectedXMLInput := wsmantesting.ExpectedResponse(messageID, resourceUriBase, test.method, test.action, "", test.body)
 				messageID++
-				response := test.responseFunc()
-				if response != correctResponse {
-					assert.Equal(t, correctResponse, response)
-				}
+				response, err := test.responseFunc()
+				//println(response.XMLInput)
+				//println(response.XMLOutput)
+				assert.NoError(t, err)
+				assert.Equal(t, expectedXMLInput, response.XMLInput)
+				assert.Equal(t, test.expectedResponse, response.Body)
+
 			})
 		}
+
 	})
 }
diff --git a/pkg/wsmantesting/responses/amt/redirection/enumerate.xml b/pkg/wsmantesting/responses/amt/redirection/enumerate.xml
new file mode 100644
index 00000000..65f7641f
--- /dev/null
+++ b/pkg/wsmantesting/responses/amt/redirection/enumerate.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<a:Envelope xmlns:a="http://www.w3.org/2003/05/soap-envelope"
+    xmlns:b="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+    xmlns:c="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"
+    xmlns:d="http://schemas.xmlsoap.org/ws/2005/02/trust"
+    xmlns:e="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+    xmlns:f="http://schemas.dmtf.org/wbem/wsman/1/cimbinding.xsd"
+    xmlns:g="http://schemas.xmlsoap.org/ws/2004/09/enumeration"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <a:Header>
+        <b:To>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</b:To>
+        <b:RelatesTo>0</b:RelatesTo>
+        <b:Action a:mustUnderstand="true">http://schemas.xmlsoap.org/ws/2004/09/enumeration/EnumerateResponse</b:Action>
+        <b:MessageID>uuid:00000000-8086-8086-8086-000000000322</b:MessageID>
+        <c:ResourceURI>http://intel.com/wbem/wscim/1/amt-schema/1/AMT_RedirectionService</c:ResourceURI>
+    </a:Header>
+    <a:Body>
+        <g:EnumerateResponse>
+            <g:EnumerationContext>D3000000-0000-0000-0000-000000000000</g:EnumerationContext>
+        </g:EnumerateResponse>
+    </a:Body>
+</a:Envelope>
\ No newline at end of file
diff --git a/pkg/wsmantesting/responses/amt/redirection/get.xml b/pkg/wsmantesting/responses/amt/redirection/get.xml
index f4f9e942..84624c09 100644
--- a/pkg/wsmantesting/responses/amt/redirection/get.xml
+++ b/pkg/wsmantesting/responses/amt/redirection/get.xml
@@ -1,4 +1,4 @@
-<?xml version= "1.0" encoding= "UTF-8"?>
+<?xml version= "1.0" encoding= "UTF-8"?> 
 <a:Envelope xmlns:a= "http://www.w3.org/2003/05/soap-envelope" xmlns:b= "http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:c= "http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd" xmlns:d= "http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:e= "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:f= "http://schemas.dmtf.org/wbem/wsman/1/cimbinding.xsd" xmlns:g= "http://intel.com/wbem/wscim/1/amt-schema/1/AMT_RedirectionService" xmlns:h= "http://schemas.dmtf.org/wbem/wscim/1/common"
     xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance">
     <a:Header>