diff --git a/registrarc/libregistrarc_test.go b/registrarc/libregistrarc_test.go
index 4a0d0aaf8..0baf10854 100644
--- a/registrarc/libregistrarc_test.go
+++ b/registrarc/libregistrarc_test.go
@@ -352,3 +352,61 @@ func TestRegistrar(t *testing.T) {
 
 	Registrar(new(errRecorder), req)
 }
+
+func TestLibRegistrarcRegister(t *testing.T) {
+	req := &http.Request{
+		Method:           "",
+		URL:              nil,
+		Proto:            "",
+		ProtoMajor:       0,
+		ProtoMinor:       0,
+		Header:           nil,
+		Body:             http.NoBody,
+		GetBody:          nil,
+		ContentLength:    0,
+		TransferEncoding: nil,
+		Close:            false,
+		Host:             "",
+		Form:             nil,
+		PostForm:         nil,
+		MultipartForm:    nil,
+		Trailer:          nil,
+		RemoteAddr:       "",
+		RequestURI:       "",
+		TLS:              nil,
+		Cancel:           nil,
+		Response:         nil,
+	}
+	result, err := register(req)
+	expected := &json.RawMessage{}
+	if reflect.DeepEqual(result, expected) {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", expected, result)
+	}
+	if err == nil || err.Error() != "EOF" {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", "EOF", err)
+	}
+}
+
+func TestGetConnPortHTTPJson(t *testing.T) {
+	cfg := config.NewDefaultCGRConfig()
+	expected := "2014"
+	result, err := getConnPort(cfg, rpcclient.BiRPCJSON, false)
+	if !reflect.DeepEqual(result, expected) {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", expected, result)
+	}
+	if err != nil {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", nil, err)
+	}
+}
+
+func TestGetConnPortBiRPCGOB(t *testing.T) {
+	cfg := config.NewDefaultCGRConfig()
+	expected := ""
+	result, err := getConnPort(cfg, rpcclient.BiRPCGOB, false)
+	if !reflect.DeepEqual(result, expected) {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", expected, result)
+	}
+	if err == nil || err.Error() != "missing port in address" {
+		t.Errorf("\nExpecting <%+v>,\n Received <%+v>", "missing port in address", err)
+	}
+}
diff --git a/registrarc/registrarc_it_test.go b/registrarc/registrarc_it_test.go
index 4f9f0a154..5cb2219fb 100644
--- a/registrarc/registrarc_it_test.go
+++ b/registrarc/registrarc_it_test.go
@@ -184,3 +184,38 @@ func testDsphStopDispatcher(t *testing.T) {
 		t.Error(err)
 	}
 }
+
+func TestRegistrarcListenAndServe(t *testing.T) {
+	//cover purposes only
+	cfg := config.NewDefaultCGRConfig()
+	cfg.RegistrarCCfg().Dispatcher.Enabled = true
+	cfg.RegistrarCCfg().RPC.Enabled = true
+	regStSrv := NewRegistrarCService(cfg, nil)
+	stopChan := make(chan struct{}, 1)
+	rldChan := make(chan struct{}, 1)
+	rldChan <- struct{}{}
+	go func() {
+		time.Sleep(10 * time.Millisecond)
+		close(stopChan)
+	}()
+	regStSrv.ListenAndServe(stopChan, rldChan)
+	regStSrv.Shutdown()
+}
+
+func TestRegistrarcregisterRPCHostsErr(t *testing.T) {
+	cfg := config.NewDefaultCGRConfig()
+	cfg.RegistrarCCfg().RPC.RegistrarSConns = []string{"testConnID"}
+	cfg.RegistrarCCfg().RPC.Hosts = map[string][]*config.RemoteHost{
+		utils.MetaDefault: {
+			{
+				ID:          "",
+				Address:     "",
+				Transport:   "",
+				Synchronous: false,
+				TLS:         false,
+			},
+		},
+	}
+	regStSrv := NewRegistrarCService(cfg, nil)
+	regStSrv.registerRPCHosts()
+}
diff --git a/registrarc/registrarc_test.go b/registrarc/registrarc_test.go
index 5000ad147..ab7ce0d5e 100644
--- a/registrarc/registrarc_test.go
+++ b/registrarc/registrarc_test.go
@@ -123,29 +123,3 @@ func TestDispatcherHostsService(t *testing.T) {
 	close(stopChan)
 	ds.ListenAndServe(stopChan, make(chan struct{}))
 }
-
-func TestRegistrarcListenAndServe(t *testing.T) {
-	//cover purposes only
-	cfg := config.NewDefaultCGRConfig()
-	cfg.RegistrarCCfg().Dispatcher.Enabled = true
-	cfg.RegistrarCCfg().RPC.Enabled = true
-	regStSrv := NewRegistrarCService(cfg, nil)
-	stopChan := make(chan struct{}, 1)
-	rldChan := make(chan struct{}, 1)
-	rldChan <- struct{}{}
-	go func() {
-		time.Sleep(10 * time.Millisecond)
-		close(stopChan)
-	}()
-	regStSrv.ListenAndServe(stopChan, rldChan)
-
-}
-
-func TestRegistrarcShutdown(t *testing.T) {
-	//cover purposes only
-	cfg := config.NewDefaultCGRConfig()
-	cfg.RegistrarCCfg().Dispatcher.Enabled = true
-	cfg.RegistrarCCfg().RPC.Enabled = true
-	regStSrv := NewRegistrarCService(cfg, nil)
-	regStSrv.Shutdown()
-}