diff --git a/pkg/comms/agentserver_test.go b/pkg/comms/agentserver_test.go
index 0e56d7c..acf6e2b 100644
--- a/pkg/comms/agentserver_test.go
+++ b/pkg/comms/agentserver_test.go
@@ -42,8 +42,8 @@ func (s *AgentServerTestSuite) SetupTest() {
 	bitpipe := testsupport.NewInmemoryConnection(s.ctx, "inmemory", 10)
 	agentConnection := bitpipe.Front()
 	serverConnection := bitpipe.Back()
-	s.serverConnection = serverConnection
 	s.agentConnection = agentConnection
+	s.serverConnection = serverConnection
 }
 
 func (suite *AgentServerTestSuite) TearDownTest() {
diff --git a/pkg/testsupport/channelreadwriter.go b/pkg/testsupport/channelreadwriter.go
index 5cf5c78..f608795 100644
--- a/pkg/testsupport/channelreadwriter.go
+++ b/pkg/testsupport/channelreadwriter.go
@@ -4,8 +4,6 @@ import (
 	"context"
 	"errors"
 	"io"
-	"log"
-	"runtime"
 	"sync"
 )
 
@@ -90,10 +88,6 @@ func (rw *ChannelReadWriteCloser) Close() error {
 	defer rw.senderMutex.Unlock()
 
 	if !rw.closed {
-		log.Println("Closing ChannelReadWriteCloser")
-		buf := make([]byte, 0)
-		runtime.Stack(buf, false)
-		log.Printf("Stack %v", string(buf))
 		close(rw.sender)
 		rw.closed = true
 	}