diff --git a/internal/pkg/omcitst/omci_self_test_handler.go b/internal/pkg/omcitst/omci_self_test_handler.go
index c5148cb..cfa4536 100755
--- a/internal/pkg/omcitst/omci_self_test_handler.go
+++ b/internal/pkg/omcitst/omci_self_test_handler.go
@@ -55,23 +55,23 @@
 // We initiate an fsmCb per Self Test Request
 type fsmCb struct {
 	fsm          *cmn.AdapterFsm
-	reqMsg       extension.SingleGetValueRequest
 	respChan     chan extension.SingleGetValueResponse
 	stopOmciChan chan bool
+	reqMsg       extension.SingleGetValueRequest
 }
 
 // SelfTestControlBlock - TODO: add comment
 type SelfTestControlBlock struct {
-	deviceID       string
 	pDeviceHandler cmn.IdeviceHandler
 	pDevEntry      cmn.IonuDeviceEntry
 
-	selfTestFsmMap  map[generated.ClassID]*fsmCb // The fsmCb is indexed by ME Class ID of the Test Action procedure
-	selfTestFsmLock sync.RWMutex
+	selfTestFsmMap     map[generated.ClassID]*fsmCb // The fsmCb is indexed by ME Class ID of the Test Action procedure
+	StopSelfTestModule chan bool
+	deviceID           string
+	selfTestFsmLock    sync.RWMutex
 
 	SelfTestHandlerLock   sync.RWMutex
 	SelfTestHandlerActive bool
-	StopSelfTestModule    chan bool
 }
 
 // NewSelfTestMsgHandlerCb creates the SelfTestControlBlock
@@ -184,6 +184,7 @@
 	}()
 }
 
+//nolint:unparam
 func (selfTestCb *SelfTestControlBlock) submitFailureGetValueResponse(ctx context.Context, respChan chan extension.SingleGetValueResponse,
 	errorCode extension.GetValueResponse_ErrorReason, statusCode extension.GetValueResponse_Status, reqMsg extension.SingleGetValueRequest) {
 	meClassID, err := selfTestCb.getMeClassID(ctx, reqMsg)
diff --git a/internal/pkg/omcitst/omci_test_request.go b/internal/pkg/omcitst/omci_test_request.go
index dc79b27..2445855 100755
--- a/internal/pkg/omcitst/omci_test_request.go
+++ b/internal/pkg/omcitst/omci_test_request.go
@@ -33,15 +33,15 @@
 
 // OmciTestRequest structure holds the information for the OMCI test
 type OmciTestRequest struct {
-	deviceID     string
 	pDevOmciCC   *cmn.OmciCC
+	verifyDone   chan<- bool
+	deviceID     string
+	txSeqNo      uint16
 	extended     bool
 	started      bool
 	result       bool
 	exclusiveCc  bool
 	allowFailure bool
-	txSeqNo      uint16
-	verifyDone   chan<- bool
 }
 
 // CTestRequestOmciTimeout - Special OMCI timeout for low prio test request
@@ -52,6 +52,7 @@
 	deviceID string, omciCc *cmn.OmciCC, extended bool,
 	exclusive bool, allowFailure bool) *OmciTestRequest {
 	logger.Debug(ctx, "OmciTestRequest-init")
+	//nolint:govet
 	var OmciTestRequest OmciTestRequest
 	OmciTestRequest.deviceID = deviceID
 	OmciTestRequest.pDevOmciCC = omciCc