diff --git a/config/config_json_test.go b/config/config_json_test.go
index c28e361c9..62eb24522 100644
--- a/config/config_json_test.go
+++ b/config/config_json_test.go
@@ -120,7 +120,7 @@ func TestDfListenJsonCfg(t *testing.T) {
 	}
 }
 
-func TestDfDbJsonCfg(t *testing.T) {
+func TestDfDataDbJsonCfg(t *testing.T) {
 	eCfg := &DbJsonCfg{
 		Db_type:           utils.StringPointer("redis"),
 		Db_host:           utils.StringPointer("127.0.0.1"),
@@ -135,7 +135,10 @@ func TestDfDbJsonCfg(t *testing.T) {
 	} else if !reflect.DeepEqual(eCfg, cfg) {
 		t.Error("Received: ", cfg)
 	}
-	eCfg = &DbJsonCfg{
+}
+
+func TestDfStorDBJsonCfg(t *testing.T) {
+	eCfg := &DbJsonCfg{
 		Db_type:           utils.StringPointer("mysql"),
 		Db_host:           utils.StringPointer("127.0.0.1"),
 		Db_port:           utils.IntPointer(3306),
@@ -768,3 +771,16 @@ func TestNewCgrJsonCfgFromFile(t *testing.T) {
 		t.Error("Received: ", smFsCfg)
 	}
 }
+
+func TestDfHttpJsonCfg(t *testing.T) {
+	eCfg := &HTTPJsonCfg{
+		Json_rpc_url:   utils.StringPointer("/jsonrpc"),
+		Ws_url:         utils.StringPointer("/ws"),
+		Use_basic_auth: utils.BoolPointer(false),
+		Auth_users:     utils.MapStringStringPointer(map[string]string{})}
+	if cfg, err := dfCgrJsonCfg.HttpJsonCfg(); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(eCfg, cfg) {
+		t.Error("Received: ", cfg)
+	}
+}
diff --git a/config/config_test.go b/config/config_test.go
index a787750ee..e9a9aa852 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -674,3 +674,67 @@ func TestCgrCfgJSONDefaultsSureTax(t *testing.T) {
 		t.Errorf("received: %+v, expecting: %+v", cgrCfg.sureTaxCfg, eSureTaxCfg)
 	}
 }
+
+func TestCgrCfgJSONDefaultsHTTP(t *testing.T) {
+	if cgrCfg.HTTPJsonRPCURL != "/jsonrpc" {
+		t.Error(cgrCfg.HTTPJsonRPCURL)
+	}
+	if cgrCfg.HTTPWSURL != "/ws" {
+		t.Error(cgrCfg.HTTPWSURL)
+	}
+	if cgrCfg.HTTPUseBasicAuth != false {
+		t.Error(cgrCfg.HTTPUseBasicAuth)
+	}
+	if !reflect.DeepEqual(cgrCfg.HTTPAuthUsers, map[string]string{}) {
+		t.Error(cgrCfg.HTTPAuthUsers)
+	}
+}
+
+func TestRadiusAgentCfg(t *testing.T) {
+	testRA := &RadiusAgentCfg{
+		Enabled:            false,
+		ListenNet:          "udp",
+		ListenAuth:         "127.0.0.1:1812",
+		ListenAcct:         "127.0.0.1:1813",
+		ClientSecrets:      map[string]string{utils.META_DEFAULT: "CGRateS.org"},
+		ClientDictionaries: map[string]string{utils.META_DEFAULT: "/usr/share/cgrates/radius/dict/"},
+		SMGenericConns:     []*HaPoolConfig{&HaPoolConfig{Address: utils.MetaInternal}},
+		CreateCDR:          true,
+		CDRRequiresSession: false,
+		Timezone:           "",
+		RequestProcessors:  nil,
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.Enabled, testRA.Enabled) {
+		t.Errorf("expecting: %+v, received: %+v", cgrCfg.radiusAgentCfg.Enabled, testRA.Enabled)
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.ListenNet, testRA.ListenNet) {
+		t.Errorf("expecting: %+v, received: %+v", cgrCfg.radiusAgentCfg.ListenNet, testRA.ListenNet)
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.ListenAuth, testRA.ListenAuth) {
+		t.Errorf("expecting: %+v, received: %+v", cgrCfg.radiusAgentCfg.ListenAuth, testRA.ListenAuth)
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.ListenAcct, testRA.ListenAcct) {
+		t.Errorf("expecting: %+v, received: %+v", cgrCfg.radiusAgentCfg.ListenAcct, testRA.ListenAcct)
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.ClientSecrets, testRA.ClientSecrets) {
+		t.Errorf("expecting: %+v, received: %+v", cgrCfg.radiusAgentCfg.ClientSecrets, testRA.ClientSecrets)
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.ClientDictionaries, testRA.ClientDictionaries) {
+		t.Errorf("expecting: %+v, received: %+v", cgrCfg.radiusAgentCfg.ClientDictionaries, testRA.ClientDictionaries)
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.SMGenericConns, testRA.SMGenericConns) {
+		t.Errorf("expecting: %+v, received: %+v", cgrCfg.radiusAgentCfg.SMGenericConns, testRA.SMGenericConns)
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.CreateCDR, testRA.CreateCDR) {
+		t.Errorf("received: %+v, expecting: %+v", cgrCfg.radiusAgentCfg.CreateCDR, testRA.CreateCDR)
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.CDRRequiresSession, testRA.CDRRequiresSession) {
+		t.Errorf("received: %+v, expecting: %+v", cgrCfg.radiusAgentCfg.CDRRequiresSession, testRA.CDRRequiresSession)
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.Timezone, testRA.Timezone) {
+		t.Errorf("received: %+v, expecting: %+v", cgrCfg.radiusAgentCfg.Timezone, testRA.Timezone)
+	}
+	if !reflect.DeepEqual(cgrCfg.radiusAgentCfg.RequestProcessors, testRA.RequestProcessors) {
+		t.Errorf("received: %+v, expecting: %+v", cgrCfg.radiusAgentCfg.RequestProcessors, testRA.RequestProcessors)
+	}
+}
diff --git a/engine/onstor_it_test.go b/engine/onstor_it_test.go
index ee1bcb181..abf4e1e4c 100644
--- a/engine/onstor_it_test.go
+++ b/engine/onstor_it_test.go
@@ -1123,13 +1123,13 @@ func testOnStorITCRUDLCR(t *testing.T) {
 func testOnStorITCRUDCdrStats(t *testing.T) {
 	cdrs := &CdrStats{Metrics: []string{ASR, PDD, ACD, TCD, ACC, TCC, DDC}}
 
-	if _, rcvErr := onStor.GetCdrStats(utils.NonTransactional); rcvErr != utils.ErrNotFound {
+	if _, rcvErr := onStor.GetCdrStats(""); rcvErr != utils.ErrNotFound {
 		t.Error(rcvErr)
 	}
 	if err := onStor.SetCdrStats(cdrs); err != nil {
 		t.Error(err)
 	}
-	if rcv, err := onStor.GetCdrStats(utils.NonTransactional); err != nil {
+	if rcv, err := onStor.GetCdrStats(""); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(cdrs.Metrics, rcv.Metrics) {
 		t.Errorf("Expecting: %v, received: %v", cdrs.Metrics, rcv.Metrics)