diff --git a/config/mailercfg_test.go b/config/mailercfg_test.go
index dfb848370..1c7643d4a 100644
--- a/config/mailercfg_test.go
+++ b/config/mailercfg_test.go
@@ -25,39 +25,24 @@ import (
 )
 
 func TestMailerCfgloadFromJsonCfg(t *testing.T) {
-	var mailcfg, expected MailerCfg
-	if err := mailcfg.loadFromJsonCfg(nil); err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(mailcfg, expected) {
-		t.Errorf("Expected: %+v ,recived: %+v", expected, mailcfg)
+	cfgJSON := &MailerJsonCfg{
+		Server:        utils.StringPointer("localhost"),
+		Auth_user:     utils.StringPointer("cgrates"),
+		Auth_password: utils.StringPointer("CGRateS.org"),
+		From_address:  utils.StringPointer("cgr-mailer@localhost.localdomain"),
 	}
-	if err := mailcfg.loadFromJsonCfg(new(MailerJsonCfg)); err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(mailcfg, expected) {
-		t.Errorf("Expected: %+v ,recived: %+v", expected, mailcfg)
-	}
-	cfgJSONStr := `{
-"mailer": {
-	"server": "localhost",								// the server to use when sending emails out
-	"auth_user": "cgrates",								// authenticate to email server using this user
-	"auth_password": "CGRateS.org",						// authenticate to email server with this password
-	"from_address": "cgr-mailer@localhost.localdomain"	// from address used when sending emails out
-	},
-}`
-	expected = MailerCfg{
+	expected := &MailerCfg{
 		MailerServer:   "localhost",
 		MailerAuthUser: "cgrates",
 		MailerAuthPass: "CGRateS.org",
 		MailerFromAddr: "cgr-mailer@localhost.localdomain",
 	}
-	if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil {
+	if jsnCfg, err := NewDefaultCGRConfig(); err != nil {
 		t.Error(err)
-	} else if jsnMailCfg, err := jsnCfg.MailerJsonCfg(); err != nil {
+	} else if err = jsnCfg.mailerCfg.loadFromJsonCfg(cfgJSON); err != nil {
 		t.Error(err)
-	} else if err = mailcfg.loadFromJsonCfg(jsnMailCfg); err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(expected, mailcfg) {
-		t.Errorf("Expected: %+v , recived: %+v", expected, mailcfg)
+	} else if !reflect.DeepEqual(expected, jsnCfg.mailerCfg) {
+		t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.mailerCfg))
 	}
 }
 
diff --git a/config/suretaxcfg_test.go b/config/suretaxcfg_test.go
index c2ca2b875..36d82792f 100644
--- a/config/suretaxcfg_test.go
+++ b/config/suretaxcfg_test.go
@@ -111,42 +111,6 @@ func TestSureTaxCfgloadFromJsonCfg(t *testing.T) {
 	}
 }
 
-func TestSureTaxCfgAsMapInterface(t *testing.T) {
-	eMap := map[string]interface{}{
-		utils.UrlCfg:                  utils.EmptyString,
-		utils.ClientNumberCfg:         utils.EmptyString,
-		utils.ValidationKeyCfg:        utils.EmptyString,
-		utils.BusinessUnitCfg:         utils.EmptyString,
-		utils.TimezoneCfg:             "Local",
-		utils.IncludeLocalCostCfg:     false,
-		utils.ReturnFileCodeCfg:       "0",
-		utils.ResponseGroupCfg:        "03",
-		utils.ResponseTypeCfg:         "D4",
-		utils.RegulatoryCodeCfg:       "03",
-		utils.ClientTrackingCfg:       "~*req.CGRID",
-		utils.CustomerNumberCfg:       "~*req.Subject",
-		utils.OrigNumberCfg:           "~*req.Subject",
-		utils.TermNumberCfg:           "~*req.Destination",
-		utils.BillToNumberCfg:         utils.EmptyString,
-		utils.ZipcodeCfg:              utils.EmptyString,
-		utils.Plus4Cfg:                utils.EmptyString,
-		utils.P2PZipcodeCfg:           utils.EmptyString,
-		utils.P2PPlus4Cfg:             utils.EmptyString,
-		utils.UnitsCfg:                "1",
-		utils.UnitTypeCfg:             "00",
-		utils.TaxIncludedCfg:          "0",
-		utils.TaxSitusRuleCfg:         "04",
-		utils.TransTypeCodeCfg:        "010101",
-		utils.SalesTypeCodeCfg:        "R",
-		utils.TaxExemptionCodeListCfg: utils.EmptyString,
-	}
-	if cgrCfg, err := NewDefaultCGRConfig(); err != nil {
-		t.Error(err)
-	} else if rcv := cgrCfg.sureTaxCfg.AsMapInterface(cgrCfg.generalCfg.RSRSep); !reflect.DeepEqual(rcv, eMap) {
-		t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(eMap), utils.ToJSON(rcv))
-	}
-}
-
 func TestSureTaxCfgAsMapInterface1(t *testing.T) {
 	cfgJSONStr := `{
 	"suretax": {