diff --git a/agents/dnsagent.go b/agents/dnsagent.go
index 6f7f39daf..c889b7945 100644
--- a/agents/dnsagent.go
+++ b/agents/dnsagent.go
@@ -51,13 +51,11 @@ func (da *DNSAgent) initDNSServer() (err error) {
 	handler := dns.HandlerFunc(func(w dns.ResponseWriter, m *dns.Msg) {
 		go da.handleMessage(w, m)
 	})
-
 	if strings.HasSuffix(da.cgrCfg.DNSAgentCfg().ListenNet, utils.TLSNoCaps) {
 		cert, err := tls.LoadX509KeyPair(da.cgrCfg.TLSCfg().ServerCerificate, da.cgrCfg.TLSCfg().ServerKey)
 		if err != nil {
 			return err
 		}
-
 		config := tls.Config{
 			Certificates: []tls.Certificate{cert},
 		}
diff --git a/services/dnsagent.go b/services/dnsagent.go
index 6fa9266c7..038274ccf 100644
--- a/services/dnsagent.go
+++ b/services/dnsagent.go
@@ -61,7 +61,6 @@ func (dns *DNSAgent) Start() (err error) {
 	if dns.IsRunning() {
 		return utils.ErrServiceAlreadyRunning
 	}
-
 	filterS := <-dns.filterSChan
 	dns.filterSChan <- filterS
 
@@ -71,6 +70,7 @@ func (dns *DNSAgent) Start() (err error) {
 	dns.dns, err = agents.NewDNSAgent(dns.cfg, filterS, dns.connMgr)
 	if err != nil {
 		utils.Logger.Err(fmt.Sprintf("<%s> error: <%s>", utils.DNSAgent, err.Error()))
+		dns.dns = nil
 		return
 	}
 	go func() {
diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go
index 52dfc1328..131fdea0a 100644
--- a/services/dnsagent_it_test.go
+++ b/services/dnsagent_it_test.go
@@ -187,10 +187,67 @@ func TestDNSAgentReload2(t *testing.T) {
 	time.Sleep(10 * time.Millisecond)
 }
 
-/*
 func TestDNSAgentReload3(t *testing.T) {
 	cfg := config.NewDefaultCGRConfig()
 	cfg.SessionSCfg().Enabled = true
+
+	cfg.DNSAgentCfg().ListenNet = "testtls"
+	cfg.TLSCfg().ServerCerificate = ""
+	cfg.TLSCfg().ServerKey = ""
+
+	utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID)
+	utils.Logger.SetLogLevel(7)
+	filterSChan := make(chan *engine.FilterS, 1)
+	filterSChan <- nil
+	shdChan := utils.NewSyncedChan()
+	shdWg := new(sync.WaitGroup)
+	chS := engine.NewCacheS(cfg, nil, nil)
+
+	cacheSChan := make(chan rpcclient.ClientConnector, 1)
+	cacheSChan <- chS
+
+	server := cores.NewServer(nil)
+	srvMngr := servmanager.NewServiceManager(cfg, shdChan, shdWg)
+	srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
+	db := NewDataDBService(cfg, nil, srvDep)
+	anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep)
+	sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1),
+		shdChan, nil, nil, anz, srvDep)
+	srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, srvDep)
+	engine.NewConnManager(cfg, nil)
+	srvMngr.AddServices(srv, sS,
+		NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep), db)
+	if err := srvMngr.StartServices(); err != nil {
+		t.Fatal(err)
+	}
+	if srv.IsRunning() {
+		t.Errorf("Expected service to be down")
+	}
+	var reply string
+	if err := cfg.V1ReloadConfig(&config.ReloadArgs{
+		Path:    path.Join("/usr", "share", "cgrates", "conf", "samples", "dnsagent_mongo"),
+		Section: config.DNSAgentJson,
+	}, &reply); err != nil {
+		t.Fatal(err)
+	} else if reply != utils.OK {
+		t.Errorf("Expecting OK ,received %s", reply)
+	}
+
+	time.Sleep(10 * time.Millisecond)
+
+	cfg.DNSAgentCfg().Enabled = false
+	cfg.GetReloadChan(config.DNSAgentJson) <- struct{}{}
+	time.Sleep(10 * time.Millisecond)
+	if srv.IsRunning() {
+		t.Errorf("Expected service to be down")
+	}
+	shdChan.CloseOnce()
+	time.Sleep(10 * time.Millisecond)
+}
+
+func TestDNSAgentReload4(t *testing.T) {
+	cfg := config.NewDefaultCGRConfig()
+	cfg.SessionSCfg().Enabled = true
 	utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID)
 	utils.Logger.SetLogLevel(7)
 	filterSChan := make(chan *engine.FilterS, 1)
@@ -229,15 +286,24 @@ func TestDNSAgentReload3(t *testing.T) {
 		t.Errorf("Expecting OK ,received %s", reply)
 	}
 	time.Sleep(10 * time.Millisecond) //need to switch to gorutine
+	runtime.Gosched()
+	runtime.Gosched()
+	runtime.Gosched()
+	runtime.Gosched()
 	if !srv.IsRunning() {
 		t.Errorf("Expected service to be running")
 	}
-
+	runtime.Gosched()
+	runtime.Gosched()
+	runtime.Gosched()
+	runtime.Gosched()
 	err := srv.Start()
 	if err == nil || err != utils.ErrServiceAlreadyRunning {
 		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
 	}
 
+	runtime.Gosched()
+	runtime.Gosched()
 	err = srv.Reload()
 	if err != nil {
 		t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
@@ -246,12 +312,21 @@ func TestDNSAgentReload3(t *testing.T) {
 	if err != nil {
 		t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
 	}
-
+	runtime.Gosched()
+	runtime.Gosched()
+	err = srv.Reload()
+	if err != nil {
+		t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
+	}
 	time.Sleep(10 * time.Millisecond)
 	cfg.DNSAgentCfg().Enabled = false
 	cfg.GetReloadChan(config.DNSAgentJson) <- struct{}{}
 	time.Sleep(10 * time.Millisecond)
+	runtime.Gosched()
+	runtime.Gosched()
+	if srv.IsRunning() {
+		t.Errorf("Expected service to be down")
+	}
 	shdChan.CloseOnce()
 	time.Sleep(10 * time.Millisecond)
 }
-*/
diff --git a/services/ers_it_test.go b/services/ers_it_test.go
index 5b047efb1..477aae0bf 100644
--- a/services/ers_it_test.go
+++ b/services/ers_it_test.go
@@ -79,16 +79,17 @@ func TestEventReaderSReload(t *testing.T) {
 		t.Errorf("Expecting OK ,received %s", reply)
 	}
 	runtime.Gosched()
-	runtime.Gosched()
-	time.Sleep(10 * time.Millisecond) //need to switch to gorutine
 	if !attrS.IsRunning() {
 		t.Errorf("Expected service to be running")
 	}
+
+	runtime.Gosched()
 	err := attrS.Start()
 	if err == nil || err != utils.ErrServiceAlreadyRunning {
 		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
 	}
 	time.Sleep(10 * time.Millisecond)
+	runtime.Gosched()
 	err = attrS.Reload()
 	if err != nil {
 		t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go
index e46c5d8e7..9a913bdf1 100644
--- a/services/freeswitchagent_it_test.go
+++ b/services/freeswitchagent_it_test.go
@@ -87,6 +87,7 @@ func TestFreeSwitchAgentReload(t *testing.T) {
 	}
 
 	srv.(*FreeswitchAgent).fS = agents.NewFSsessions(agentCfg, "", nil)
+	runtime.Gosched()
 	err := srv.Reload()
 	if err != nil {
 		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err)
diff --git a/services/httpagent_it_test.go b/services/httpagent_it_test.go
index e31cb18c2..61e7d1859 100644
--- a/services/httpagent_it_test.go
+++ b/services/httpagent_it_test.go
@@ -21,6 +21,7 @@ package services
 
 import (
 	"path"
+	"runtime"
 	"sync"
 	"testing"
 	"time"
@@ -72,13 +73,16 @@ func TestHTTPAgentReload(t *testing.T) {
 		t.Errorf("Expecting OK ,received %s", reply)
 	}
 	time.Sleep(10 * time.Millisecond) //need to switch to gorutine
+	runtime.Gosched()
 	if !srv.IsRunning() {
 		t.Errorf("Expected service to be running")
 	}
+	runtime.Gosched()
 	srvReload := srv.Reload()
 	if srvReload != nil {
 		t.Errorf("\nExpecting <nil>,\n Received <%+v>", srvReload)
 	}
+	runtime.Gosched()
 	err := srv.Start()
 	if err != utils.ErrServiceAlreadyRunning {
 		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
diff --git a/services/radiusagent_it_test.go b/services/radiusagent_it_test.go
index 91264da44..a305e588d 100644
--- a/services/radiusagent_it_test.go
+++ b/services/radiusagent_it_test.go
@@ -21,6 +21,7 @@ package services
 
 import (
 	"path"
+	"runtime"
 	"sync"
 	"testing"
 	"time"
@@ -139,10 +140,13 @@ func TestRadiusAgentReload2(t *testing.T) {
 		t.Errorf("Expecting OK ,received %s", reply)
 	}
 	time.Sleep(10 * time.Millisecond) //need to switch to gorutine
+	runtime.Gosched()
+	runtime.Gosched()
 	if !srv.IsRunning() {
 		t.Errorf("Expected service to be running")
 	}
-
+	runtime.Gosched()
+	runtime.Gosched()
 	err := srv.Start()
 	if err == nil || err != utils.ErrServiceAlreadyRunning {
 		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
diff --git a/services/sessions_it_test.go b/services/sessions_it_test.go
index 894421a9c..2a23b247e 100644
--- a/services/sessions_it_test.go
+++ b/services/sessions_it_test.go
@@ -83,7 +83,8 @@ func TestSessionSReload(t *testing.T) {
 	if stordb.IsRunning() {
 		t.Errorf("Expected service to be down")
 	}
-	/*
+
+
 		var reply string
 		if err := cfg.V1ReloadConfig(&config.ReloadArgs{
 			Path:    path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongonew"),
diff --git a/services/sipagent_it_test.go b/services/sipagent_it_test.go
index 8d70b385b..8bea3aa63 100644
--- a/services/sipagent_it_test.go
+++ b/services/sipagent_it_test.go
@@ -21,6 +21,7 @@ package services
 
 import (
 	"path"
+	"runtime"
 	"sync"
 	"testing"
 	"time"
@@ -75,9 +76,17 @@ func TestSIPAgentReload(t *testing.T) {
 		t.Errorf("Expecting OK ,received %s", reply)
 	}
 	time.Sleep(10 * time.Millisecond) //need to switch to gorutine
+	runtime.Gosched()
+	runtime.Gosched()
+	runtime.Gosched()
+	runtime.Gosched()
 	if !srv.IsRunning() {
 		t.Errorf("Expected service to be running")
 	}
+	runtime.Gosched()
+	runtime.Gosched()
+	runtime.Gosched()
+	runtime.Gosched()
 	srvStart := srv.Start()
 	if srvStart != utils.ErrServiceAlreadyRunning {
 		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, srvStart)
@@ -91,7 +100,7 @@ func TestSIPAgentReload(t *testing.T) {
 		t.Fatalf("cannot cast")
 	}
 	castSrv.oldListen = "test_string"
-
+	runtime.Gosched()
 	err = srv.Reload()
 	if err != nil {
 		t.Errorf("\nExpecting <err>,\n Received <%+v>", err)
diff --git a/services/thresholds_it_test.go b/services/thresholds_it_test.go
index 192080ee2..b568bf5af 100644
--- a/services/thresholds_it_test.go
+++ b/services/thresholds_it_test.go
@@ -21,6 +21,7 @@ package services
 
 import (
 	"path"
+	"runtime"
 	"sync"
 	"testing"
 	"time"
@@ -75,12 +76,15 @@ func TestThresholdSReload(t *testing.T) {
 		t.Errorf("Expecting OK ,received %s", reply)
 	}
 	time.Sleep(10 * time.Millisecond) //need to switch to gorutine
+	runtime.Gosched()
 	if !tS.IsRunning() {
 		t.Errorf("Expected service to be running")
 	}
+	runtime.Gosched()
 	if !db.IsRunning() {
 		t.Errorf("Expected service to be running")
 	}
+	runtime.Gosched()
 	err := tS.Start()
 	if err == nil || err != utils.ErrServiceAlreadyRunning {
 		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)