diff --git a/cmd/cgr-loader/cgr-loader_remove_it_test.go b/cmd/cgr-loader/cgr-loader_remove_it_test.go
index 79cc892f8..3e240f9ea 100644
--- a/cmd/cgr-loader/cgr-loader_remove_it_test.go
+++ b/cmd/cgr-loader/cgr-loader_remove_it_test.go
@@ -23,9 +23,6 @@ package main
 import (
 	"bytes"
 	"errors"
-	"github.com/cgrates/cgrates/config"
-	"github.com/cgrates/cgrates/engine"
-	"github.com/cgrates/cgrates/utils"
 	"net/rpc"
 	"net/rpc/jsonrpc"
 	"os/exec"
@@ -34,6 +31,10 @@ import (
 	"sort"
 	"testing"
 	"time"
+
+	"github.com/cgrates/cgrates/config"
+	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
 )
 
 var (
@@ -126,7 +127,7 @@ func testCgrLdrGetSubsystemsNotLoadedLoad(t *testing.T) {
 	if err := cgrLdrRPC.Call(utils.APIerSv1GetAttributeProfile,
 		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_ACNT_1001"}},
 		&replyAttr); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Errorf("Expected %+q, received %+q", utils.ErrNotFound.Error(), err.Error())
+		t.Errorf("Expected %+q, received %v", utils.ErrNotFound.Error(), err)
 	}
 
 	//filtersPrf
@@ -134,7 +135,7 @@ func testCgrLdrGetSubsystemsNotLoadedLoad(t *testing.T) {
 	if err := cgrLdrRPC.Call(utils.APIerSv1GetFilter,
 		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "FLTR_1"}},
 		&replyFltr); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Errorf("Expected %+q, received %+q", utils.ErrNotFound.Error(), err.Error())
+		t.Errorf("Expected %+q, received %v", utils.ErrNotFound.Error(), err)
 	}
 
 	// resourcesPrf
@@ -142,7 +143,7 @@ func testCgrLdrGetSubsystemsNotLoadedLoad(t *testing.T) {
 	if err := cgrLdrRPC.Call(utils.APIerSv1GetResourceProfile,
 		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RES_ACNT_1001"}},
 		&replyResPrf); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Errorf("Expected %+q, received %+q", utils.ErrNotFound.Error(), err.Error())
+		t.Errorf("Expected %+q, received %v", utils.ErrNotFound.Error(), err)
 	}
 
 	// resource
@@ -150,7 +151,7 @@ func testCgrLdrGetSubsystemsNotLoadedLoad(t *testing.T) {
 	if err := cgrLdrRPC.Call(utils.ResourceSv1GetResource,
 		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RES_ACNT_1001"}},
 		&replyRes); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Errorf("Expected %+q, received %+q", utils.ErrNotFound.Error(), err.Error())
+		t.Errorf("Expected %+q, received %v", utils.ErrNotFound.Error(), err)
 	}
 
 	// routesPrf
@@ -158,7 +159,7 @@ func testCgrLdrGetSubsystemsNotLoadedLoad(t *testing.T) {
 	if err := cgrLdrRPC.Call(utils.APIerSv1GetRouteProfile,
 		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ROUTE_ACNT_1001"}},
 		&replyRts); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Errorf("Expected %+q, received %+q", utils.ErrNotFound.Error(), err.Error())
+		t.Errorf("Expected %+q, received %v", utils.ErrNotFound.Error(), err)
 	}
 
 	// statsPrf
@@ -166,7 +167,7 @@ func testCgrLdrGetSubsystemsNotLoadedLoad(t *testing.T) {
 	if err := cgrLdrRPC.Call(utils.APIerSv1GetStatQueueProfile,
 		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_1"}},
 		&replySts); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Errorf("Expected %+q, received %+q", utils.ErrNotFound.Error(), err.Error())
+		t.Errorf("Expected %+q, received %v", utils.ErrNotFound.Error(), err)
 	}
 
 	// statQueue
@@ -174,7 +175,7 @@ func testCgrLdrGetSubsystemsNotLoadedLoad(t *testing.T) {
 	if err := cgrLdrRPC.Call(utils.StatSv1GetStatQueue,
 		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_1"}},
 		&replyStQue); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Errorf("Expected %+q, received %+q", utils.ErrNotFound.Error(), err.Error())
+		t.Errorf("Expected %+q, received %v", utils.ErrNotFound.Error(), err)
 	}
 
 	// thresholdPrf
@@ -182,7 +183,7 @@ func testCgrLdrGetSubsystemsNotLoadedLoad(t *testing.T) {
 	if err := cgrLdrRPC.Call(utils.APIerSv1GetThresholdProfile,
 		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_1"}},
 		&replyThdPrf); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Errorf("Expected %+q, received %+q", utils.ErrNotFound.Error(), err.Error())
+		t.Errorf("Expected %+q, received %v", utils.ErrNotFound.Error(), err)
 	}
 
 	// threshold
@@ -190,7 +191,7 @@ func testCgrLdrGetSubsystemsNotLoadedLoad(t *testing.T) {
 	if err := cgrLdrRPC.Call(utils.ThresholdSv1GetThreshold,
 		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_1"}},
 		&rplyThd); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Errorf("Expected %+q, received %+q", utils.ErrNotFound.Error(), err.Error())
+		t.Errorf("Expected %+q, received %v", utils.ErrNotFound.Error(), err)
 	}
 
 	//chargers
@@ -198,7 +199,7 @@ func testCgrLdrGetSubsystemsNotLoadedLoad(t *testing.T) {
 	if err := cgrLdrRPC.Call(utils.APIerSv1GetChargerProfile,
 		&utils.TenantID{Tenant: "cgrates.org", ID: "Raw"},
 		&replyChrgr); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Errorf("Expected %+v, received %+v", utils.ErrNotFound.Error(), err.Error())
+		t.Errorf("Expected %+v, received %v", utils.ErrNotFound.Error(), err)
 	}
 
 }
diff --git a/cores/core.go b/cores/core.go
index a86ec983c..86a59dc61 100644
--- a/cores/core.go
+++ b/cores/core.go
@@ -57,7 +57,7 @@ type CoreService struct {
 	shdWg      *sync.WaitGroup
 	stopMemPrf chan struct{}
 	shdChan    *utils.SyncedChan
-	fileMEM string
+	fileMEM    string
 	fileCPU    io.Closer
 	fileMx     sync.Mutex
 }
diff --git a/cores/core_test.go b/cores/core_test.go
index 41158ea1e..ebd43e2df 100644
--- a/cores/core_test.go
+++ b/cores/core_test.go
@@ -40,7 +40,7 @@ func TestNewCoreService(t *testing.T) {
 	shdChan := utils.NewSyncedChan()
 	stopMemPrf := make(chan struct{})
 	expected := &CoreService{
-		fileMEM: "/tmp",
+		fileMEM:    "/tmp",
 		shdWg:      shdWg,
 		shdChan:    shdChan,
 		stopMemPrf: stopMemPrf,
@@ -48,7 +48,7 @@ func TestNewCoreService(t *testing.T) {
 		CapsStats:  sts,
 	}
 
-	rcv := NewCoreService(cfgDflt, caps, nil,"/tmp",  stopchan, shdWg, stopMemPrf, shdChan)
+	rcv := NewCoreService(cfgDflt, caps, nil, "/tmp", stopchan, shdWg, stopMemPrf, shdChan)
 	if !reflect.DeepEqual(expected, rcv) {
 		t.Errorf("Expected %+v, received %+v", utils.ToJSON(expected), utils.ToJSON(rcv))
 	}
@@ -63,7 +63,7 @@ func TestCoreServiceStatus(t *testing.T) {
 	caps := engine.NewCaps(1, utils.MetaBusy)
 	stopChan := make(chan struct{}, 1)
 
-	cores := NewCoreService(cfgDflt, caps, nil,"/tmp",  stopChan, nil, nil, nil)
+	cores := NewCoreService(cfgDflt, caps, nil, "/tmp", stopChan, nil, nil, nil)
 	args := &utils.TenantWithAPIOpts{
 		Tenant:  "cgrates.org",
 		APIOpts: map[string]interface{}{},
diff --git a/engine/datamanager.go b/engine/datamanager.go
index 74e1fb642..526b39592 100644
--- a/engine/datamanager.go
+++ b/engine/datamanager.go
@@ -271,10 +271,11 @@ func (dm *DataManager) CacheDataFromDB(prfx string, ids []string, mustBeCached b
 					err.Error(),
 					fmt.Sprintf("error <%s> querying DataManager for category: <%s>, dataID: <%s>", err.Error(), prfx, dataID))
 			}
-			if err = Cache.Remove(utils.CachePrefixToInstance[prfx], dataID,
-				cacheCommit(utils.NonTransactional), utils.NonTransactional); err != nil {
-				return
-			}
+			err = nil
+			// if err = Cache.Remove(utils.CachePrefixToInstance[prfx], dataID,
+			// cacheCommit(utils.NonTransactional), utils.NonTransactional); err != nil {
+			// return
+			// }
 		}
 	}
 	return
diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go
index 8f3a42893..932f6b834 100644
--- a/sessions/sessions_test.go
+++ b/sessions/sessions_test.go
@@ -3205,4 +3205,4 @@ func TestBiRPCv1ProcessEventNoTenant(t *testing.T) {
 	if err := ss.BiRPCv1ProcessEvent(nil, args, reply); err != nil {
 		t.Error(err)
 	}
-}
\ No newline at end of file
+}