diff --git a/config/config_test.go b/config/config_test.go
index 991d916e1..2230ddce1 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -108,7 +108,7 @@ func TestDefaults(t *testing.T) {
 	}
 	eCfg.MediatorEnabled = false
 	eCfg.MediatorRater = utils.INTERNAL
-	eCfg.MediatorRaterReconnects = 3
+	eCfg.MediatorReconnects = 3
 	eCfg.MediatorStats = utils.INTERNAL
 	eCfg.SMEnabled = false
 	eCfg.SMSwitchType = FS
diff --git a/engine/cdrs.go b/engine/cdrs.go
index e449d1038..fecd96ec6 100644
--- a/engine/cdrs.go
+++ b/engine/cdrs.go
@@ -24,15 +24,14 @@ import (
 	"net/http"
 
 	"github.com/cgrates/cgrates/config"
-	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/utils"
 )
 
 var (
 	cfg     *config.CGRConfig // Share the configuration with the rest of the package
-	storage engine.CdrStorage
+	storage CdrStorage
 	medi    *Mediator
-	stats   engine.StatsInterface
+	stats   StatsInterface
 )
 
 // Returns error if not able to properly store the CDR, mediation is async since we can always recover offline
@@ -40,7 +39,7 @@ func storeAndMediate(storedCdr *utils.StoredCdr) error {
 	if stats != nil {
 		go func() {
 			if err := stats.AppendCDR(storedCdr, nil); err != nil {
-				engine.Logger.Err(fmt.Sprintf("Could not append cdr to stats: %s", err.Error()))
+				Logger.Err(fmt.Sprintf("Could not append cdr to stats: %s", err.Error()))
 			}
 		}()
 	}
@@ -89,10 +88,10 @@ func NewCdrS(s CdrStorage, m *Mediator, st *Stats, c *config.CGRConfig) *CDRS {
 	stats = st
 	if cfg.CDRSStats != "" {
 		if cfg.CDRSStats != utils.INTERNAL {
-			if s, err := engine.NewProxyStats(cfg.CDRSStats); err == nil {
+			if s, err := NewProxyStats(cfg.CDRSStats); err == nil {
 				stats = s
 			} else {
-				engine.Logger.Err(fmt.Sprintf("Errors connecting to CDRS stats service : %s", err.Error()))
+				Logger.Err(fmt.Sprintf("Errors connecting to CDRS stats service : %s", err.Error()))
 			}
 		}
 	} else {
diff --git a/engine/mediator.go b/engine/mediator.go
index 2ee412986..9cb5e3a56 100644
--- a/engine/mediator.go
+++ b/engine/mediator.go
@@ -24,7 +24,6 @@ import (
 	"time"
 
 	"github.com/cgrates/cgrates/config"
-	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/utils"
 )
 
@@ -38,10 +37,10 @@ func NewMediator(connector Connector, logDb LogStorage, cdrDb CdrStorage, st Sta
 	}
 	if m.cgrCfg.MediatorStats != "" {
 		if m.cgrCfg.MediatorStats != utils.INTERNAL {
-			if s, err := engine.NewProxyStats(m.cgrCfg.MediatorStats); err == nil {
+			if s, err := NewProxyStats(m.cgrCfg.MediatorStats); err == nil {
 				m.stats = s
 			} else {
-				engine.Logger.Err(fmt.Sprintf("Errors connecting to CDRS stats service (mediator): %s", err.Error()))
+				Logger.Err(fmt.Sprintf("Errors connecting to CDRS stats service (mediator): %s", err.Error()))
 			}
 		}
 	} else {
@@ -172,7 +171,7 @@ func (self *Mediator) RateCdr(storedCdr *utils.StoredCdr, sendToStats bool) erro
 		if sendToStats && self.stats != nil {
 			go func() {
 				if err := self.stats.AppendCDR(cdr, nil); err != nil {
-					engine.Logger.Err(fmt.Sprintf("Could not append cdr to stats (mediator): %s", err.Error()))
+					Logger.Err(fmt.Sprintf("Could not append cdr to stats (mediator): %s", err.Error()))
 				}
 			}()
 		}
@@ -184,15 +183,14 @@ func (self *Mediator) RateCdr(storedCdr *utils.StoredCdr, sendToStats bool) erro
 	return nil
 }
 
-func (self *Mediator) RateCdrs(cgrIds, runIds, tors, cdrHosts, cdrSources, reqTypes, directions, tenants, categories, accounts, subjects, destPrefixes, ratedAccounts, ratedSubjects []string,
-	orderIdStart, orderIdEnd int64, timeStart, timeEnd time.Time, rerateErrors, rerateRated bool, sendToStats bool) error {
+func (self *Mediator) RateCdrs(cgrIds, runIds, tors, cdrHosts, cdrSources, reqTypes, directions, tenants, categories, accounts, subjects, destPrefixes, ratedAccounts, ratedSubjects []string, orderIdStart, orderIdEnd int64, timeStart, timeEnd time.Time, rerateErrors, rerateRated, sendToStats bool) error {
 	cdrs, err := self.cdrDb.GetStoredCdrs(cgrIds, runIds, tors, cdrHosts, cdrSources, reqTypes, directions, tenants, categories, accounts, subjects, destPrefixes, ratedAccounts, ratedSubjects,
 		orderIdStart, orderIdEnd, timeStart, timeEnd, !rerateErrors, !rerateRated, true)
 	if err != nil {
 		return err
 	}
 	for _, cdr := range cdrs {
-		if err := self.RateCdr(cdr, sentToStats); err != nil {
+		if err := self.RateCdr(cdr, sendToStats); err != nil {
 			return err
 		}
 	}
diff --git a/test.sh b/test.sh
index 5497f0aaf..fe3c8ace5 100755
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,4 @@
-1#! /usr/bin/env sh
+#! /usr/bin/env sh
 
 go test -i github.com/cgrates/cgrates/engine
 go test -i github.com/cgrates/cgrates/sessionmanager