diff --git a/cores/core_test.go b/cores/core_test.go
index dcd53c94e..2df9d1e49 100644
--- a/cores/core_test.go
+++ b/cores/core_test.go
@@ -22,6 +22,7 @@ import (
 	"reflect"
 	"runtime"
 	"testing"
+	"time"
 
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/engine"
@@ -30,7 +31,7 @@ import (
 
 func TestNewCoreService(t *testing.T) {
 	cfgDflt := config.NewDefaultCGRConfig()
-	cfgDflt.CoreSCfg().CapsStatsInterval = 1
+	cfgDflt.CoreSCfg().CapsStatsInterval = time.Second
 	stopchan := make(chan struct{}, 1)
 	caps := engine.NewCaps(1, utils.MetaBusy)
 	sts := engine.NewCapsStats(cfgDflt.CoreSCfg().CapsStatsInterval, caps, stopchan)
@@ -43,7 +44,7 @@ func TestNewCoreService(t *testing.T) {
 	if !reflect.DeepEqual(expected, rcv) {
 		t.Errorf("Expected %+v, received %+v", utils.ToJSON(expected), utils.ToJSON(rcv))
 	}
-
+	close(stopchan)
 	//shut down the service
 	rcv.Shutdown()
 }
diff --git a/registrarc/libregistrarc_test.go b/registrarc/libregistrarc_test.go
index 0baf10854..afd673d86 100644
--- a/registrarc/libregistrarc_test.go
+++ b/registrarc/libregistrarc_test.go
@@ -291,7 +291,37 @@ func TestRegister(t *testing.T) {
 	if _, err := register(req); err == nil {
 		t.Errorf("Expected error,received: nil")
 	}
-
+	args2 = utils.NewServerRequest(utils.DispatcherSv1GetProfileForEvent, id, id)
+	args2JSON, err = json.Marshal(args2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	req.Body = ioutil.NopCloser(bytes.NewBuffer(args2JSON))
+	if _, err := register(req); err == nil {
+		t.Errorf("Expected error,received: nil")
+	}
+	req.Body = ioutil.NopCloser(bytes.NewBuffer(argsJSON))
+	if _, err := register(req); err == nil {
+		t.Errorf("Expected error,received: nil")
+	}
+	args2 = utils.NewServerRequest(utils.RegistrarSv1RegisterRPCHosts, id, id)
+	args2JSON, err = json.Marshal(args2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	req.Body = ioutil.NopCloser(bytes.NewBuffer(args2JSON))
+	if _, err := register(req); err == nil {
+		t.Errorf("Expected error,received: nil")
+	}
+	args2 = utils.NewServerRequest(utils.RegistrarSv1UnregisterRPCHosts, id, id)
+	args2JSON, err = json.Marshal(args2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	req.Body = ioutil.NopCloser(bytes.NewBuffer(args2JSON))
+	if _, err := register(req); err == nil {
+		t.Errorf("Expected error,received: nil")
+	}
 	engine.SetCache(engine.NewCacheS(config.CgrConfig(), nil, nil))
 }
 
@@ -410,3 +440,88 @@ func TestGetConnPortBiRPCGOB(t *testing.T) {
 		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", "missing port in address", err)
 	}
 }
+
+func TestRegisterRegistrarSv1UnregisterRPCHosts(t *testing.T) {
+	ra := &RegisterArgs{
+		Tenant: "cgrates.org",
+		Hosts: []*RegisterHostCfg{
+			{
+				ID:        "Host1",
+				Port:      "2012",
+				TLS:       true,
+				Transport: utils.MetaJSON,
+			},
+			{
+				ID:        "Host2",
+				Port:      "2013",
+				TLS:       false,
+				Transport: utils.MetaGOB,
+			},
+		},
+		Opts: make(map[string]interface{}),
+	}
+	raJSON, err := json.Marshal([]interface{}{ra})
+	id := json.RawMessage("1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	args := utils.NewServerRequest(utils.RegistrarSv1UnregisterRPCHosts, raJSON, id)
+	argsJSON, err := json.Marshal(args)
+	if err != nil {
+		t.Fatal(err)
+	}
+	req, err := http.NewRequest(http.MethodPost, "http://127.0.0.1:2080/json_rpc", bytes.NewBuffer(argsJSON))
+	if err != nil {
+		t.Fatal(err)
+	}
+	req.RemoteAddr = "127.0.0.1:2356"
+	engine.SetCache(engine.NewCacheS(config.CgrConfig(), nil, nil))
+	if rplyID, err := register(req); err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(id, *rplyID) {
+		t.Errorf("Expected: %q ,received: %q", string(id), string(*rplyID))
+	}
+}
+
+func TestRegisterRegistrarSv1RegisterRPCHosts(t *testing.T) {
+	ra := &RegisterArgs{
+		Tenant: "cgrates.org",
+		Hosts: []*RegisterHostCfg{
+			{
+				ID:        "Host1",
+				Port:      "2012",
+				TLS:       true,
+				Transport: utils.MetaJSON,
+			},
+			{
+				ID:        "Host2",
+				Port:      "2013",
+				TLS:       false,
+				Transport: utils.MetaGOB,
+			},
+		},
+		Opts: make(map[string]interface{}),
+	}
+	raJSON, err := json.Marshal([]interface{}{ra})
+	id := json.RawMessage("1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	args := utils.NewServerRequest(utils.RegistrarSv1RegisterRPCHosts, raJSON, id)
+	argsJSON, err := json.Marshal(args)
+	if err != nil {
+		t.Fatal(err)
+	}
+	req, err := http.NewRequest(http.MethodPost, "http://127.0.0.1:2080/json_rpc", bytes.NewBuffer(argsJSON))
+	if err != nil {
+		t.Fatal(err)
+	}
+	req.RemoteAddr = "127.0.0.1:2356"
+	engine.SetCache(engine.NewCacheS(config.CgrConfig(), nil, nil))
+	if rplyID, err := register(req); err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(id, *rplyID) {
+		t.Errorf("Expected: %q ,received: %q", string(id), string(*rplyID))
+	}
+	engine.SetCache(engine.NewCacheS(config.CgrConfig(), nil, nil))
+}