diff --git a/cdrc/cdrc_local_test.go b/cdrc/cdrc_local_test.go
index 1fa731eae..be4668599 100644
--- a/cdrc/cdrc_local_test.go
+++ b/cdrc/cdrc_local_test.go
@@ -166,8 +166,10 @@ func TestCsvLclProcessCdrDir(t *testing.T) {
 	for _, cdrcCfg = range cdrcCfgs { // Take the first config out, does not matter which one
 		break
 	}
-	if cdrcCfg.Cdrs == utils.INTERNAL { // For now we only test over network
-		cdrcCfg.Cdrs = "127.0.0.1:2013"
+	for _, cdrsConn := range cdrcCfg.CdrsConns {
+		if cdrsConn.Address == utils.INTERNAL {
+			cdrsConn.Address = "127.0.0.1:2013"
+		}
 	}
 	if err := startEngine(); err != nil {
 		t.Fatal(err.Error())
@@ -202,8 +204,10 @@ func TestCsvLclProcessCdr3Dir(t *testing.T) {
 	if !*testLocal {
 		return
 	}
-	if cdrcCfg.Cdrs == utils.INTERNAL { // For now we only test over network
-		cdrcCfg.Cdrs = "127.0.0.1:2013"
+	for _, cdrsConn := range cdrcCfg.CdrsConns {
+		if cdrsConn.Address == utils.INTERNAL {
+			cdrsConn.Address = "127.0.0.1:2013"
+		}
 	}
 	if err := startEngine(); err != nil {
 		t.Fatal(err.Error())
diff --git a/cmd/cgr-engine/rater.go b/cmd/cgr-engine/rater.go
index 4f8e17be6..1647ee62a 100644
--- a/cmd/cgr-engine/rater.go
+++ b/cmd/cgr-engine/rater.go
@@ -189,12 +189,10 @@ func startRater(internalRaterChan chan rpcclient.RpcClientConnection, cacheDoneC
 			engine.SetUserService(usersConns)
 		}()
 	}
-
 	// Wait for all connections to complete before going further
 	for _, chn := range waitTasks {
 		<-chn
 	}
-
 	responder := &engine.Responder{Bal: bal, ExitChan: exitChan, Stats: cdrStats}
 	responder.SetTimeToLive(cfg.ResponseCacheTTL, nil)
 	apierRpcV1 := &v1.ApierV1{StorDb: loadDb, RatingDb: ratingDb, AccountDb: accountDb, CdrDb: cdrDb, LogDb: logDb, Sched: sched,
diff --git a/sessionmanager/session_test.go b/sessionmanager/session_test.go
index 247e12121..f23b7d37f 100644
--- a/sessionmanager/session_test.go
+++ b/sessionmanager/session_test.go
@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
 )
 
 //"github.com/cgrates/cgrates/config"
@@ -89,26 +90,26 @@ func (mc *MockRpcClient) Call(methodName string, arg interface{}, reply interfac
 	}
 	return nil
 }
-func (mc *MockConnector) GetCost(*engine.CallDescriptor, *engine.CallCost) error  { return nil }
-func (mc *MockConnector) Debit(*engine.CallDescriptor, *engine.CallCost) error    { return nil }
-func (mc *MockConnector) MaxDebit(*engine.CallDescriptor, *engine.CallCost) error { return nil }
-func (mc *MockConnector) RefundIncrements(cd *engine.CallDescriptor, reply *float64) error {
+func (mc *MockRpcClient) GetCost(*engine.CallDescriptor, *engine.CallCost) error  { return nil }
+func (mc *MockRpcClient) Debit(*engine.CallDescriptor, *engine.CallCost) error    { return nil }
+func (mc *MockRpcClient) MaxDebit(*engine.CallDescriptor, *engine.CallCost) error { return nil }
+func (mc *MockRpcClient) RefundIncrements(cd *engine.CallDescriptor, reply *float64) error {
 	mc.refundCd = cd
 	return nil
 }
-func (mc *MockConnector) RefundRounding(cd *engine.CallDescriptor, reply *float64) error {
+func (mc *MockRpcClient) RefundRounding(cd *engine.CallDescriptor, reply *float64) error {
 	return nil
 }
-func (mc *MockConnector) GetMaxSessionTime(*engine.CallDescriptor, *float64) error { return nil }
-func (mc *MockConnector) GetDerivedChargers(*utils.AttrDerivedChargers, *utils.DerivedChargers) error {
+func (mc *MockRpcClient) GetMaxSessionTime(*engine.CallDescriptor, *float64) error { return nil }
+func (mc *MockRpcClient) GetDerivedChargers(*utils.AttrDerivedChargers, *utils.DerivedChargers) error {
 	return nil
 }
-func (mc *MockConnector) GetDerivedMaxSessionTime(*engine.CDR, *float64) error    { return nil }
-func (mc *MockConnector) GetSessionRuns(*engine.CDR, *[]*engine.SessionRun) error { return nil }
-func (mc *MockConnector) ProcessCdr(*engine.CDR, *string) error                   { return nil }
-func (mc *MockConnector) StoreSMCost(engine.AttrCDRSStoreSMCost, *string) error   { return nil }
-func (mc *MockConnector) GetLCR(*engine.AttrGetLcr, *engine.LCRCost) error        { return nil }
-func (mc *MockConnector) GetTimeout(int, *time.Duration) error                    { return nil }
+func (mc *MockRpcClient) GetDerivedMaxSessionTime(*engine.CDR, *float64) error    { return nil }
+func (mc *MockRpcClient) GetSessionRuns(*engine.CDR, *[]*engine.SessionRun) error { return nil }
+func (mc *MockRpcClient) ProcessCdr(*engine.CDR, *string) error                   { return nil }
+func (mc *MockRpcClient) StoreSMCost(engine.AttrCDRSStoreSMCost, *string) error   { return nil }
+func (mc *MockRpcClient) GetLCR(*engine.AttrGetLcr, *engine.LCRCost) error        { return nil }
+func (mc *MockRpcClient) GetTimeout(int, *time.Duration) error                    { return nil }
 
 func TestSessionRefund(t *testing.T) {
 	mc := &MockRpcClient{}