diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go
index 4d07659ec..2955f2a33 100644
--- a/agents/diam_it_test.go
+++ b/agents/diam_it_test.go
@@ -252,7 +252,7 @@ func testDiamItTPFromFolder(t *testing.T) {
 	if isDispatcherActive {
 		testDiamItTPLoadData(t)
 	}
-	time.Sleep(time.Second) // Give time for scheduler to execute topups
+	time.Sleep(100 * time.Millisecond) // Give time for scheduler to execute topups
 }
 
 func testDiamItTPLoadData(t *testing.T) {
@@ -272,7 +272,7 @@ func testDiamItTPLoadData(t *testing.T) {
 	}()
 	select {
 	case <-wchan:
-	case <-time.After(5 * time.Second):
+	case <-time.After(time.Second):
 		t.Errorf("cgr-loader failed: ")
 	}
 }
diff --git a/analyzers/analyzers_it_test.go b/analyzers/analyzers_it_test.go
index 09e16d60c..d425fb0df 100644
--- a/analyzers/analyzers_it_test.go
+++ b/analyzers/analyzers_it_test.go
@@ -59,7 +59,7 @@ var (
 
 var (
 	dataDir   = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here")
-	waitRater = flag.Int("wait_rater", 500, "Number of miliseconds to wait for rater to start and cache")
+	waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache")
 	encoding  = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication")
 )
 
@@ -133,7 +133,7 @@ func testAnalyzerSLoadTarrifPlans(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply returned", reply)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testAnalyzerSChargerSv1ProcessEvent(t *testing.T) {
diff --git a/apier/v1/accounts_it_test.go b/apier/v1/accounts_it_test.go
index 5d391077f..0ddb054ab 100644
--- a/apier/v1/accounts_it_test.go
+++ b/apier/v1/accounts_it_test.go
@@ -296,13 +296,12 @@ func testAccITDebitBalance(t *testing.T) {
 		if !accExist {
 			exstr = "not "
 		}
-		t.Fatalf("Balance with ID %s should %sexist", accBallID, exstr)
+		t.Fatalf("Balance with ID %s should %s exist", accBallID, exstr)
 	}
 	t.Run("TestAddVoiceBalance", func(t *testing.T) { testAccountBalance(t, accAcount, accTenant, utils.VOICE, 0) })
 }
 
 func testAccITDebitBalanceWithoutTenant(t *testing.T) {
-	time.Sleep(5 * time.Second)
 	var reply string
 	if err := accRPC.Call(utils.APIerSv1DebitBalance, &AttrAddBalance{
 		Account:     accAcount,
@@ -318,7 +317,7 @@ func testAccITDebitBalanceWithoutTenant(t *testing.T) {
 		if !accExist {
 			exstr = "not "
 		}
-		t.Fatalf("Balance with ID %s should %sexist", accBallID, exstr)
+		t.Fatalf("Balance with ID %s should %s exist", accBallID, exstr)
 	}
 	t.Run("TestAddVoiceBalance", func(t *testing.T) { testAccountBalance(t, accAcount, accTenant, utils.VOICE, 0) })
 }
@@ -838,7 +837,7 @@ func testAccITTPFromFolder(t *testing.T) {
 		attrs, &loadInst); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testAccITAddBalanceWithDestinations(t *testing.T) {
diff --git a/apier/v1/actionprofiles_it_test.go b/apier/v1/actionprofiles_it_test.go
index 54a1e02ca..f6d3f5d3e 100644
--- a/apier/v1/actionprofiles_it_test.go
+++ b/apier/v1/actionprofiles_it_test.go
@@ -117,7 +117,7 @@ func testActionSLoadFromFolder(t *testing.T) {
 	if err := actSRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, acts, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testActionSGetActionProfile(t *testing.T) {
diff --git a/apier/v1/apier2_it_test.go b/apier/v1/apier2_it_test.go
index 59cf1a2c8..93a8f9ab1 100644
--- a/apier/v1/apier2_it_test.go
+++ b/apier/v1/apier2_it_test.go
@@ -132,7 +132,7 @@ func testAPIerLoadFromFolder(t *testing.T) {
 	if err := apierRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testAPIerVerifyAttributesAfterLoad(t *testing.T) {
@@ -194,7 +194,7 @@ func testAPIerRemoveTPFromFolder(t *testing.T) {
 	if err := apierRPC.Call(utils.APIerSv1RemoveTPFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testAPIerAfterDelete(t *testing.T) {
@@ -643,7 +643,7 @@ func testAPIerLoadFromFolderAccountAction(t *testing.T) {
 	if err := apierRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 	attrs2 := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "account_action_from_tutorial")}
 	if err := apierRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs2, &reply); err != nil {
 		t.Error(err)
diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go
index 33ab52da8..bdc260a6e 100644
--- a/apier/v1/apier_it_test.go
+++ b/apier/v1/apier_it_test.go
@@ -1553,7 +1553,7 @@ func testApierLoadTariffPlanFromFolder(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Calling APIerSv1.LoadTariffPlanFromFolder got reply: ", reply)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 // For now just test that they execute without errors
@@ -1939,7 +1939,7 @@ func testApierImportTPFromFolderPath(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Calling APIerSv1.ImportTarrifPlanFromFolder got reply: ", reply)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testApierLoadTariffPlanFromStorDbDryRun(t *testing.T) {
diff --git a/apier/v1/attributes_it_test.go b/apier/v1/attributes_it_test.go
index f43c1334c..a3194d9c1 100644
--- a/apier/v1/attributes_it_test.go
+++ b/apier/v1/attributes_it_test.go
@@ -166,7 +166,7 @@ func testAttributeSLoadFromFolder(t *testing.T) {
 	if err := attrSRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testAttributeSGetAttributeForEvent(t *testing.T) {
diff --git a/apier/v1/caps_it_test.go b/apier/v1/caps_it_test.go
index a2e2fc3c0..fbf011551 100644
--- a/apier/v1/caps_it_test.go
+++ b/apier/v1/caps_it_test.go
@@ -95,12 +95,6 @@ func testCapsStartEngine(t *testing.T) {
 	}
 }
 
-func handlePing(clnt *rpc2.Client, arg *utils.DurationArgs, reply *string) error {
-	time.Sleep(arg.Duration)
-	*reply = utils.OK
-	return nil
-}
-
 // Connect rpc client to rater
 func testCapsRPCConn(t *testing.T) {
 	var err error
@@ -276,7 +270,6 @@ func testCapsOnBiJSONQueue(t *testing.T) {
 }
 
 func testCapsKillEngine(t *testing.T) {
-	time.Sleep(100 * time.Millisecond)
 	if err := engine.KillEngine(100); err != nil {
 		t.Error(err)
 	}
diff --git a/apier/v1/config_it_test.go b/apier/v1/config_it_test.go
index 1e2ca0102..66ca88974 100644
--- a/apier/v1/config_it_test.go
+++ b/apier/v1/config_it_test.go
@@ -431,7 +431,7 @@ func testConfigStartEngineFromHTTP(t *testing.T) {
 	if !connected {
 		t.Errorf("engine did not open port <%s>", "localhost:2012")
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 	var rply map[string]interface{}
 	if err := jsonClnt.Call(utils.CoreSv1Status, &utils.TenantWithOpts{}, &rply); err != nil {
 		t.Error(err)
diff --git a/apier/v1/costs_it_test.go b/apier/v1/costs_it_test.go
index 8a7062576..5e57fbf45 100644
--- a/apier/v1/costs_it_test.go
+++ b/apier/v1/costs_it_test.go
@@ -113,7 +113,7 @@ func testCostLoadFromFolder(t *testing.T) {
 	if err := costRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testCostGetCost(t *testing.T) {
diff --git a/apier/v1/dispatchersv1_it_test.go b/apier/v1/dispatchersv1_it_test.go
index 6d7677226..68b949502 100644
--- a/apier/v1/dispatchersv1_it_test.go
+++ b/apier/v1/dispatchersv1_it_test.go
@@ -125,10 +125,10 @@ func testDspITLoadData(t *testing.T) {
 	}()
 	select {
 	case <-wchan:
-	case <-time.After(5 * time.Second):
+	case <-time.After(time.Second):
 		t.Errorf("cgr-loader failed: ")
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testDspDspv1GetProfileForEvent(t *testing.T) {
diff --git a/apier/v1/ees_it_test.go b/apier/v1/ees_it_test.go
index 370c06c6f..af558f7fc 100644
--- a/apier/v1/ees_it_test.go
+++ b/apier/v1/ees_it_test.go
@@ -178,7 +178,6 @@ func testEEsAddCDRs(t *testing.T) {
 			t.Error("Unexpected reply received: ", reply)
 		}
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testEEsExportCDRs(t *testing.T) {
@@ -190,7 +189,6 @@ func testEEsExportCDRs(t *testing.T) {
 	if err := eeSRPC.Call(utils.APIerSv1ExportCDRs, &attr, &rply); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	}
-	time.Sleep(2 * time.Second)
 	if len(rply) != 1 {
 		t.Errorf("Expected %+v, received: %+v", 1, len(rply))
 	} else {
@@ -220,6 +218,7 @@ func testEEsExportCDRs(t *testing.T) {
 }
 
 func testEEsVerifyExports(t *testing.T) {
+	time.Sleep(time.Second)
 	var files []string
 	err := filepath.Walk("/tmp/testCSV/", func(path string, info os.FileInfo, err error) error {
 		if strings.HasSuffix(path, utils.CSVSuffix) {
@@ -254,7 +253,6 @@ func testEEsExportCDRsMultipleExporters(t *testing.T) {
 	if err := eeSRPC.Call(utils.APIerSv1ExportCDRs, &attr, &rply); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	}
-	time.Sleep(2 * time.Second)
 	if len(rply) != 2 {
 		t.Errorf("Expected %+v, received: %+v", 1, len(rply))
 	} else {
@@ -286,6 +284,7 @@ func testEEsExportCDRsMultipleExporters(t *testing.T) {
 }
 
 func testEEsVerifyExportsMultipleExporters(t *testing.T) {
+	time.Sleep(time.Second)
 	var files []string
 	err := filepath.Walk("/tmp/testCSV2/", func(path string, info os.FileInfo, err error) error {
 		if strings.HasSuffix(path, utils.CSVSuffix) {
diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go
index 88d1779a6..24ad05345 100644
--- a/apier/v1/filterindexecache_it_test.go
+++ b/apier/v1/filterindexecache_it_test.go
@@ -138,7 +138,7 @@ func testV1FIdxCaFromFolder(t *testing.T) {
 	if err := tFIdxCaRpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 //ThresholdProfile
diff --git a/apier/v1/lib_test.go b/apier/v1/lib_test.go
index 118ed6c7a..e7d7c2efc 100644
--- a/apier/v1/lib_test.go
+++ b/apier/v1/lib_test.go
@@ -30,7 +30,7 @@ import (
 
 var (
 	dataDir   = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here")
-	waitRater = flag.Int("wait_rater", 500, "Number of miliseconds to wait for rater to start and cache")
+	waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache")
 	encoding  = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication")
 	dbType    = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
 )
diff --git a/apier/v1/precache_it_test.go b/apier/v1/precache_it_test.go
index 9c156558a..ed2c6eaa5 100644
--- a/apier/v1/precache_it_test.go
+++ b/apier/v1/precache_it_test.go
@@ -141,7 +141,7 @@ func testPrecacheFromFolder(t *testing.T) {
 	if err := precacheRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testPrecacheRestartEngine(t *testing.T) {
diff --git a/apier/v1/preload_it_test.go b/apier/v1/preload_it_test.go
index ab3fe9359..cb5893ef9 100644
--- a/apier/v1/preload_it_test.go
+++ b/apier/v1/preload_it_test.go
@@ -110,7 +110,7 @@ func testPreloadITStartEngine(t *testing.T) {
 	if !connected {
 		t.Errorf("engine did not open port <%s>", preloadCfg.ListenCfg().RPCJSONListen)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testPreloadITRpcConn(t *testing.T) {
diff --git a/apier/v1/rateprofiles_it_test.go b/apier/v1/rateprofiles_it_test.go
index 813aefb51..3bd8168e0 100644
--- a/apier/v1/rateprofiles_it_test.go
+++ b/apier/v1/rateprofiles_it_test.go
@@ -139,7 +139,7 @@ func testV1RatePrfFromFolder(t *testing.T) {
 	if err := ratePrfRpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testV1RatePrfVerifyRateProfile(t *testing.T) {
diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go
index a46634daf..2cc7d2087 100644
--- a/apier/v1/remote_it_test.go
+++ b/apier/v1/remote_it_test.go
@@ -141,7 +141,6 @@ func testInternalRemoteITDataFlush(t *testing.T) {
 	if err := engine.InitDataDb(engineOneCfg); err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(100 * time.Millisecond)
 	if err := engine.InitDataDb(engineTwoCfg); err != nil {
 		t.Fatal(err)
 	}
@@ -184,7 +183,7 @@ func testInternalRemoteLoadDataInEngineTwo(t *testing.T) {
 	if err := engineTwoRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testInternalRemoteITGetAccount(t *testing.T) {
diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go
index 6f48755df..9b64fa0a7 100644
--- a/apier/v1/replicate_it_test.go
+++ b/apier/v1/replicate_it_test.go
@@ -114,7 +114,6 @@ func testInternalReplicateITDataFlush(t *testing.T) {
 	if err := engine.InitDataDb(engineOneCfg); err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(100 * time.Millisecond)
 	if err := engine.InitDataDb(engineTwoCfg); err != nil {
 		t.Fatal(err)
 	}
@@ -139,12 +138,10 @@ func testInternalReplicateITRPCConn(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(200 * time.Millisecond)
 	engineTwoRPC, err = newRPCClient(engineTwoCfg.ListenCfg())
 	if err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(200 * time.Millisecond)
 	internalRPC, err = newRPCClient(internalCfg.ListenCfg())
 	if err != nil {
 		t.Fatal(err)
@@ -158,7 +155,7 @@ func testInternalReplicateLoadDataInInternalEngine(t *testing.T) {
 	if err := internalRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testInternalReplicateITDestination(t *testing.T) {
@@ -522,7 +519,6 @@ func testInternalReplicateITDispatcherProfile(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Errorf("Expecting : %+v, received: %+v", utils.OK, reply)
 	}
-	time.Sleep(20 * time.Millisecond)
 	// check
 	var dsp *engine.DispatcherProfile
 	if err := engineOneRPC.Call(utils.APIerSv1GetDispatcherProfile,
diff --git a/apier/v1/resourcesv1_it_test.go b/apier/v1/resourcesv1_it_test.go
index d4e35794a..3421847e0 100644
--- a/apier/v1/resourcesv1_it_test.go
+++ b/apier/v1/resourcesv1_it_test.go
@@ -131,7 +131,7 @@ func testV1RsFromFolder(t *testing.T) {
 	if err := rlsV1Rpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 
 }
 
diff --git a/apier/v1/routes_it_test.go b/apier/v1/routes_it_test.go
index 9d73fce93..69443ac62 100644
--- a/apier/v1/routes_it_test.go
+++ b/apier/v1/routes_it_test.go
@@ -151,7 +151,7 @@ func testV1RouteFromFolder(t *testing.T) {
 	if err := routeSv1Rpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testV1RouteGetWeightRoutes(t *testing.T) {
diff --git a/apier/v1/routes_with_rates_it_test.go b/apier/v1/routes_with_rates_it_test.go
index 05d1b19c3..2761d234b 100644
--- a/apier/v1/routes_with_rates_it_test.go
+++ b/apier/v1/routes_with_rates_it_test.go
@@ -105,7 +105,7 @@ func testV1RouteSWithRateSFromFolder(t *testing.T) {
 	if err := routeSv1Rpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testV1RouteSWithRateSGetRoutes(t *testing.T) {
diff --git a/apier/v1/schedulers_it_test.go b/apier/v1/schedulers_it_test.go
index 968a92e64..675fa011b 100644
--- a/apier/v1/schedulers_it_test.go
+++ b/apier/v1/schedulers_it_test.go
@@ -151,7 +151,7 @@ func testSchedFromFolder(t *testing.T) {
 	if err := schedRpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testSchedVeifyAllAccounts(t *testing.T) {
diff --git a/apier/v1/sessions_process_event_it_test.go b/apier/v1/sessions_process_event_it_test.go
index 319cc314d..d8d128ce8 100644
--- a/apier/v1/sessions_process_event_it_test.go
+++ b/apier/v1/sessions_process_event_it_test.go
@@ -472,7 +472,6 @@ func testSSv1ItProcessCDRForSessionFromProcessEvent(t *testing.T) {
 	if rply != utils.OK {
 		t.Errorf("Unexpected reply: %s", rply)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testSSv1ItGetCDRs(t *testing.T) {
@@ -743,7 +742,6 @@ func testSSv1ItProcessEventWithCDR(t *testing.T) {
 		args, &rply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testSSv1ItGetCDRsFromProcessEvent(t *testing.T) {
@@ -823,7 +821,6 @@ func testSSv1ItProcessEventWithCDRResourceError(t *testing.T) {
 		args, &rply); err == nil || err.Error() != utils.ErrPartiallyExecuted.Error() {
 		t.Error(err)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testSSv1ItGetCDRsFromProcessEventResourceError(t *testing.T) {
@@ -904,7 +901,6 @@ func testSSv1ItProcessEventWithCDRResourceErrorBlockError(t *testing.T) {
 		args, &rply); err == nil || err.Error() != "RESOURCES_ERROR:cannot find usage record with id: testSSv1ItProcessEventWithCDRResourceErrorBlockError" {
 		t.Error(err)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testSSv1ItGetCDRsFromProcessEventResourceErrorBlockError(t *testing.T) {
diff --git a/apier/v1/sessions_thresholds_it_test.go b/apier/v1/sessions_thresholds_it_test.go
index c151172c2..a2eb8de12 100755
--- a/apier/v1/sessions_thresholds_it_test.go
+++ b/apier/v1/sessions_thresholds_it_test.go
@@ -144,7 +144,7 @@ func testSessionSv1ItTPFromFolder(t *testing.T) {
 	if err := sSApierRpc2.Call(utils.APIerSv2LoadTariffPlanFromFolder, attrs, &loadInst); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testSessionSv1ItGetThreshold(t *testing.T) {
diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go
index a098913be..bc5b92c9b 100644
--- a/apier/v1/sessionsv1_it_test.go
+++ b/apier/v1/sessionsv1_it_test.go
@@ -196,7 +196,7 @@ func testSSv1ItTPFromFolder(t *testing.T) {
 		attrs, &loadInst); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testSSv1ItAuth(t *testing.T) {
@@ -598,7 +598,6 @@ func testSSv1ItProcessCDR(t *testing.T) {
 	if rply != utils.OK {
 		t.Errorf("Unexpected reply: %s", rply)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 // TestSSv1ItProcessEvent processes individual event and also checks it's CDRs
@@ -685,7 +684,6 @@ func testSSv1ItProcessEvent(t *testing.T) {
 	if rplyCDR != utils.OK {
 		t.Errorf("Unexpected reply: %s", rplyCDR)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testSSv1ItCDRsGetCdrs(t *testing.T) {
@@ -865,7 +863,6 @@ func testSSv1ItForceUpdateSession(t *testing.T) {
 	} else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal { // no monetary change bacause the sessin was terminated
 		t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.MONETARY].GetTotalValue())
 	}
-	time.Sleep(100 * time.Millisecond)
 	var cdrs []*engine.CDR
 	argsCDR := &utils.RPCCDRsFilterWithOpts{
 		RPCCDRsFilter: &utils.RPCCDRsFilter{
diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go
index 48e90a94a..138442e5e 100644
--- a/apier/v1/stats_it_test.go
+++ b/apier/v1/stats_it_test.go
@@ -155,7 +155,7 @@ func testV1STSFromFolder(t *testing.T) {
 	if err := stsV1Rpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testV1STSGetStats(t *testing.T) {
diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go
index 158e69eb6..a75e40ed2 100644
--- a/apier/v1/thresholds_it_test.go
+++ b/apier/v1/thresholds_it_test.go
@@ -311,7 +311,7 @@ func testV1TSFromFolder(t *testing.T) {
 	if err := tSv1Rpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testV1TSGetThresholds(t *testing.T) {
diff --git a/apier/v1/tp_it_test.go b/apier/v1/tp_it_test.go
index 22bca7f1b..3042df20a 100644
--- a/apier/v1/tp_it_test.go
+++ b/apier/v1/tp_it_test.go
@@ -113,7 +113,7 @@ func testTPImportTPFromFolderPath(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Calling APIerSv1.ImportTarrifPlanFromFolder got reply: ", reply)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testTPExportTPToFolder(t *testing.T) {
diff --git a/apier/v1/tpaccountactions_it_test.go b/apier/v1/tpaccountactions_it_test.go
index 36786ac57..21680eb8e 100644
--- a/apier/v1/tpaccountactions_it_test.go
+++ b/apier/v1/tpaccountactions_it_test.go
@@ -26,7 +26,6 @@ import (
 	"path"
 	"reflect"
 	"testing"
-	"time"
 
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/engine"
@@ -215,7 +214,6 @@ func testTPAccActionsRemTPAccAction(t *testing.T) {
 	} else if resp != utils.OK {
 		t.Error("Unexpected reply returned", resp)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testTPAccActionsGetTPAccActionAfterRemove(t *testing.T) {
diff --git a/apier/v1/tpratingprofiles_it_test.go b/apier/v1/tpratingprofiles_it_test.go
index fdf10b65e..ab99f0cc2 100644
--- a/apier/v1/tpratingprofiles_it_test.go
+++ b/apier/v1/tpratingprofiles_it_test.go
@@ -26,7 +26,6 @@ import (
 	"path"
 	"reflect"
 	"testing"
-	"time"
 
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/engine"
@@ -272,7 +271,6 @@ func testTPRatingProfilesRemoveTPRatingProfile(t *testing.T) {
 	} else if resp != utils.OK {
 		t.Error("Unexpected reply returned", resp)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testTPRatingProfilesGetTPRatingProfileAfterRemove(t *testing.T) {
diff --git a/apier/v2/cdrs_offline_it_test.go b/apier/v2/cdrs_offline_it_test.go
index 6bf268684..e625cbbda 100644
--- a/apier/v2/cdrs_offline_it_test.go
+++ b/apier/v2/cdrs_offline_it_test.go
@@ -211,7 +211,6 @@ func testV2CDRsOfflineBalanceUpdate(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(150 * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsOfflineExpiryBalance(t *testing.T) {
@@ -247,7 +246,6 @@ func testV2CDRsOfflineExpiryBalance(t *testing.T) {
 		t.Errorf("Calling APIerSv2.SetAccount received: %s", reply)
 	}
 
-	time.Sleep(50 * time.Millisecond)
 	var acnt *engine.Account
 	//verify if the third balance was added
 	if err := cdrsOfflineRpc.Call(utils.APIerSv2GetAccount,
@@ -330,7 +328,6 @@ func testV2CDRsOfflineExpiryBalance(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(150 * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsBalancesWithSameWeight(t *testing.T) {
@@ -387,7 +384,6 @@ func testV2CDRsBalancesWithSameWeight(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(150 * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsOfflineKillEngine(t *testing.T) {
diff --git a/apier/v2/lib_test.go b/apier/v2/lib_test.go
index ae4f45966..8bdd01564 100644
--- a/apier/v2/lib_test.go
+++ b/apier/v2/lib_test.go
@@ -30,7 +30,7 @@ import (
 
 var (
 	dataDir   = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here")
-	waitRater = flag.Int("wait_rater", 500, "Number of miliseconds to wait for rater to start and cache")
+	waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache")
 	encoding  = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication")
 	dbType    = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
 )
diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index cdf393020..a5fc9e14a 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -287,7 +287,6 @@ func memProfiling(memProfDir string, interval time.Duration, nrFiles int, shdWg
 			return
 		case <-tm.C:
 		}
-		time.Sleep(interval)
 		memPath := path.Join(memProfDir, fmt.Sprintf("mem%v.prof", i))
 		if !memProfFile(memPath) {
 			shdChan.CloseOnce()
diff --git a/data/conf/samples/ers_internal/cgrates.json b/data/conf/samples/ers_internal/cgrates.json
index fd8987fe7..518b846b7 100644
--- a/data/conf/samples/ers_internal/cgrates.json
+++ b/data/conf/samples/ers_internal/cgrates.json
@@ -261,7 +261,7 @@
 			"source_path": "/tmp/partErs1/in",
 			"flags": ["*cdrs"],
 			"processed_path": "/tmp/partErs1/out",
-			"partial_record_cache": "2s",
+			"partial_record_cache": "500ms",
 			"partial_cache_expiry_action": "*dump_to_file",
 			"fields":[
 				{"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
@@ -302,7 +302,7 @@
 			"source_path": "/tmp/partErs2/in",
 			"processed_path": "/tmp/partErs2/out",
 			"flags": ["*cdrs"],
-			"partial_record_cache": "1s",
+			"partial_record_cache": "500ms",
 			"partial_cache_expiry_action": "*post_cdr",
 			"fields":[
 				{"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
@@ -334,7 +334,7 @@
 			"processed_path": "/tmp/flatstoreErs/out",
 			"failed_calls_prefix": "missed_calls",
 			"flags": ["*cdrs"],
-			"partial_record_cache": "2s",
+			"partial_record_cache": "500ms",
 			"fields":[
 				{"tag": "Tor", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
 				{"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable","value":"~*req.3;~*req.1;~*req.2", "mandatory": true},
diff --git a/data/conf/samples/ers_mongo/cgrates.json b/data/conf/samples/ers_mongo/cgrates.json
index b02daca5f..94561712b 100644
--- a/data/conf/samples/ers_mongo/cgrates.json
+++ b/data/conf/samples/ers_mongo/cgrates.json
@@ -262,7 +262,7 @@
 			"source_path": "/tmp/partErs1/in",
 			"flags": ["*cdrs"],
 			"processed_path": "/tmp/partErs1/out",
-			"partial_record_cache": "2s",
+			"partial_record_cache": "500ms",
 			"partial_cache_expiry_action": "*dump_to_file",
 			"fields":[
 				{"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
@@ -303,7 +303,7 @@
 			"source_path": "/tmp/partErs2/in",
 			"processed_path": "/tmp/partErs2/out",
 			"flags": ["*cdrs"],
-			"partial_record_cache": "1s",
+			"partial_record_cache": "500ms",
 			"partial_cache_expiry_action": "*post_cdr",
 			"fields":[
 				{"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
@@ -335,7 +335,7 @@
 			"processed_path": "/tmp/flatstoreErs/out",
 			"failed_calls_prefix": "missed_calls",
 			"flags": ["*cdrs"],
-			"partial_record_cache": "2s",
+			"partial_record_cache": "500ms",
 			"fields":[
 				{"tag": "Tor", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
 				{"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable","value":"~*req.3;~*req.1;~*req.2", "mandatory": true},
diff --git a/data/conf/samples/ers_mysql/cgrates.json b/data/conf/samples/ers_mysql/cgrates.json
index 6ec0a7822..c2bb6ecc3 100644
--- a/data/conf/samples/ers_mysql/cgrates.json
+++ b/data/conf/samples/ers_mysql/cgrates.json
@@ -259,7 +259,7 @@
 			"source_path": "/tmp/partErs1/in",
 			"flags": ["*cdrs"],
 			"processed_path": "/tmp/partErs1/out",
-			"partial_record_cache": "2s",
+			"partial_record_cache": "500ms",
 			"partial_cache_expiry_action": "*dump_to_file",
 			"fields":[
 				{"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
@@ -300,7 +300,7 @@
 			"source_path": "/tmp/partErs2/in",
 			"processed_path": "/tmp/partErs2/out",
 			"flags": ["*cdrs"],
-			"partial_record_cache": "1s",
+			"partial_record_cache": "500ms",
 			"partial_cache_expiry_action": "*post_cdr",
 			"fields":[
 				{"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
@@ -332,7 +332,7 @@
 			"processed_path": "/tmp/flatstoreErs/out",
 			"failed_calls_prefix": "missed_calls",
 			"flags": ["*cdrs"],
-			"partial_record_cache": "2s",
+			"partial_record_cache": "500ms",
 			"fields":[
 				{"tag": "Tor", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
 				{"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable","value":"~*req.3;~*req.1;~*req.2", "mandatory": true},
diff --git a/data/conf/samples/ers_postgres/cgrates.json b/data/conf/samples/ers_postgres/cgrates.json
index 1ec7b1f92..9fc6c6a5f 100644
--- a/data/conf/samples/ers_postgres/cgrates.json
+++ b/data/conf/samples/ers_postgres/cgrates.json
@@ -256,7 +256,7 @@
 			"source_path": "/tmp/partErs1/in",
 			"flags": ["*cdrs"],
 			"processed_path": "/tmp/partErs1/out",
-			"partial_record_cache": "2s",
+			"partial_record_cache": "500ms",
 			"partial_cache_expiry_action": "*dump_to_file",
 			"fields":[
 				{"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
@@ -297,7 +297,7 @@
 			"source_path": "/tmp/partErs2/in",
 			"processed_path": "/tmp/partErs2/out",
 			"flags": ["*cdrs"],
-			"partial_record_cache": "1s",
+			"partial_record_cache": "500ms",
 			"partial_cache_expiry_action": "*post_cdr",
 			"fields":[
 				{"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
@@ -329,7 +329,7 @@
 			"processed_path": "/tmp/flatstoreErs/out",
 			"failed_calls_prefix": "missed_calls",
 			"flags": ["*cdrs"],
-			"partial_record_cache": "2s",
+			"partial_record_cache": "500ms",
 			"fields":[
 				{"tag": "Tor", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice", "mandatory": true},
 				{"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable","value":"~*req.3;~*req.1;~*req.2", "mandatory": true},
diff --git a/data/conf/samples/internal_ttl_internal/cgrates.json b/data/conf/samples/internal_ttl_internal/cgrates.json
index 44f713cd5..d73792922 100644
--- a/data/conf/samples/internal_ttl_internal/cgrates.json
+++ b/data/conf/samples/internal_ttl_internal/cgrates.json
@@ -25,7 +25,7 @@
 
 "caches":{
 	"partitions": {
-		"*cdrs": {"limit": -1, "ttl": "2s"}, 		
+		"*cdrs": {"limit": -1, "ttl": "1s"}, 		
 	},
 },
 
diff --git a/data/conf/samples/rpccaching_mongo/cgrates.json b/data/conf/samples/rpccaching_mongo/cgrates.json
index 00f0ffcad..0b4df8459 100644
--- a/data/conf/samples/rpccaching_mongo/cgrates.json
+++ b/data/conf/samples/rpccaching_mongo/cgrates.json
@@ -29,7 +29,7 @@
 
 "caches":{
 	"partitions": {
-		"*rpc_responses": {"limit": -1, "ttl": "1s"}
+		"*rpc_responses": {"limit": -1, "ttl": "500ms"}
 	},
 },
 
diff --git a/data/conf/samples/rpccaching_mysql/cgrates.json b/data/conf/samples/rpccaching_mysql/cgrates.json
index 42d87ed8c..25521adee 100644
--- a/data/conf/samples/rpccaching_mysql/cgrates.json
+++ b/data/conf/samples/rpccaching_mysql/cgrates.json
@@ -19,7 +19,7 @@
 
 "caches":{
 	"partitions": {
-		"*rpc_responses": {"limit": -1, "ttl": "1s"}
+		"*rpc_responses": {"limit": -1, "ttl": "500ms"}
 	},
 },
 
diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go
index d5414c701..b0c30b0eb 100644
--- a/dispatchers/cdrs_it_test.go
+++ b/dispatchers/cdrs_it_test.go
@@ -148,7 +148,6 @@ func testDspCDRsProcessEvent(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Errorf("Received: %s", reply)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testDspCDRsCountCDR(t *testing.T) {
@@ -238,7 +237,6 @@ func testDspCDRsProcessCDR(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Errorf("Received: %s", reply)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testDspCDRsGetCDR2(t *testing.T) {
@@ -292,7 +290,6 @@ func testDspCDRsProcessExternalCDR(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Errorf("Received: %s", reply)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testDspCDRsGetCDR3(t *testing.T) {
@@ -439,7 +436,6 @@ func testDspCDRsProcessEventNoAuth(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Errorf("Received: %s", reply)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testDspCDRsCountCDRNoAuth(t *testing.T) {
@@ -517,7 +513,6 @@ func testDspCDRsProcessCDRNoAuth(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Errorf("Received: %s", reply)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testDspCDRsGetCDR2NoAuth(t *testing.T) {
@@ -565,7 +560,6 @@ func testDspCDRsProcessExternalCDRNoAuth(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Errorf("Received: %s", reply)
 	}
-	time.Sleep(100 * time.Millisecond)
 }
 
 func testDspCDRsGetCDR3NoAuth(t *testing.T) {
diff --git a/dispatchers/lib_test.go b/dispatchers/lib_test.go
index 14590d7cf..98c1bb79d 100644
--- a/dispatchers/lib_test.go
+++ b/dispatchers/lib_test.go
@@ -156,7 +156,7 @@ func testDsp(t *testing.T, tests []func(t *testing.T), testName, all, all2, disp
 	dispEngine.loadData2(t, path.Join(dspDataDir, "tariffplans", attrTF))
 	allEngine.loadData(t, path.Join(dspDataDir, "tariffplans", allTF))
 	allEngine2.loadData(t, path.Join(dspDataDir, "tariffplans", all2TF))
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(200 * time.Millisecond)
 	for _, stest := range tests {
 		t.Run(testName, stest)
 	}
diff --git a/engine/lib_test.go b/engine/lib_test.go
index 05bc233c0..30dbcdfd9 100644
--- a/engine/lib_test.go
+++ b/engine/lib_test.go
@@ -30,7 +30,7 @@ import (
 
 var (
 	dataDir   = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here")
-	waitRater = flag.Int("wait_rater", 500, "Number of miliseconds to wait for rater to start and cache")
+	waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache")
 	encoding  = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication")
 	dbType    = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
 )
diff --git a/engine/libtest.go b/engine/libtest.go
index 3a5971541..d193ceef6 100644
--- a/engine/libtest.go
+++ b/engine/libtest.go
@@ -447,7 +447,7 @@ func PjsuaCallUri(acnt *PjsuaAccount, dstUri, outboundUri string, callDur time.D
 	buf := new(bytes.Buffer)
 	io.Copy(os.Stdout, buf)
 	go func() {
-		time.Sleep(callDur + (time.Duration(2) * time.Second))
+		time.Sleep(callDur + 2*time.Second)
 		fPty.Write([]byte("q\n")) // Destroy the listener
 	}()
 	return nil
diff --git a/engine/stats.go b/engine/stats.go
index 026b70784..e4c586754 100644
--- a/engine/stats.go
+++ b/engine/stats.go
@@ -512,7 +512,7 @@ func (sS *StatService) StartLoop() {
 func (sS *StatService) V1ResetStatQueue(tntID *utils.TenantID, rply *string) (err error) {
 	var sq *StatQueue
 	if sq, err = sS.dm.GetStatQueue(tntID.Tenant, tntID.ID,
-		true, false, utils.NonTransactional); err != nil {
+		true, true, utils.NonTransactional); err != nil {
 		return
 	}
 	sq.Lock()
diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go
index 8ada8e1a7..2844ef64f 100644
--- a/engine/z_onstor_it_test.go
+++ b/engine/z_onstor_it_test.go
@@ -31,11 +31,10 @@ import (
 )
 
 var (
-	rdsITdb    *RedisStorage
-	mgoITdb    *MongoStorage
-	onStor     *DataManager
-	onStorCfg  string
-	sleepDelay time.Duration
+	rdsITdb   *RedisStorage
+	mgoITdb   *MongoStorage
+	onStor    *DataManager
+	onStorCfg string
 
 	// subtests to be executed for each confDIR
 	sTestsOnStorIT = []func(t *testing.T){
@@ -87,7 +86,6 @@ var (
 func TestOnStorIT(t *testing.T) {
 	switch *dbType {
 	case utils.MetaInternal:
-		sleepDelay = 10 * time.Millisecond
 		onStor = NewDataManager(NewInternalDB(nil, nil, true),
 			config.CgrConfig().CacheCfg(), nil)
 	case utils.MetaMySQL:
@@ -102,7 +100,6 @@ func TestOnStorIT(t *testing.T) {
 		onStorCfg = cfg.DataDbCfg().DataDbName
 		onStor = NewDataManager(rdsITdb, config.CgrConfig().CacheCfg(), nil)
 	case utils.MetaMongo:
-		sleepDelay = 500 * time.Millisecond
 		cdrsMongoCfgPath := path.Join(*dataDir, "conf", "samples", "cdrsv2mongo")
 		mgoITCfg, err := config.NewCGRConfigFromPath(cdrsMongoCfgPath)
 		if err != nil {
@@ -493,7 +490,7 @@ func testOnStorITRatingPlan(t *testing.T) {
 	if err := onStor.SetRatingPlan(rp, utils.NonTransactional); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from cache
 	if rcv, err := onStor.GetRatingPlan(rp.Id, false, utils.NonTransactional); err != nil {
 		t.Error(err)
@@ -573,7 +570,7 @@ func testOnStorITRatingProfile(t *testing.T) {
 	if err := onStor.SetRatingProfile(rpf, utils.NonTransactional); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	if onStor.dataDB.GetStorageType() != utils.INTERNAL {
 		//get from cache
 		if rcv, err := onStor.GetRatingProfile(rpf.Id, false,
@@ -860,7 +857,7 @@ func testOnStorITActions(t *testing.T) {
 		acts, utils.NonTransactional); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	if onStor.dataDB.GetStorageType() != utils.INTERNAL {
 		//get from cache
 		if rcv, err := onStor.GetActions(acts[0].Id,
@@ -1212,7 +1209,7 @@ func testOnStorITResourceProfile(t *testing.T) {
 	if err := onStor.SetResourceProfile(rL, false); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from database
 	if rcv, err := onStor.GetResourceProfile(rL.Tenant, rL.ID,
 		false, false, utils.NonTransactional); err != nil {
@@ -1270,7 +1267,7 @@ func testOnStorITResource(t *testing.T) {
 	if err := onStor.SetResource(res, nil, 0, true); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from database
 	if rcv, err := onStor.GetResource("cgrates.org", "RL1",
 		false, false, utils.NonTransactional); err != nil {
@@ -1331,7 +1328,7 @@ func testOnStorITTiming(t *testing.T) {
 	if err := onStor.SetTiming(tmg); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from cache
 	if rcv, err := onStor.GetTiming(tmg.ID, false, utils.NonTransactional); err != nil {
 		t.Error(err)
@@ -1478,7 +1475,7 @@ func testOnStorITStatQueueProfile(t *testing.T) {
 	if err := onStor.SetStatQueueProfile(sq, false); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from database
 	if rcv, err := onStor.GetStatQueueProfile(sq.Tenant,
 		sq.ID, false, false, utils.NonTransactional); err != nil {
@@ -1554,7 +1551,7 @@ func testOnStorITStatQueue(t *testing.T) {
 	if err := onStor.SetStatQueue(sq, nil, 0, nil, 0, true); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from database
 	if rcv, err := onStor.GetStatQueue(sq.Tenant,
 		sq.ID, false, false, utils.NonTransactional); err != nil {
@@ -1628,7 +1625,7 @@ func testOnStorITThresholdProfile(t *testing.T) {
 	if err := onStor.SetThresholdProfile(th, true); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from database
 	if rcv, err := onStor.GetThresholdProfile(th.Tenant, th.ID,
 		false, false, utils.NonTransactional); err != nil {
@@ -1679,7 +1676,7 @@ func testOnStorITThreshold(t *testing.T) {
 	if err := onStor.SetThreshold(th, 0, true); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from database
 	if rcv, err := onStor.GetThreshold("cgrates.org", "TH1",
 		false, false, utils.NonTransactional); err != nil {
@@ -1762,7 +1759,7 @@ func testOnStorITFilter(t *testing.T) {
 	if err := onStor.SetFilter(fp, true); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from cache
 	if rcv, err := onStor.GetFilter("cgrates.org", "Filter1",
 		true, false, utils.NonTransactional); err != nil {
@@ -1869,7 +1866,7 @@ func testOnStorITRouteProfile(t *testing.T) {
 	if err := onStor.SetRouteProfile(splProfile, false); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from cache
 	if rcv, err := onStor.GetRouteProfile("cgrates.org", "SPRF_1",
 		true, false, utils.NonTransactional); err != nil {
@@ -1949,7 +1946,7 @@ func testOnStorITAttributeProfile(t *testing.T) {
 	if err := onStor.SetAttributeProfile(attrProfile, false); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from cache
 	if rcv, err := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
 		true, false, utils.NonTransactional); err != nil {
@@ -2082,7 +2079,7 @@ func testOnStorITChargerProfile(t *testing.T) {
 	if err := onStor.SetChargerProfile(cpp, false); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from database
 	if rcv, err := onStor.GetChargerProfile("cgrates.org", "CPP_1",
 		false, false, utils.NonTransactional); err != nil {
@@ -2138,7 +2135,7 @@ func testOnStorITDispatcherProfile(t *testing.T) {
 	if err := onStor.SetDispatcherProfile(dpp, false); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from database
 	if rcv, err := onStor.GetDispatcherProfile("cgrates.org", "Dsp1",
 		false, false, utils.NonTransactional); err != nil {
@@ -2225,7 +2222,7 @@ func testOnStorITRateProfile(t *testing.T) {
 	if err := onStor.SetRateProfile(rPrf, false); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(sleepDelay)
+
 	//get from database
 	if rcv, err := onStor.GetRateProfile("cgrates.org", "RP1",
 		false, false, utils.NonTransactional); err != nil {
diff --git a/ers/filecsv.go b/ers/filecsv.go
index 307e819b7..ae0a721f6 100644
--- a/ers/filecsv.go
+++ b/ers/filecsv.go
@@ -85,15 +85,17 @@ func (rdr *CSVFileER) Serve() (err error) {
 			utils.ERs, rdr.rdrExit)
 	default:
 		go func() {
+			tm := time.NewTimer(0)
 			for {
 				// Not automated, process and sleep approach
 				select {
 				case <-rdr.rdrExit:
+					tm.Stop()
 					utils.Logger.Info(
 						fmt.Sprintf("<%s> stop monitoring path <%s>",
 							utils.ERs, rdr.rdrDir))
 					return
-				default:
+				case <-tm.C:
 				}
 				filesInDir, _ := ioutil.ReadDir(rdr.rdrDir)
 				for _, file := range filesInDir {
@@ -108,7 +110,7 @@ func (rdr *CSVFileER) Serve() (err error) {
 						}
 					}(file.Name())
 				}
-				time.Sleep(rdr.Config().RunDelay)
+				tm.Reset(rdr.Config().RunDelay)
 			}
 		}()
 	}
diff --git a/ers/filecsv_it_test.go b/ers/filecsv_it_test.go
index d86f497ed..61884cb09 100644
--- a/ers/filecsv_it_test.go
+++ b/ers/filecsv_it_test.go
@@ -145,7 +145,7 @@ func testCsvITLoadTPFromFolder(t *testing.T) {
 		attrs, &loadInst); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 // The default scenario, out of ers defined in .cfg file
@@ -236,7 +236,7 @@ func testCsvITProcessCDR(t *testing.T) {
 }
 
 func testCsvITAnalyseCDRs(t *testing.T) {
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 
 	var cdrs []*engine.CDR
 	args := &utils.RPCCDRsFilterWithOpts{
@@ -288,7 +288,7 @@ func testCsvITProcessFilteredCDR(t *testing.T) {
 }
 
 func testCsvITAnalyzeFilteredCDR(t *testing.T) {
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 
 	var cdrs []*engine.CDR
 	args := &utils.RPCCDRsFilterWithOpts{
@@ -309,7 +309,7 @@ func testCsvITAnalyzeFilteredCDR(t *testing.T) {
 }
 
 func testCsvITProcessedFiles(t *testing.T) {
-	time.Sleep(time.Second)
+	time.Sleep(500 * time.Millisecond)
 	if outContent1, err := ioutil.ReadFile("/tmp/ers/out/file1.csv"); err != nil {
 		t.Error(err)
 	} else if fileContent1 != string(outContent1) {
@@ -344,7 +344,7 @@ func testCsvITReaderWithFilter(t *testing.T) {
 }
 
 func testCsvITAnalyzeReaderWithFilter(t *testing.T) {
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 
 	var cdrs []*engine.CDR
 	args := &utils.RPCCDRsFilterWithOpts{
diff --git a/ers/filefwv.go b/ers/filefwv.go
index 9b3e81d15..bdc295453 100644
--- a/ers/filefwv.go
+++ b/ers/filefwv.go
@@ -91,15 +91,17 @@ func (rdr *FWVFileER) Serve() (err error) {
 			utils.ERs, rdr.rdrExit)
 	default:
 		go func() {
+			tm := time.NewTimer(0)
 			for {
 				// Not automated, process and sleep approach
 				select {
 				case <-rdr.rdrExit:
+					tm.Stop()
 					utils.Logger.Info(
 						fmt.Sprintf("<%s> stop monitoring path <%s>",
 							utils.ERs, rdr.rdrDir))
 					return
-				default:
+				case <-tm.C:
 				}
 				filesInDir, _ := ioutil.ReadDir(rdr.rdrDir)
 				for _, file := range filesInDir {
@@ -114,7 +116,7 @@ func (rdr *FWVFileER) Serve() (err error) {
 						}
 					}(file.Name())
 				}
-				time.Sleep(rdr.Config().RunDelay)
+				tm.Reset(rdr.Config().RunDelay)
 			}
 		}()
 	}
diff --git a/ers/filejson.go b/ers/filejson.go
index 87a8a70e9..9bcb4bb14 100644
--- a/ers/filejson.go
+++ b/ers/filejson.go
@@ -84,15 +84,17 @@ func (rdr *JSONFileER) Serve() (err error) {
 			utils.ERs, rdr.rdrExit)
 	default:
 		go func() {
+			tm := time.NewTimer(0)
 			for {
 				// Not automated, process and sleep approach
 				select {
 				case <-rdr.rdrExit:
+					tm.Stop()
 					utils.Logger.Info(
 						fmt.Sprintf("<%s> stop monitoring path <%s>",
 							utils.ERs, rdr.rdrDir))
 					return
-				default:
+				case <-tm.C:
 				}
 				filesInDir, _ := ioutil.ReadDir(rdr.rdrDir)
 				for _, file := range filesInDir {
@@ -107,7 +109,7 @@ func (rdr *JSONFileER) Serve() (err error) {
 						}
 					}(file.Name())
 				}
-				time.Sleep(rdr.Config().RunDelay)
+				tm.Reset(rdr.Config().RunDelay)
 			}
 		}()
 	}
diff --git a/ers/filexml.go b/ers/filexml.go
index 04776caf0..4590fb9dd 100644
--- a/ers/filexml.go
+++ b/ers/filexml.go
@@ -85,15 +85,17 @@ func (rdr *XMLFileER) Serve() (err error) {
 			utils.ERs, rdr.rdrExit)
 	default:
 		go func() {
+			tm := time.NewTimer(0)
 			for {
 				// Not automated, process and sleep approach
 				select {
 				case <-rdr.rdrExit:
+					tm.Stop()
 					utils.Logger.Info(
 						fmt.Sprintf("<%s> stop monitoring path <%s>",
 							utils.ERs, rdr.rdrDir))
 					return
-				default:
+				case <-tm.C:
 				}
 				filesInDir, _ := ioutil.ReadDir(rdr.rdrDir)
 				for _, file := range filesInDir {
@@ -108,7 +110,7 @@ func (rdr *XMLFileER) Serve() (err error) {
 						}
 					}(file.Name())
 				}
-				time.Sleep(rdr.Config().RunDelay)
+				tm.Reset(rdr.Config().RunDelay)
 			}
 		}()
 	}
diff --git a/ers/filexml_it_test.go b/ers/filexml_it_test.go
index f3fdadfbd..5b5553885 100644
--- a/ers/filexml_it_test.go
+++ b/ers/filexml_it_test.go
@@ -117,7 +117,7 @@ func testXMLITLoadTPFromFolder(t *testing.T) {
 		attrs, &loadInst); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 var cdrXmlBroadsoft = `<?xml version="1.0" encoding="ISO-8859-1"?>
diff --git a/ers/flatstore.go b/ers/flatstore.go
index 6a9eb3c3c..047e08824 100644
--- a/ers/flatstore.go
+++ b/ers/flatstore.go
@@ -92,15 +92,17 @@ func (rdr *FlatstoreER) Serve() (err error) {
 			utils.ERs, rdr.rdrExit)
 	default:
 		go func() {
+			tm := time.NewTimer(0)
 			for {
 				// Not automated, process and sleep approach
 				select {
 				case <-rdr.rdrExit:
+					tm.Stop()
 					utils.Logger.Info(
 						fmt.Sprintf("<%s> stop monitoring path <%s>",
 							utils.ERs, rdr.rdrDir))
 					return
-				default:
+				case <-tm.C:
 				}
 				filesInDir, _ := ioutil.ReadDir(rdr.rdrDir)
 				for _, file := range filesInDir {
@@ -115,7 +117,7 @@ func (rdr *FlatstoreER) Serve() (err error) {
 						}
 					}(file.Name())
 				}
-				time.Sleep(rdr.Config().RunDelay)
+				tm.Reset(rdr.Config().RunDelay)
 			}
 		}()
 	}
diff --git a/ers/flatstore_it_test.go b/ers/flatstore_it_test.go
index cc9bc410b..3e4694500 100644
--- a/ers/flatstore_it_test.go
+++ b/ers/flatstore_it_test.go
@@ -168,7 +168,7 @@ func testFlatstoreITHandleCdr1File(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	time.Sleep(3 * time.Second)
+	time.Sleep(time.Second)
 	// check the files to be processed
 	filesInDir, _ := ioutil.ReadDir("/tmp/flatstoreErs/in")
 	if len(filesInDir) != 0 {
diff --git a/ers/lib_test.go b/ers/lib_test.go
index 8b9f18a6f..b56a4621f 100644
--- a/ers/lib_test.go
+++ b/ers/lib_test.go
@@ -32,7 +32,7 @@ import (
 
 var (
 	dataDir   = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here")
-	waitRater = flag.Int("wait_rater", 500, "Number of miliseconds to wait for rater to start and cache")
+	waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache")
 	encoding  = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication")
 	dbType    = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
 )
diff --git a/ers/partial_csv.go b/ers/partial_csv.go
index a84395909..f32abf679 100644
--- a/ers/partial_csv.go
+++ b/ers/partial_csv.go
@@ -104,15 +104,17 @@ func (rdr *PartialCSVFileER) Serve() (err error) {
 			utils.ERs, rdr.rdrExit)
 	default:
 		go func() {
+			tm := time.NewTimer(0)
 			for {
 				// Not automated, process and sleep approach
 				select {
 				case <-rdr.rdrExit:
+					tm.Stop()
 					utils.Logger.Info(
 						fmt.Sprintf("<%s> stop monitoring path <%s>",
 							utils.ERs, rdr.rdrDir))
 					return
-				default:
+				case <-tm.C:
 				}
 				filesInDir, _ := ioutil.ReadDir(rdr.rdrDir)
 				for _, file := range filesInDir {
@@ -127,7 +129,7 @@ func (rdr *PartialCSVFileER) Serve() (err error) {
 						}
 					}(file.Name())
 				}
-				time.Sleep(rdr.Config().RunDelay)
+				tm.Reset(rdr.Config().RunDelay)
 			}
 		}()
 	}
diff --git a/ers/partial_csv_it_test.go b/ers/partial_csv_it_test.go
index 444bc9930..5d2c258f1 100644
--- a/ers/partial_csv_it_test.go
+++ b/ers/partial_csv_it_test.go
@@ -179,7 +179,7 @@ func testPartITHandleCdr3File(t *testing.T) {
 	if err := os.Rename(tmpFilePath, path.Join("/tmp/partErs2/in", fileName)); err != nil {
 		t.Fatal("Error moving file to processing directory: ", err)
 	}
-	time.Sleep(3 * time.Second)
+	time.Sleep(time.Second)
 }
 
 func testPartITVerifyFiles(t *testing.T) {
diff --git a/ers/sql.go b/ers/sql.go
index 306f561c9..5c7e731b6 100644
--- a/ers/sql.go
+++ b/ers/sql.go
@@ -105,6 +105,8 @@ func (rdr *SQLEventReader) Serve() (err error) {
 }
 
 func (rdr *SQLEventReader) readLoop(db *gorm.DB) {
+	defer db.Close()
+	tm := time.NewTimer(0)
 	for {
 		if db = db.Table(rdr.tableName).Select("*"); db.Error != nil {
 			rdr.rdrErr <- db.Error
@@ -126,7 +128,6 @@ func (rdr *SQLEventReader) readLoop(db *gorm.DB) {
 				utils.Logger.Info(
 					fmt.Sprintf("<%s> stop monitoring sql DB <%s>",
 						utils.ERs, rdr.Config().SourcePath))
-				db.Close()
 				return
 			default:
 			}
@@ -172,7 +173,16 @@ func (rdr *SQLEventReader) readLoop(db *gorm.DB) {
 		if rdr.Config().RunDelay < 0 {
 			return
 		}
-		time.Sleep(rdr.Config().RunDelay)
+		tm.Reset(rdr.Config().RunDelay)
+		select {
+		case <-rdr.rdrExit:
+			tm.Stop()
+			utils.Logger.Info(
+				fmt.Sprintf("<%s> stop monitoring sql DB <%s>",
+					utils.ERs, rdr.Config().SourcePath))
+			return
+		case <-tm.C:
+		}
 	}
 }
 
@@ -294,11 +304,13 @@ func (rdr *SQLEventReader) postCDR(in []interface{}) (err error) {
 	if db, err = gorm.Open(rdr.expConnType, rdr.expConnString); err != nil {
 		return
 	}
+	defer db.Close()
 	if err = db.DB().Ping(); err != nil {
 		return
 	}
 	tx := db.Begin()
-	_, err = db.DB().Exec(sqlStatement, in...)
+	defer tx.Close()
+	_, err = tx.DB().Exec(sqlStatement, in...)
 	if err != nil {
 		tx.Rollback()
 		if strings.Contains(err.Error(), "1062") || strings.Contains(err.Error(), "duplicate key") { // returns 1062/pq when key is duplicated
diff --git a/ers/sql_it_test.go b/ers/sql_it_test.go
index 8b88f8ff5..65d8741cf 100644
--- a/ers/sql_it_test.go
+++ b/ers/sql_it_test.go
@@ -33,6 +33,10 @@ import (
 	"github.com/jinzhu/gorm"
 )
 
+type nopLogger struct{}
+
+func (nopLogger) Print(values ...interface{}) {}
+
 var (
 	sqlCfgPath string
 	sqlCfg     *config.CGRConfig
@@ -145,6 +149,7 @@ func testSQLInitDBs(t *testing.T) {
 	if db2, err = gorm.Open("mysql", fmt.Sprintf(dbConnString, "cgrates")); err != nil {
 		t.Fatal(err)
 	}
+	db2.SetLogger(new(nopLogger))
 
 	if _, err = db2.DB().Exec(`CREATE DATABASE IF NOT EXISTS cgrates2;`); err != nil {
 		t.Fatal(err)
@@ -157,6 +162,7 @@ func testSQLInitDB(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	db.SetLogger(new(nopLogger))
 	tx := db.Begin()
 	if !tx.HasTable("cdrs") {
 		tx = tx.CreateTable(new(engine.CDRsql))
diff --git a/general_tests/accounts_it_test.go b/general_tests/accounts_it_test.go
index 37e3cdb0a..283252c4b 100644
--- a/general_tests/accounts_it_test.go
+++ b/general_tests/accounts_it_test.go
@@ -132,7 +132,7 @@ func testV1AccLoadTarrifPlans(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply returned", reply)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(200 * time.Millisecond)
 }
 
 func testV1AccGetAccountAfterLoad(t *testing.T) {
@@ -248,7 +248,6 @@ func testV1AccSendToThreshold(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Errorf("Calling APIerSv2.SetActions received: %s", reply)
 	}
-	time.Sleep(10 * time.Millisecond)
 
 	tPrfl := &engine.ThresholdWithCache{
 		ThresholdProfile: &engine.ThresholdProfile{
diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go
index cc0716510..6e5606bdf 100644
--- a/general_tests/attributes_it_test.go
+++ b/general_tests/attributes_it_test.go
@@ -126,7 +126,7 @@ func testAttributeSLoadFromFolder(t *testing.T) {
 	if err := attrRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(200 * time.Millisecond)
 }
 
 func testAttributeSProcessEvent(t *testing.T) {
diff --git a/general_tests/broadcast_client_it_test.go b/general_tests/broadcast_client_it_test.go
index c0dcdf933..d4aaf85a8 100644
--- a/general_tests/broadcast_client_it_test.go
+++ b/general_tests/broadcast_client_it_test.go
@@ -129,7 +129,7 @@ func testbrodcastItLoadFromFolder(t *testing.T) {
 	if err := brodcastInternalRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(200 * time.Millisecond)
 }
 
 func testbrodcastItProccessEvent(t *testing.T) {
@@ -159,7 +159,7 @@ func testbrodcastItProccessEvent(t *testing.T) {
 	if rply != utils.OK {
 		t.Errorf("Unexpected reply: %s", rply)
 	}
-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(50 * time.Millisecond)
 }
 func testbrodcastItGetCDRs(t *testing.T) {
 	eCDR := &engine.CDR{
diff --git a/general_tests/cdrs_internal_it_test.go b/general_tests/cdrs_internal_it_test.go
index bb48d52b0..a3362010d 100644
--- a/general_tests/cdrs_internal_it_test.go
+++ b/general_tests/cdrs_internal_it_test.go
@@ -125,7 +125,7 @@ func testCdrsIntTestTTL(t *testing.T) {
 	} else if len(cdrs) != 1 {
 		t.Errorf("Expected 1 result received %v ", len(cdrs))
 	}
-	time.Sleep(3 * time.Second)
+	time.Sleep(time.Second + 50*time.Millisecond)
 	if err := cdrsIntRPC.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{}, &cdrs); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal("Unexpected error: ", err)
diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go
index 3e46b050d..dad89eb5c 100644
--- a/general_tests/cdrs_it_test.go
+++ b/general_tests/cdrs_it_test.go
@@ -187,7 +187,6 @@ func testV2CDRsProcessCDR(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(150 * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsGetCdrs(t *testing.T) {
@@ -260,7 +259,6 @@ func testV2CDRsProcessCDR2(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(150 * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsGetCdrs2(t *testing.T) {
@@ -335,7 +333,6 @@ func testV2CDRsProcessCDR3(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(150 * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsGetCdrs3(t *testing.T) {
@@ -399,7 +396,6 @@ func testV2CDRsProcessCDR4(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(150 * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsGetCdrs4(t *testing.T) {
@@ -591,7 +587,6 @@ func testV2CDRsProcessCDR5(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(150 * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsGetStats1(t *testing.T) {
@@ -660,7 +655,6 @@ func testV2CDRsProcessCDR6(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(150 * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsGetStats2(t *testing.T) {
@@ -721,7 +715,6 @@ func testV2CDRsProcessCDR7(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(150 * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsGetCdrs7(t *testing.T) {
diff --git a/general_tests/cdrs_onlexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go
index d8a176a37..dd8fb1d55 100644
--- a/general_tests/cdrs_onlexp_it_test.go
+++ b/general_tests/cdrs_onlexp_it_test.go
@@ -210,10 +210,6 @@ func testCDRsOnExpLoadDefaultCharger(t *testing.T) {
 
 // Disable ExportCDR
 func testCDRsOnExpDisableOnlineExport(t *testing.T) {
-	// stop RabbitMQ server so we can test reconnects
-	if err := exec.Command("service", "rabbitmq-server", "stop").Run(); err != nil {
-		t.Error(err)
-	}
 	testCdr := &engine.CDR{
 		CGRID:       utils.Sha1("NoOnlineExport", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()),
 		ToR:         utils.VOICE,
@@ -254,11 +250,6 @@ func testCDRsOnExpDisableOnlineExport(t *testing.T) {
 	if len(filesInDir) != 0 {
 		t.Fatalf("Should be no files in directory: %s", cdrsMasterCfg.GeneralCfg().FailedPostsDir)
 	}
-	// start RabbitMQ server so we can test reconnects
-	if err := exec.Command("service", "rabbitmq-server", "start").Run(); err != nil {
-		t.Error(err)
-	}
-	time.Sleep(5 * time.Second)
 }
 
 func testCDRsOnExpHttpCdrReplication(t *testing.T) {
@@ -381,7 +372,7 @@ func testCDRsOnExpAMQPReplication(t *testing.T) {
 	if err := exec.Command("service", "rabbitmq-server", "restart").Run(); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(5 * time.Second)
+	time.Sleep(2 * time.Second)
 	testCdr := &engine.CDR{
 		CGRID:       amqpCGRID,
 		ToR:         utils.VOICE,
diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go
index 215dc05fd..2467abd76 100644
--- a/general_tests/data_it_test.go
+++ b/general_tests/data_it_test.go
@@ -130,7 +130,7 @@ func testV1DataLoadTarrifPlans(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply returned", reply)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testV1DataDataDebitUsageWith10Kilo(t *testing.T) {
diff --git a/general_tests/destination_combined_it_test.go b/general_tests/destination_combined_it_test.go
index dccc782ca..abf58a924 100644
--- a/general_tests/destination_combined_it_test.go
+++ b/general_tests/destination_combined_it_test.go
@@ -103,7 +103,7 @@ func testDestinationFromFolder(t *testing.T) {
 	if err := tutorialRpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testDestinationGetCostFor1002(t *testing.T) {
diff --git a/general_tests/doubleremove_it_test.go b/general_tests/doubleremove_it_test.go
index 8f6890db1..2c8b1cf46 100644
--- a/general_tests/doubleremove_it_test.go
+++ b/general_tests/doubleremove_it_test.go
@@ -141,7 +141,6 @@ func testdoubleRemoveStatQueueProfile(t *testing.T) {
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
 	}
-	time.Sleep(50 * time.Millisecond)
 	//check
 	if err := sesRPC.Call(utils.APIerSv1GetStatQueueProfile,
 		&utils.TenantID{Tenant: doubleRemoveTenant, ID: "TEST_PROFILE1"}, &reply); err != nil {
@@ -167,7 +166,6 @@ func testdoubleRemoveStatQueueProfile(t *testing.T) {
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
-	time.Sleep(50 * time.Millisecond)
 	// check
 	if err := sesRPC.Call(utils.APIerSv1GetStatQueueProfile,
 		&utils.TenantID{Tenant: doubleRemoveTenant, ID: "TEST_PROFILE1"}, &reply); err == nil ||
diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go
index 1cb42d89a..0b2cf14be 100644
--- a/general_tests/filters_it_test.go
+++ b/general_tests/filters_it_test.go
@@ -127,7 +127,7 @@ func testV1FltrLoadTarrifPlans(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply returned", reply)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testV1FltrAddStats(t *testing.T) {
diff --git a/general_tests/gocs_it_test.go b/general_tests/gocs_it_test.go
index cad1adf2c..33936c5af 100644
--- a/general_tests/gocs_it_test.go
+++ b/general_tests/gocs_it_test.go
@@ -104,7 +104,6 @@ func testGOCSResetDB(t *testing.T) {
 		t.Fatal(err)
 	}
 	// give some time to flush DataDB and StorDB for all 3 engines
-	time.Sleep(100 * time.Millisecond)
 }
 
 // Start CGR Engine
diff --git a/general_tests/poster_it_test.go b/general_tests/poster_it_test.go
index a0a25c3bb..6cb3a5053 100644
--- a/general_tests/poster_it_test.go
+++ b/general_tests/poster_it_test.go
@@ -314,7 +314,7 @@ func testPosterITKafka(t *testing.T) {
 		t.Errorf("Calling APIerSv1.ExecuteAction received: %s", reply)
 	}
 	// verify if acction was executed
-	time.Sleep(time.Second)
+	time.Sleep(500 * time.Millisecond)
 	ev, err := testPosterReadFolder(utils.MetaKafkajsonMap)
 	if err != nil {
 		t.Fatal(err)
diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go
index b2786cbd1..1fd9d34e0 100644
--- a/general_tests/rpccaching_it_test.go
+++ b/general_tests/rpccaching_it_test.go
@@ -161,7 +161,6 @@ func testRPCMethodsAddData(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Errorf("Calling APIerSv2.SetActions received: %s", reply)
 	}
-	time.Sleep(10 * time.Millisecond)
 
 	//Add a thresholdProfile to disable account
 	tPrfl := &engine.ThresholdWithCache{
@@ -273,7 +272,7 @@ func testRPCMethodsAuthorizeSession(t *testing.T) {
 	}
 
 	//give time to CGRateS to delete the response from cache
-	time.Sleep(time.Second + 500*time.Millisecond)
+	time.Sleep(time.Second)
 
 	//authorize again session (this time we expect to receive an error)
 	if err := rpcRpc.Call(utils.SessionSv1AuthorizeEvent, args, &rply); err == nil || err.Error() != "RALS_ERROR:ACCOUNT_DISABLED" {
@@ -372,7 +371,7 @@ func testRPCMethodsInitSession(t *testing.T) {
 	}
 
 	//give time to CGRateS to delete the response from cache
-	time.Sleep(time.Second + 500*time.Millisecond)
+	time.Sleep(time.Second)
 
 	if err := rpcRpc.Call(utils.SessionSv1InitiateSession,
 		args, &rply); err == nil || !(err.Error() == "RALS_ERROR:ACCOUNT_DISABLED" ||
@@ -472,7 +471,7 @@ func testRPCMethodsUpdateSession(t *testing.T) {
 	}
 
 	//give time to CGRateS to delete the response from cache
-	time.Sleep(time.Second + 500*time.Millisecond)
+	time.Sleep(time.Second)
 
 	if err := rpcRpc.Call(utils.SessionSv1UpdateSession,
 		args, &rply); err == nil || err.Error() != "RALS_ERROR:ACCOUNT_DISABLED" {
@@ -537,7 +536,7 @@ func testRPCMethodsTerminateSession(t *testing.T) {
 	}
 
 	//give time to CGRateS to delete the response from cache
-	time.Sleep(time.Second + 500*time.Millisecond)
+	time.Sleep(time.Second)
 
 	if err := rpcRpc.Call(utils.SessionSv1TerminateSession,
 		args, &rply); err == nil || err.Error() != "MANDATORY_IE_MISSING: [OriginID]" {
@@ -599,7 +598,7 @@ func testRPCMethodsProcessCDR(t *testing.T) {
 	}
 
 	//give time to CGRateS to delete the response from cache
-	time.Sleep(time.Second + 500*time.Millisecond)
+	time.Sleep(time.Second)
 
 	//change originID so CGRID be different
 	args.Event[utils.OriginID] = "testRPCMethodsProcessCDR3"
@@ -693,7 +692,7 @@ func testRPCMethodsProcessEvent(t *testing.T) {
 	}
 
 	//give time to CGRateS to delete the response from cache
-	time.Sleep(time.Second + 500*time.Millisecond)
+	time.Sleep(time.Second)
 
 	if err := rpcRpc.Call(utils.SessionSv1ProcessMessage,
 		args, &rplyFirst); err == nil || err.Error() != "RALS_ERROR:ACCOUNT_DISABLED" {
@@ -772,7 +771,7 @@ func testRPCMethodsCdrsProcessCDR(t *testing.T) {
 	}
 
 	//give time to CGRateS to delete the response from cache
-	time.Sleep(time.Second + 500*time.Millisecond)
+	time.Sleep(time.Second)
 	//change originID so CGRID be different
 	args.Event[utils.OriginID] = "testRPCMethodsProcessCDR4"
 	if err := rpcRpc.Call(utils.CDRsV1ProcessEvent, args, &reply); err != nil {
@@ -830,7 +829,7 @@ func testRPCMethodsCdrsStoreSessionCost(t *testing.T) {
 	}
 
 	//give time to CGRateS to delete the response from cache
-	time.Sleep(time.Second + 500*time.Millisecond)
+	time.Sleep(time.Second)
 	//change originID so CGRID be different
 	args.Cost.CGRID = "testRPCMethodsCdrsStoreSessionCost"
 	if err := rpcRpc.Call(utils.CDRsV2StoreSessionCost, args,
@@ -887,7 +886,7 @@ func testRPCMethodsResponderDebit(t *testing.T) {
 			utils.ToJSON(cc), utils.ToJSON(ccCache))
 	}
 	//give time to CGRateS to delete the response from cache
-	time.Sleep(time.Second + 500*time.Millisecond)
+	time.Sleep(time.Second)
 	if err := rpcRpc.Call(utils.ResponderDebit, cd2, &cc); err == nil || err.Error() != "ACCOUNT_NOT_FOUND" {
 		t.Error("Unexpected error returned", err)
 	}
@@ -933,7 +932,7 @@ func testRPCMethodsResponderMaxDebit(t *testing.T) {
 			utils.ToJSON(cc), utils.ToJSON(ccCache))
 	}
 	//give time to CGRateS to delete the response from cache
-	time.Sleep(time.Second + 500*time.Millisecond)
+	time.Sleep(time.Second)
 	if err := rpcRpc.Call(utils.ResponderMaxDebit, cd2, &cc); err == nil || err.Error() != "ACCOUNT_NOT_FOUND" {
 		t.Error("Unexpected error returned", err)
 	}
diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go
index 0cd3e7bbc..f32cc7a54 100644
--- a/general_tests/session2_it_test.go
+++ b/general_tests/session2_it_test.go
@@ -112,7 +112,7 @@ func testSes2ItLoadFromFolder(t *testing.T) {
 	if err := ses2RPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testSes2ItInitSession(t *testing.T) {
diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go
index 139a31716..aeaf9440c 100644
--- a/general_tests/session3_it_test.go
+++ b/general_tests/session3_it_test.go
@@ -119,7 +119,7 @@ func testSes3ItLoadFromFolder(t *testing.T) {
 	if err := ses3RPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testSes3ItProcessEvent(t *testing.T) {
diff --git a/general_tests/session4_it_test.go b/general_tests/session4_it_test.go
index e6dab4554..7a1187ecb 100644
--- a/general_tests/session4_it_test.go
+++ b/general_tests/session4_it_test.go
@@ -109,7 +109,7 @@ func testSes4ItLoadFromFolder(t *testing.T) {
 	if err := ses4RPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testSes4SetAccount(t *testing.T) {
diff --git a/general_tests/session_it_test.go b/general_tests/session_it_test.go
index a151759f2..2b10963c6 100644
--- a/general_tests/session_it_test.go
+++ b/general_tests/session_it_test.go
@@ -111,7 +111,7 @@ func testSesItLoadFromFolder(t *testing.T) {
 	if err := sesRPC.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testAccountBalance2(t *testing.T, sracc, srten, balType string, expected float64) {
diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go
index 26e0590dd..502230c56 100644
--- a/general_tests/sessionrefund_it_test.go
+++ b/general_tests/sessionrefund_it_test.go
@@ -113,7 +113,7 @@ func testSrItLoadFromFolder(t *testing.T) {
 	if err := srrpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testAccountBalance(t *testing.T, sracc, srten, balType string, expected float64) {
diff --git a/general_tests/suretax_it_test.go b/general_tests/suretax_it_test.go
index 1f21bb188..c086395e0 100644
--- a/general_tests/suretax_it_test.go
+++ b/general_tests/suretax_it_test.go
@@ -141,7 +141,7 @@ func testSTIProcessExternalCdr(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(2 * time.Second)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testSTIGetCdrs(t *testing.T) {
diff --git a/general_tests/tp_it_test.go b/general_tests/tp_it_test.go
index 15e61db55..14528f9f5 100644
--- a/general_tests/tp_it_test.go
+++ b/general_tests/tp_it_test.go
@@ -300,23 +300,6 @@ func testTpExecuteActionCgrRpcAcc(t *testing.T) {
 	}
 }
 
-// Deprecated
-// func //(t *testing.T) {
-// 	var reply string
-// 	if err := tpRPC.Call(utils.APIerSv2ExecuteAction, utils.AttrExecuteAction{
-// 		ActionsId: "RPC_CDRSTATS",
-// 	}, &reply); err != nil {
-// 		t.Error("Got error on APIerSv2.ExecuteAction: ", err.Error())
-// 	} else if reply != utils.OK {
-// 		t.Errorf("Calling ExecuteAction got reply: %s", reply)
-// 	}
-// 	var queue engine.CDRStatsQueue
-// 	time.Sleep(20 * time.Millisecond)
-// 	if err := tpRPC.Call(utils.CDRStatsV1GetQueue, "qtest", &queue); err != nil {
-// 		t.Error("Got error on CDRStatsV1.GetQueue: ", err.Error())
-// 	}
-// }
-
 func testTpCreateExecuteActionMatch(t *testing.T) {
 	var reply string
 	if err := tpRPC.Call(utils.APIerSv2SetActions, &utils.AttrSetActions{
diff --git a/general_tests/tutorial2_it_test.go b/general_tests/tutorial2_it_test.go
index c3d0d8a8d..0399a7146 100644
--- a/general_tests/tutorial2_it_test.go
+++ b/general_tests/tutorial2_it_test.go
@@ -120,7 +120,7 @@ func testTutFromFolder(t *testing.T) {
 		attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testTutGetCost(t *testing.T) {
diff --git a/general_tests/tutorial_it_test.go b/general_tests/tutorial_it_test.go
index 955fbdb11..68362f55c 100644
--- a/general_tests/tutorial_it_test.go
+++ b/general_tests/tutorial_it_test.go
@@ -124,7 +124,7 @@ func testTutorialFromFolder(t *testing.T) {
 	if err := tutorialRpc.Call(utils.APIerSv1LoadTariffPlanFromFolder, attrs, &reply); err != nil {
 		t.Error(err)
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func testTutorialGetCost(t *testing.T) {
diff --git a/general_tests/twoengines_it_test.go b/general_tests/twoengines_it_test.go
index 35967b0cf..5d75cebc9 100644
--- a/general_tests/twoengines_it_test.go
+++ b/general_tests/twoengines_it_test.go
@@ -163,7 +163,6 @@ func testTwoEnginesSetThreshold(t *testing.T) {
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
 	}
-	time.Sleep(50 * time.Millisecond)
 	if err := engineOneRpc.Call(utils.APIerSv1GetThresholdProfile,
 		&utils.TenantID{Tenant: "cgrates.org", ID: "THD_TwoEnginesTest"}, &reply); err != nil {
 		t.Error(err)
@@ -250,7 +249,6 @@ func testTwoEnginesUpdateThreshold(t *testing.T) {
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
 	}
-	time.Sleep(50 * time.Millisecond)
 	if err := engineOneRpc.Call(utils.APIerSv1GetThresholdProfile,
 		&utils.TenantID{Tenant: "cgrates.org", ID: "THD_TwoEnginesTest"}, &rplTh); err != nil {
 		t.Error(err)
diff --git a/sessions/lib_test.go b/sessions/lib_test.go
index c6cdc9458..ea157fa8c 100644
--- a/sessions/lib_test.go
+++ b/sessions/lib_test.go
@@ -30,7 +30,7 @@ import (
 
 var (
 	dataDir   = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here")
-	waitRater = flag.Int("wait_rater", 500, "Number of miliseconds to wait for rater to start and cache")
+	waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache")
 	encoding  = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication")
 	dbType    = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
 )
diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go
index eab7cfe84..50a4d0ebe 100644
--- a/sessions/sessions_voice_it_test.go
+++ b/sessions/sessions_voice_it_test.go
@@ -1133,7 +1133,7 @@ func testSessionsVoiceSessionTTLWithRelocate(t *testing.T) {
 		}, &aSessions); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err, utils.ToJSON(aSessions))
 	}
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 	var cdrs []*engine.ExternalCDR
 	req := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaDefault}, DestinationPrefixes: []string{"1009"}}
 	if err := sessionsRPC.Call(utils.APIerSv2GetCDRs, &req, &cdrs); err != nil {