diff --git a/engine/datamanager_test.go b/engine/datamanager_test.go
index d62044054..f82aaffb9 100644
--- a/engine/datamanager_test.go
+++ b/engine/datamanager_test.go
@@ -3397,65 +3397,77 @@ func TestDMRatingProfile(t *testing.T) {
 	}
 }
 
-// func TestUpdateFilterDispatcherIndex(t *testing.T) {
-// 	tmp := Cache
-// 	tmpDm := dm
-// 	defer func() {
-// 		Cache = tmp
-// 		dm = tmpDm
-// 		config.SetCgrConfig(config.NewDefaultCGRConfig())
-// 	}()
-// 	Cache.Clear(nil)
-// 	cfg := config.NewDefaultCGRConfig()
-// 	dataDB := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
-// 	dm := NewDataManager(dataDB, cfg.CacheCfg(), nil)
-// 	oldFlt := &Filter{
-// 		Tenant: "cgrates.org",
-// 		ID:     "DISPATCHER_FLTR1",
-// 		Rules:  []*FilterRule{{Type: utils.MetaString, Element: "~*req.Destination", Values: []string{"ACC1", "ACC2", "~*req.Account"}}},
-// 	}
-// 	if err := oldFlt.Compile(); err != nil {
-// 		t.Error(err)
-// 	}
-// 	if err := dm.SetFilter(oldFlt, true); err != nil {
-// 		t.Error(err)
-// 	}
+func TestUpdateFilterDispatcherIndex(t *testing.T) {
+	tmp := Cache
+	tmpDm := dm
+	defer func() {
+		Cache = tmp
+		dm = tmpDm
+		config.SetCgrConfig(config.NewDefaultCGRConfig())
+	}()
+	Cache.Clear(nil)
+	cfg := config.NewDefaultCGRConfig()
+	dataDB := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
+	dm := NewDataManager(dataDB, cfg.CacheCfg(), nil)
+	oldFlt := &Filter{
+		Tenant: "cgrates.org",
+		ID:     "DISPATCHER_FLTR1",
+		Rules:  []*FilterRule{{Type: utils.MetaString, Element: "~*req.Destination", Values: []string{"ACC1", "ACC2", "~*req.Account"}}},
+	}
+	if err := oldFlt.Compile(); err != nil {
+		t.Error(err)
+	}
+	if err := dm.SetFilter(oldFlt, true); err != nil {
+		t.Error(err)
+	}
+	disp := &DispatcherProfile{
+		Tenant:     "cgrates.org",
+		ID:         "Dsp",
+		Subsystems: []string{"*any"},
+		FilterIDs:  []string{"DISPATCHER_FLTR1"},
+		Strategy:   utils.MetaFirst,
+		ActivationInterval: &utils.ActivationInterval{
+			ActivationTime: time.Date(2014, 7, 14, 14, 35, 0, 0, time.UTC),
+		},
+		StrategyParams: map[string]interface{}{},
+		Weight:         20,
+	}
+	if err := dm.SetDispatcherProfile(disp, true); err != nil {
+		t.Error(err)
+	}
 
-// 	disp := &DispatcherProfile{
-// 		Tenant:     "cgrates.org",
-// 		ID:         "Dsp",
-// 		Subsystems: []string{"*any"},
-// 		FilterIDs:  []string{"DISPATCHER_FLTR1"},
-// 		Strategy:   utils.MetaFirst,
-// 		ActivationInterval: &utils.ActivationInterval{
-// 			ActivationTime: time.Date(2014, 7, 14, 14, 35, 0, 0, time.UTC),
-// 		},
-// 		StrategyParams: map[string]interface{}{},
-// 		Weight:         20,
-// 		Hosts: DispatcherHostProfiles{
-// 			&DispatcherHostProfile{
-// 				ID:        "C1",
-// 				FilterIDs: []string{},
-// 				Weight:    10,
-// 				Params:    map[string]interface{}{"0": "192.168.54.203", utils.MetaRatio: "2"},
-// 				Blocker:   false,
-// 			},
-// 		},
-// 	}
-// 	if err := dm.SetDispatcherProfile(disp, true); err != nil {
-// 		t.Error(err)
-// 	}
-
-// 	expindx := map[string]utils.StringSet{
-// 		"*string:*req.Destination": {"Dsp": {}},
-// 	}
-// 	if getidx, err := dm.GetIndexes(utils.CacheDispatcherFilterIndexes, "cgrates.org", utils.EmptyString, true, true); err != nil {
-// 		t.Error(err)
-// 	} else if !reflect.DeepEqual(expindx, getidx) {
-// 		t.Errorf("Expected %v, Received %v", utils.ToJSON(expindx), utils.ToJSON(getidx))
-// 	}
-
-// }
+	exp := map[string]utils.StringSet{
+		"*string:*req.Destination:ACC1": {"Dsp": {}},
+		"*string:*req.Destination:ACC2": {"Dsp": {}},
+	}
+	if indx, err := dm.GetIndexes(utils.CacheDispatcherFilterIndexes, "cgrates.org:*any", utils.EmptyString, true, true); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(exp, indx) {
+		t.Errorf("Expected %v, Received %v", utils.ToJSON(exp), utils.ToJSON(indx))
+	}
+	newFlt := &Filter{
+		Tenant: "cgrates.org",
+		ID:     "DISPATCHER_FLTR1",
+		Rules: []*FilterRule{{
+			Type:    utils.MetaString,
+			Element: "~*req.Charger",
+			Values:  []string{"ChargerProfile2"}}},
+	}
+	if err := newFlt.Compile(); err != nil {
+		t.Error(err)
+	}
+	if err := dm.SetFilter(newFlt, true); err != nil {
+		t.Error(err)
+	}
+	exp = map[string]utils.StringSet{
+		"*string:*req.Charger:ChargerProfile2": {"Dsp": {}},
+	}
+	if indx, err := dm.GetIndexes(utils.CacheDispatcherFilterIndexes, "cgrates.org:*any", utils.EmptyString, true, true); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(exp, indx) {
+		t.Errorf("Expected %v, Received %v", utils.ToJSON(exp), utils.ToJSON(indx))
+	}
+}
 
 func TestDMGetRatingPlan(t *testing.T) {
 	cfg := config.NewDefaultCGRConfig()
@@ -3678,6 +3690,8 @@ func TestDMGetRouteProfile(t *testing.T) {
 	}()
 	Cache.Clear(nil)
 	cfg.DataDbCfg().RmtConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1)}
+	cfg.CacheCfg().Partitions[utils.CacheRouteProfiles].Replicate = true
+	cfg.CacheCfg().ReplicationConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}
 	cfg.DataDbCfg().Items = map[string]*config.ItemOpt{
 		utils.CacheRouteProfiles: {
 			Limit:     3,
@@ -3711,11 +3725,15 @@ func TestDMGetRouteProfile(t *testing.T) {
 				*reply.(**RouteProfile) = rpL
 				return nil
 			},
+			utils.CacheSv1ReplicateSet: func(args, reply interface{}) error {
+				return errors.New("Can't Replicate")
+			},
 		},
 	}
 	db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
 	connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{
 		utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn,
+		utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches):    clientConn,
 	})
 	dm := NewDataManager(db, cfg.CacheCfg(), connMgr)
 	config.SetCgrConfig(cfg)
@@ -3725,8 +3743,68 @@ func TestDMGetRouteProfile(t *testing.T) {
 	} else if !reflect.DeepEqual(val, rpL) {
 		t.Errorf("expected %v,received %v", utils.ToJSON(rpL), utils.ToJSON(val))
 	}
+	Cache = NewCacheS(cfg, dm, nil)
+	SetConnManager(connMgr)
+	if _, err := dm.GetRouteProfile(rpL.Tenant, rpL.ID, false, true, utils.NonTransactional); err == nil {
+		t.Error(err)
+	}
 }
+func TestDMGetRouteProfileErr(t *testing.T) {
+	cfg := config.NewDefaultCGRConfig()
+	tmpDm := dm
+	tmp := Cache
+	defer func() {
+		config.SetCgrConfig(config.NewDefaultCGRConfig())
+		Cache = tmp
+		SetDataStorage(tmpDm)
+	}()
+	Cache.Clear(nil)
+	cfg.DataDbCfg().RmtConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1)}
+	cfg.CacheCfg().Partitions[utils.CacheRouteProfiles].Replicate = true
+	cfg.CacheCfg().ReplicationConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}
+	cfg.DataDbCfg().Items = map[string]*config.ItemOpt{
+		utils.CacheRouteProfiles: {
+			Limit:     3,
+			Remote:    true,
+			APIKey:    "key",
+			RouteID:   "route",
+			Replicate: true,
+		},
+	}
+	clientConn := make(chan rpcclient.ClientConnector, 1)
+	clientConn <- &ccMock{
+		calls: map[string]func(args interface{}, reply interface{}) error{
+			utils.ReplicatorSv1GetRouteProfile: func(args, reply interface{}) error {
+				return utils.ErrNotFound
+			},
+			utils.CacheSv1ReplicateSet: func(args, reply interface{}) error {
+				return errors.New("Can't Replicate")
+			},
+		},
+	}
+	db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
+	connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{
+		utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn,
+		utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches):    clientConn,
+	})
+	dm := NewDataManager(db, cfg.CacheCfg(), connMgr)
+	config.SetCgrConfig(cfg)
+	SetDataStorage(dm)
+	Cache = NewCacheS(cfg, dm, nil)
+	SetConnManager(connMgr)
+	if _, err := dm.GetRouteProfile("cgrates.org", "id", false, true, utils.NonTransactional); err == nil || err.Error() != "Can't Replicate" {
+		t.Error(err)
+	}
+	Cache.Set(utils.CacheRouteProfiles, "cgrates.org:id", nil, []string{}, false, utils.NonTransactional)
+	if _, err := dm.GetRouteProfile("cgrates.org", "id", true, true, utils.NonTransactional); err == nil || err != utils.ErrNotFound {
+		t.Error(err)
+	}
+	var dm2 *DataManager
+	if _, err := dm2.GetRouteProfile("cgrates.org", "id", false, true, utils.NonTransactional); err == nil || err != utils.ErrNoDatabaseConn {
+		t.Error(err)
+	}
 
+}
 func TestUpdateFilterIndexStatErr1(t *testing.T) {
 	tmp := Cache
 	defer func() {
@@ -4023,3 +4101,63 @@ func TestUpdateFilterChargersIndexErr(t *testing.T) {
 		t.Errorf("Expected error <%v>, Received error <%v>", utils.ErrNotImplemented, err)
 	}
 }
+
+func TestDmIndexes(t *testing.T) {
+	cfg := config.NewDefaultCGRConfig()
+	defer func() {
+		config.SetCgrConfig(config.NewDefaultCGRConfig())
+	}()
+	cfg.DataDbCfg().Items = map[string]*config.ItemOpt{
+		utils.CacheResourceFilterIndexes: {
+			Replicate: true,
+		},
+	}
+	cfg.DataDbCfg().RplConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaReplicator)}
+	clientConn := make(chan rpcclient.ClientConnector, 1)
+	clientConn <- &ccMock{
+		calls: map[string]func(args interface{}, reply interface{}) error{
+			utils.ReplicatorSv1SetIndexes: func(args, reply interface{}) error {
+				setcastIndxArg, cancast := args.(*utils.SetIndexesArg)
+				if !cancast {
+					return utils.ErrNotConvertible
+				}
+				dm.DataDB().SetIndexesDrv(setcastIndxArg.IdxItmType, setcastIndxArg.TntCtx, setcastIndxArg.Indexes, true, utils.NonTransactional)
+				return nil
+			},
+			utils.ReplicatorSv1RemoveIndexes: func(args, reply interface{}) error {
+				gIdxArg, cancast := args.(*utils.GetIndexesArg)
+				if !cancast {
+					return utils.ErrNotConvertible
+				}
+				dm.DataDB().RemoveIndexesDrv(gIdxArg.IdxItmType, gIdxArg.Tenant, utils.EmptyString)
+				return nil
+			},
+		},
+	}
+	connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{
+		utils.ConcatenatedKey(utils.MetaInternal, utils.MetaReplicator): clientConn,
+	})
+	db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
+	dm := NewDataManager(db, cfg.CacheCfg(), connMgr)
+	idxes := map[string]utils.StringSet{
+		"*string:Account:1001": {
+			"RL1": struct{}{},
+		},
+		"*string:Account:1002": {
+			"RL1": struct{}{},
+			"RL2": struct{}{},
+		},
+		utils.ConcatenatedKey(utils.MetaNone, utils.MetaAny, utils.MetaAny): {
+			"RL4": struct{}{},
+			"RL5": struct{}{},
+		},
+	}
+	config.SetCgrConfig(cfg)
+	if err := dm.SetIndexes(utils.CacheResourceFilterIndexes,
+		"cgrates.org", idxes, false, utils.NonTransactional); err != nil {
+		t.Error(err)
+	}
+	if err := dm.RemoveIndexes(utils.CacheResourceFilterIndexes, "cgrates.org", utils.EmptyString); err != nil {
+		t.Error(err)
+	}
+}
diff --git a/engine/dynamicdp_test.go b/engine/dynamicdp_test.go
index 73e32a291..bb4b57f85 100644
--- a/engine/dynamicdp_test.go
+++ b/engine/dynamicdp_test.go
@@ -21,6 +21,7 @@ import (
 	"bytes"
 	"log"
 	"os"
+	"reflect"
 	"strings"
 	"testing"
 
@@ -181,3 +182,91 @@ func TestDDPFieldAsInterface(t *testing.T) {
 		t.Errorf("Logger %v doesn't contain %v", rcvLog, expLog)
 	}
 }
+func TestLibphonenumberDPString(t *testing.T) {
+	pInt := int32(2)
+	LDP := &libphonenumberDP{
+		pNumber: &phonenumbers.PhoneNumber{
+			CountryCode: &pInt,
+		},
+	}
+	exp2 := "country_code:2 "
+	rcv2 := LDP.String()
+	if !reflect.DeepEqual(rcv2, exp2) {
+		t.Errorf("expected: <%+v>, \nreceived: <%+v>",
+			utils.ToJSON(exp2), utils.ToJSON(rcv2))
+	}
+}
+
+func TestLibphonenumberDPFieldAsString(t *testing.T) {
+	pInt := int32(2)
+	LDP := &libphonenumberDP{
+		pNumber: &phonenumbers.PhoneNumber{
+			CountryCode: &pInt,
+		},
+		cache: utils.MapStorage{
+			"testField": "testValue",
+		},
+	}
+	exp2 := "testValue"
+	rcv2, err := LDP.FieldAsString([]string{"testField"})
+	if err != nil {
+		t.Error(err)
+	}
+	if !reflect.DeepEqual(rcv2, exp2) {
+		t.Errorf("expected: <%+v>, received: <%+v>",
+			utils.ToJSON(exp2), utils.ToJSON(rcv2))
+	}
+}
+
+func TestLibphonenumberDPFieldAsStringError(t *testing.T) {
+	var pInt int32 = 2
+	LDP := &libphonenumberDP{
+		pNumber: &phonenumbers.PhoneNumber{
+			CountryCode: &pInt,
+		},
+		cache: utils.MapStorage{
+			"testField": "testValue",
+		},
+	}
+	_, err := LDP.FieldAsString([]string{"testField", "testField2"})
+	if err == nil || err.Error() != "WRONG_PATH" {
+		t.Errorf("expected: <%v>, received: <%v>",
+			"WRONG_PATH", err)
+	}
+}
+
+func TestLibphonenumberDPFieldAsInterfaceLen0(t *testing.T) {
+	pInt := int32(2)
+	LDP := &libphonenumberDP{
+		pNumber: &phonenumbers.PhoneNumber{
+			CountryCode: &pInt,
+		},
+		cache: utils.MapStorage{
+			"testField": "testValue",
+		},
+	}
+	exp2 := &libphonenumberDP{
+		pNumber: &phonenumbers.PhoneNumber{
+			CountryCode: &pInt,
+		},
+		cache: utils.MapStorage{
+			"testField": "testValue",
+		}}
+	exp2.setDefaultFields()
+
+	rcv2, err := LDP.FieldAsInterface([]string{})
+	if err != nil {
+		t.Error(err)
+	}
+	if !reflect.DeepEqual(rcv2, exp2.cache) {
+		t.Errorf("expected: %+v, received: %+v",
+			exp2.cache, rcv2)
+	}
+}
+
+func TestNewLibPhoneNumberDPErr(t *testing.T) {
+	num := "errNum"
+	if _, err := newLibPhoneNumberDP(num); err != phonenumbers.ErrNotANumber {
+		t.Error(err)
+	}
+}
diff --git a/engine/tpreader_test.go b/engine/tpreader_test.go
index 40f23c5c0..82a346153 100644
--- a/engine/tpreader_test.go
+++ b/engine/tpreader_test.go
@@ -1969,6 +1969,21 @@ func TestLoadRatingPlansFiltered(t *testing.T) {
 	if _, err := tpr.LoadRatingPlansFiltered("def"); err == nil {
 		t.Error(err)
 	}
-	db.db.Remove(utils.CacheTBLTPRates, "*prf:TEST_RATE12", true, utils.NonTransactional)
-
 }
+
+// func TestLoadRatingProfilesErr(t *testing.T) {
+// 	cfg := config.NewDefaultCGRConfig()
+// 	defer func() {
+// 		config.SetCgrConfig(config.NewDefaultCGRConfig())
+// 	}()
+// 	db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
+// 	_ = NewDataManager(db, cfg.CacheCfg(), nil)
+
+// 	tpr, err := NewTpReader(db, db, utils.EmptyString, cfg.GeneralCfg().DefaultTimezone, nil, nil, true)
+// 	if err != nil {
+// 		t.Error(err)
+// 	}
+// 	if err := tpr.LoadRatingProfiles(); err != nil {
+// 		t.Error(err)
+// 	}
+// }