diff --git a/services/diameteragent_test.go b/services/diameteragent_test.go
index a498b2bc7..e2a4bc142 100644
--- a/services/diameteragent_test.go
+++ b/services/diameteragent_test.go
@@ -17,71 +17,68 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 package services
 
-/*
+import (
+	"sync"
+	"testing"
+
+	"github.com/cgrates/cgrates/agents"
+
+	"github.com/cgrates/cgrates/config"
+	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
+	"github.com/cgrates/rpcclient"
+)
+
 //TestDiameterAgentCoverage for cover testing
 func TestDiameterAgentCoverage(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)
 	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)
 	srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
-	srvMngr := servmanager.NewServiceManager(cfg, shdChan, shdWg)
-	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 := NewDiameterAgent(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", "diamagent_mysql"),
-		Section: config.DA_JSN,
-	}, &reply); err != nil {
-		t.Fatal(err)
-	} else if reply != utils.OK {
-		t.Errorf("Expecting OK ,received %s", reply)
+	rpcInternal := map[string]chan rpcclient.ClientConnector{}
+	cM := engine.NewConnManager(cfg, rpcInternal)
+	filterS := engine.NewFilterS(cfg, cM, nil)
+	da, _ := agents.NewDiameterAgent(cfg, filterS, cM)
+	srv2 := &DiameterAgent{
+		cfg:         cfg,
+		filterSChan: filterSChan,
+		shdChan:     shdChan,
+		connMgr:     nil,
+		srvDep:      srvDep,
+		stopChan:    make(chan struct{}, 1),
+		da:          da,
+	}
+	if !srv2.IsRunning() {
+		t.Errorf("Expected service to be running")
+	}
+	err := srv2.Start()
+	if err == nil || err != utils.ErrServiceAlreadyRunning {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
+	}
+	serviceName := srv2.ServiceName()
+	if serviceName != utils.DiameterAgent {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.DiameterAgent, serviceName)
+	}
+	shouldRun := srv2.ShouldRun()
+	if shouldRun != false {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", false, shouldRun)
+	}
+	shutErr := srv2.Shutdown()
+	if shutErr != nil {
+		t.Errorf("\nExpecting <nil>,\n Received <%+v>", shutErr)
+	}
+	if srv2.IsRunning() {
+		t.Errorf("Expected service to be down")
 	}
 
-		time.Sleep(10 * time.Millisecond) //need to switch to gorutine
-		if !srv.IsRunning() {
-			t.Errorf("Expected service to be running")
-		}
-
-			err := srv.Start()
-			if err == nil || err != utils.ErrServiceAlreadyRunning {
-				t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
-			}
-			err = srv.Reload()
-			if err != nil {
-				t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
-			}
-			cfg.DiameterAgentCfg().Enabled = false
-			cfg.GetReloadChan(config.DA_JSN) <- struct{}{}
-			time.Sleep(10 * time.Millisecond)
-			if srv.IsRunning() {
-				t.Errorf("Expected service to be down")
-			}
-			shdChan.CloseOnce()
-			time.Sleep(10 * time.Millisecond)
-
 }
-*/
diff --git a/services/dispatcherh_test.go b/services/dispatcherh_test.go
index f29173829..3df112799 100644
--- a/services/dispatcherh_test.go
+++ b/services/dispatcherh_test.go
@@ -14,7 +14,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 package services
 
-/*
+import (
+	"reflect"
+	"sync"
+	"testing"
+
+	"github.com/cgrates/cgrates/config"
+	"github.com/cgrates/cgrates/cores"
+	"github.com/cgrates/cgrates/dispatcherh"
+	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
+	"github.com/cgrates/rpcclient"
+)
+
 //TestDispatcherCoverage for cover testing
 func TestDispatcherHCoverage(t *testing.T) {
 	cfg := config.NewDefaultCGRConfig()
@@ -73,4 +85,3 @@ func TestDispatcherHCoverage(t *testing.T) {
 		t.Errorf("Expected service to be down")
 	}
 }
-*/
diff --git a/services/dispatchers_test.go b/services/dispatchers_test.go
index 77cf09445..02dcfd12b 100644
--- a/services/dispatchers_test.go
+++ b/services/dispatchers_test.go
@@ -17,77 +17,74 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 package services
 
-/*
+import (
+	"sync"
+	"testing"
+
+	"github.com/cgrates/cgrates/dispatchers"
+
+	"github.com/cgrates/cgrates/config"
+	"github.com/cgrates/cgrates/cores"
+	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
+	"github.com/cgrates/rpcclient"
+)
+
 //TestDispatcherSCoverage for cover testing
 func TestDispatcherSCoverage(t *testing.T) {
 	cfg := config.NewDefaultCGRConfig()
-
-	utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID)
-	utils.Logger.SetLogLevel(7)
 	cfg.AttributeSCfg().Enabled = true
 	shdChan := utils.NewSyncedChan()
-	shdWg := new(sync.WaitGroup)
 	chS := engine.NewCacheS(cfg, nil, nil)
-	close(chS.GetPrecacheChannel(utils.CacheAttributeProfiles))
-	close(chS.GetPrecacheChannel(utils.CacheAttributeFilterIndexes))
-	close(chS.GetPrecacheChannel(utils.CacheDispatcherProfiles))
-	close(chS.GetPrecacheChannel(utils.CacheDispatcherHosts))
-	close(chS.GetPrecacheChannel(utils.CacheDispatcherFilterIndexes))
 	filterSChan := make(chan *engine.FilterS, 1)
 	filterSChan <- nil
 	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)
-	attrS := NewAttributeService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), anz, srvDep)
 	srv := NewDispatcherService(cfg, db, chS, filterSChan, server,
 		make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep)
-	engine.NewConnManager(cfg, nil)
-	srvMngr.AddServices(attrS, srv,
-		NewLoaderService(cfg, db, filterSChan, server,
-			make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep), db)
-	if err := srvMngr.StartServices(); err != nil {
-		t.Error(err)
-	}
 	if srv.IsRunning() {
 		t.Errorf("Expected service to be down")
 	}
-	if db.IsRunning() {
-		t.Errorf("Expected service to be down")
+	srv2 := DispatcherService{
+		RWMutex:     sync.RWMutex{},
+		cfg:         cfg,
+		dm:          db,
+		cacheS:      chS,
+		filterSChan: filterSChan,
+		server:      server,
+		connMgr:     nil,
+		connChan:    make(chan rpcclient.ClientConnector, 1),
+		anz:         anz,
+		srvDep:      srvDep,
 	}
-	var reply string
-	if err := cfg.V1ReloadConfig(&config.ReloadArgs{
-		Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "dispatchers", "dispatchers_mysql"),
-
-		Section: config.DispatcherSJson,
-	}, &reply); err != nil {
-		t.Error(err)
-	} else if reply != utils.OK {
-		t.Errorf("Expecting OK ,received %s", reply)
-	}
-	time.Sleep(10 * time.Millisecond) //need to switch to gorutine
-	if !srv.IsRunning() {
+	srv2.dspS = &dispatchers.DispatcherService{}
+	if !srv2.IsRunning() {
 		t.Errorf("Expected service to be running")
 	}
-	if !db.IsRunning() {
-		t.Errorf("Expected service to be running")
-	}
-	err := srv.Start()
+	err := srv2.Start()
 	if err == nil || err != utils.ErrServiceAlreadyRunning {
 		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
 	}
-	err = srv.Reload()
-	if err != nil {
-		t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
+	serviceName := srv2.ServiceName()
+	if serviceName != utils.DispatcherS {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.DispatcherS, serviceName)
 	}
-	cfg.DispatcherSCfg().Enabled = false
-	cfg.GetReloadChan(config.DispatcherSJson) <- struct{}{}
-	time.Sleep(10 * time.Millisecond)
-	if srv.IsRunning() {
+	shouldRun := srv2.ShouldRun()
+	if shouldRun != false {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", false, shouldRun)
+	}
+	rld := srv2.Reload()
+	if rld != nil {
+		t.Errorf("\nExpecting <nil>,\n Received <%+v>", rld)
+	}
+	srv2.connChan <- chS
+	shutErr := srv2.Shutdown()
+	if shutErr != nil {
+		t.Errorf("\nExpecting <nil>,\n Received <%+v>", shutErr)
+	}
+	if srv2.IsRunning() {
 		t.Errorf("Expected service to be down")
 	}
-	shdChan.CloseOnce()
-	time.Sleep(10 * time.Millisecond)
 }
-*/
diff --git a/services/dnsagent_test.go b/services/dnsagent_test.go
index 2cf4f7bfb..aa0e09cf3 100644
--- a/services/dnsagent_test.go
+++ b/services/dnsagent_test.go
@@ -17,70 +17,47 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 package services
 
-/*
+import (
+	"sync"
+	"testing"
+
+	"github.com/cgrates/cgrates/agents"
+	"github.com/cgrates/cgrates/config"
+	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
+	"github.com/cgrates/rpcclient"
+)
+
 //TestDNSAgentCoverage for cover testing
 func TestDNSAgentCoverage(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)
 	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_reload"),
-		Section: config.DNSAgentJson,
-	}, &reply); err != nil {
-		t.Fatal(err)
-	} else if reply != utils.OK {
-		t.Errorf("Expecting OK ,received %s", reply)
+	srv2 := DNSAgent{
+		cfg:         cfg,
+		filterSChan: filterSChan,
+		shdChan:     shdChan,
+		connMgr:     nil,
+		srvDep:      srvDep,
+		dns:         &agents.DNSAgent{},
 	}
 
-		time.Sleep(10 * time.Millisecond) //need to switch to gorutine
-		if !srv.IsRunning() {
-			t.Errorf("Expected service to be running")
-		}
-		err := srv.Start()
-		if err == nil || err != utils.ErrServiceAlreadyRunning {
-			t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
-		}
-		err = srv.Reload()
-		if err != nil {
-			t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
-		}
-		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)
+	if !srv2.IsRunning() {
+		t.Errorf("Expected service to be running")
+	}
+	err := srv2.Start()
+	if err == nil || err != utils.ErrServiceAlreadyRunning {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
+	}
 
 }
-*/