diff --git a/dispatchers/accounts_it_test.go b/dispatchers/accounts_it_test.go
index 7dfa59d8e..1116fe3f4 100644
--- a/dispatchers/accounts_it_test.go
+++ b/dispatchers/accounts_it_test.go
@@ -23,8 +23,6 @@ package dispatchers
 import (
 	"testing"
 
-	"github.com/cgrates/cgrates/config"
-
 	"github.com/cgrates/cgrates/utils"
 )
 
@@ -77,131 +75,3 @@ func testDspAccPrfPing(t *testing.T) {
 		t.Errorf("Received: %s", reply)
 	}
 }
-
-func TestDspSchedulerSv1PingErrorNilEvent(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	var reply *string
-	result := dspSrv.SchedulerSv1Ping(nil, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspSchedulerSv1PingErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &utils.CGREvent{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.SchedulerSv1Ping(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspSchedulerSv1PingNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &utils.CGREvent{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.SchedulerSv1Ping(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspSchedulerSv1ReloadErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &utils.CGREvent{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.SchedulerSv1Reload(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspSchedulerSv1ReloadPingNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &utils.CGREvent{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.SchedulerSv1Reload(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspSchedulerSv1ExecuteActionsErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &utils.AttrsExecuteActions{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.SchedulerSv1ExecuteActions(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspSchedulerSv1ExecuteActionsNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &utils.AttrsExecuteActions{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.SchedulerSv1ExecuteActions(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspSchedulerSv1ExecuteActionPlansErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &utils.AttrsExecuteActionPlans{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.SchedulerSv1ExecuteActionPlans(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspSchedulerSv1ExecuteActionPlansNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &utils.AttrsExecuteActionPlans{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.SchedulerSv1ExecuteActionPlans(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go
index e53990ffb..85b467b33 100644
--- a/dispatchers/cdrs_it_test.go
+++ b/dispatchers/cdrs_it_test.go
@@ -874,57 +874,3 @@ func TestDspCDRsV2ProcessEventErrorNil(t *testing.T) {
 		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
 	}
 }
-
-func TestDspCDRsV1StoreSessionCostNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &engine.AttrCDRSStoreSMCost{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.CDRsV1StoreSessionCost(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspCDRsV1StoreSessionCostErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &engine.AttrCDRSStoreSMCost{}
-	var reply *string
-	result := dspSrv.CDRsV1StoreSessionCost(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspCDRsV2StoreSessionCostNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &engine.ArgsV2CDRSStoreSMCost{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.CDRsV2StoreSessionCost(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspCDRsV2StoreSessionCostErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &engine.ArgsV2CDRSStoreSMCost{}
-	var reply *string
-	result := dspSrv.CDRsV2StoreSessionCost(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
diff --git a/dispatchers/replicator.go b/dispatchers/replicator.go
index 61b78dac8..ee9e1c030 100644
--- a/dispatchers/replicator.go
+++ b/dispatchers/replicator.go
@@ -1100,7 +1100,9 @@ func (dS *DispatcherService) ReplicatorSv1SetAccount(args *utils.AccountWithAPIO
 
 func (dS *DispatcherService) ReplicatorSv1RemoveAccount(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithAPIOpts{}
+		args = &utils.TenantIDWithAPIOpts{
+			TenantID: &utils.TenantID{},
+		}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
diff --git a/dispatchers/responder_it_test.go b/dispatchers/responder_it_test.go
index a1ec4608c..7aa6d6948 100644
--- a/dispatchers/responder_it_test.go
+++ b/dispatchers/responder_it_test.go
@@ -25,10 +25,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cgrates/cgrates/engine"
-
-	"github.com/cgrates/cgrates/config"
-
 	"github.com/cgrates/cgrates/utils"
 	"github.com/cgrates/rpcclient"
 )
@@ -242,271 +238,3 @@ func testDspResponderInternal(t *testing.T) {
 		t.Errorf("Expected: DispatcherS1 , received: %s", strRply)
 	}
 }
-
-func TestDspResponderPingEventNilEvent(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	var reply *string
-	result := dspSrv.ResponderPing(nil, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderPingEventNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &utils.CGREvent{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.ResponderPing(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderPingErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &utils.CGREvent{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.ResponderPing(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderDebitNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *engine.CallCost
-	result := dspSrv.ResponderDebit(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderDebitErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *engine.CallCost
-	result := dspSrv.ResponderDebit(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderGetCostNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *engine.CallCost
-	result := dspSrv.ResponderGetCost(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderGetCostErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *engine.CallCost
-	result := dspSrv.ResponderGetCost(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderMaxDebitNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *engine.CallCost
-	result := dspSrv.ResponderMaxDebit(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderMaxDebitErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *engine.CallCost
-	result := dspSrv.ResponderMaxDebit(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderRefundIncrementsNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *engine.Account
-	result := dspSrv.ResponderRefundIncrements(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderRefundIncrementsErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *engine.Account
-	result := dspSrv.ResponderRefundIncrements(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderRefundRoundingNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *float64
-	result := dspSrv.ResponderRefundRounding(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderRefundRoundingErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *float64
-	result := dspSrv.ResponderRefundRounding(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderGetMaxSessionTimeNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *time.Duration
-	result := dspSrv.ResponderGetMaxSessionTime(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderGetMaxSessionTimeErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &engine.CallDescriptorWithAPIOpts{
-		CallDescriptor: &engine.CallDescriptor{
-			Tenant: "tenant",
-		},
-	}
-	var reply *time.Duration
-	result := dspSrv.ResponderGetMaxSessionTime(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderShutdownNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := &utils.TenantWithAPIOpts{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.ResponderShutdown(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspResponderShutdownErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := &utils.TenantWithAPIOpts{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.ResponderShutdown(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
diff --git a/dispatchers/servicemanager_it_test.go b/dispatchers/servicemanager_it_test.go
index c477e9811..3e5d5d97d 100644
--- a/dispatchers/servicemanager_it_test.go
+++ b/dispatchers/servicemanager_it_test.go
@@ -67,90 +67,3 @@ func TestDspServiceManagerV1PingNil(t *testing.T) {
 		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
 	}
 }
-
-func TestDspServiceManagerV1StartServiceErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := ArgStartServiceWithAPIOpts{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.ServiceManagerV1StartService(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspServiceManagerV1StartServiceNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := ArgStartServiceWithAPIOpts{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.ServiceManagerV1StartService(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspServiceManagerV1StopServiceErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := ArgStartServiceWithAPIOpts{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.ServiceManagerV1StopService(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspServiceManagerV1StopServiceNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := ArgStartServiceWithAPIOpts{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.ServiceManagerV1StopService(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspServiceManagerV1ServiceStatusNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	cgrCfg.DispatcherSCfg().AttributeSConns = []string{"test"}
-	CGREvent := ArgStartServiceWithAPIOpts{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.ServiceManagerV1ServiceStatus(CGREvent, reply)
-	expected := "MANDATORY_IE_MISSING: [ApiKey]"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}
-
-func TestDspServiceManagerV1ServiceStatusErrorNil(t *testing.T) {
-	cgrCfg := config.NewDefaultCGRConfig()
-	dspSrv := NewDispatcherService(nil, cgrCfg, nil, nil)
-	CGREvent := ArgStartServiceWithAPIOpts{
-		Tenant: "tenant",
-	}
-	var reply *string
-	result := dspSrv.ServiceManagerV1ServiceStatus(CGREvent, reply)
-	expected := "DISPATCHER_ERROR:NOT_FOUND"
-	if result == nil || result.Error() != expected {
-		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result)
-	}
-}