diff --git a/apier/v1/tpactions_it_test.go b/apier/v1/tpactions_it_test.go
index 2122059a5..b7a9b931e 100644
--- a/apier/v1/tpactions_it_test.go
+++ b/apier/v1/tpactions_it_test.go
@@ -204,7 +204,7 @@ func testTPActionsGetTPActionIds(t *testing.T) {
 
 func testTPActionsUpdateTPAction(t *testing.T) {
 	tpActions.Actions = []*utils.TPAction{
-		&utils.TPAction{
+		{
 			Identifier:      "*topup_reset",
 			BalanceId:       "BalID",
 			BalanceUuid:     "BalUuid",
@@ -223,7 +223,7 @@ func testTPActionsUpdateTPAction(t *testing.T) {
 			BalanceDisabled: "false",
 			Weight:          10,
 		},
-		&utils.TPAction{
+		{
 			Identifier:      "*log",
 			BalanceId:       "BalID",
 			BalanceUuid:     "BalUuid",
@@ -242,7 +242,7 @@ func testTPActionsUpdateTPAction(t *testing.T) {
 			BalanceDisabled: "false",
 			Weight:          11,
 		},
-		&utils.TPAction{
+		{
 			Identifier:      "*topup",
 			BalanceId:       "BalID",
 			BalanceUuid:     "BalUuid",
diff --git a/apier/v1/tpactiontriggers_it_test.go b/apier/v1/tpactiontriggers_it_test.go
index 7c2957246..1222ea162 100644
--- a/apier/v1/tpactiontriggers_it_test.go
+++ b/apier/v1/tpactiontriggers_it_test.go
@@ -129,7 +129,7 @@ func testTPActionTriggersSetTPActionTriggers(t *testing.T) {
 		TPid: "TPAct",
 		ID:   "ID",
 		ActionTriggers: []*utils.TPActionTrigger{
-			&utils.TPActionTrigger{
+			{
 				Id:                    "STANDARD_TRIGGERS",
 				UniqueID:              "",
 				ThresholdType:         "*min_balance",
@@ -152,7 +152,7 @@ func testTPActionTriggersSetTPActionTriggers(t *testing.T) {
 				ActionsId:             "LOG_WARNING",
 				Weight:                10,
 			},
-			&utils.TPActionTrigger{
+			{
 				Id:                    "STANDARD_TRIGGERS",
 				UniqueID:              "",
 				ThresholdType:         "*max_event_counter",
@@ -212,7 +212,7 @@ func testTPActionTriggersGetTPActionTriggersIds(t *testing.T) {
 
 func testTPActionTriggersUpdateTPActionTriggers(t *testing.T) {
 	tpActionTriggers.ActionTriggers = []*utils.TPActionTrigger{
-		&utils.TPActionTrigger{
+		{
 			Id:                    "STANDARD_TRIGGERS",
 			UniqueID:              "",
 			ThresholdType:         "*min_balance",
@@ -235,7 +235,7 @@ func testTPActionTriggersUpdateTPActionTriggers(t *testing.T) {
 			ActionsId:             "LOG_WARNING",
 			Weight:                10,
 		},
-		&utils.TPActionTrigger{
+		{
 			Id:                    "STANDARD_TRIGGERS",
 			UniqueID:              "",
 			ThresholdType:         "*max_event_counter",
@@ -258,7 +258,7 @@ func testTPActionTriggersUpdateTPActionTriggers(t *testing.T) {
 			ActionsId:             "LOG_WARNING",
 			Weight:                10,
 		},
-		&utils.TPActionTrigger{
+		{
 			Id:                    "CDRST1_WARN",
 			UniqueID:              "",
 			ThresholdType:         "*min_asr",
diff --git a/apier/v1/tpattributes_it_test.go b/apier/v1/tpattributes_it_test.go
index 71b0731d5..9ae7caf38 100644
--- a/apier/v1/tpattributes_it_test.go
+++ b/apier/v1/tpattributes_it_test.go
@@ -132,7 +132,7 @@ func testTPAlsPrfSetTPAlsPrf(t *testing.T) {
 		},
 		Contexts: []string{"con1"},
 		Attributes: []*utils.TPAttribute{
-			&utils.TPAttribute{
+			{
 				Path:      utils.MetaReq + utils.NestingSep + "FL1",
 				Value:     "Al1",
 				FilterIDs: []string{},
@@ -174,12 +174,12 @@ func testTPAlsPrfGetTPAlsPrfIDs(t *testing.T) {
 
 func testTPAlsPrfUpdateTPAlsPrf(t *testing.T) {
 	tpAlsPrf.Attributes = []*utils.TPAttribute{
-		&utils.TPAttribute{
+		{
 			Path:      utils.MetaReq + utils.NestingSep + "FL1",
 			Value:     "Al1",
 			FilterIDs: []string{},
 		},
-		&utils.TPAttribute{
+		{
 			Path:      utils.MetaReq + utils.NestingSep + "FL2",
 			Value:     "Al2",
 			FilterIDs: []string{},
@@ -206,12 +206,12 @@ func testTPAlsPrfGetTPAlsPrfAfterUpdate(t *testing.T) {
 		},
 		Contexts: []string{"con1"},
 		Attributes: []*utils.TPAttribute{
-			&utils.TPAttribute{
+			{
 				Path:      utils.MetaReq + utils.NestingSep + "FL2",
 				Value:     "Al2",
 				FilterIDs: []string{},
 			},
-			&utils.TPAttribute{
+			{
 				Path:      utils.MetaReq + utils.NestingSep + "FL1",
 				Value:     "Al1",
 				FilterIDs: []string{},
diff --git a/apier/v1/tpdestinationrates_it_test.go b/apier/v1/tpdestinationrates_it_test.go
index 150b345db..3ac692e67 100644
--- a/apier/v1/tpdestinationrates_it_test.go
+++ b/apier/v1/tpdestinationrates_it_test.go
@@ -125,7 +125,7 @@ func testTPDstRateSetTPDstRate(t *testing.T) {
 		TPid: "TP1",
 		ID:   "DR_FREESWITCH_USERS",
 		DestinationRates: []*utils.DestinationRate{
-			&utils.DestinationRate{
+			{
 				DestinationId:    "FS_USERS",
 				RateId:           "RT_FS_USERS",
 				RoundingMethod:   "*up",
diff --git a/apier/v1/tpfilters_it_test.go b/apier/v1/tpfilters_it_test.go
index 86dd46dad..d7e619e87 100644
--- a/apier/v1/tpfilters_it_test.go
+++ b/apier/v1/tpfilters_it_test.go
@@ -128,7 +128,7 @@ func testTPFilterSetTPFilter(t *testing.T) {
 		Tenant: "cgrates.org",
 		ID:     "Filter",
 		Filters: []*utils.TPFilter{
-			&utils.TPFilter{
+			{
 				Type:    utils.MetaString,
 				Element: "~*req.Account",
 				Values:  []string{"1001", "1002"},
@@ -174,12 +174,12 @@ func testTPFilterGetFilterIds(t *testing.T) {
 
 func testTPFilterUpdateTPFilter(t *testing.T) {
 	tpFilter.Filters = []*utils.TPFilter{
-		&utils.TPFilter{
+		{
 			Type:    utils.MetaString,
 			Element: "~*req.Account",
 			Values:  []string{"1001", "1002"},
 		},
-		&utils.TPFilter{
+		{
 			Type:    utils.MetaPrefix,
 			Element: "~*req.Destination",
 			Values:  []string{"10", "20"},
diff --git a/apier/v1/tprates_it_test.go b/apier/v1/tprates_it_test.go
index e29408a1f..1ed88084c 100644
--- a/apier/v1/tprates_it_test.go
+++ b/apier/v1/tprates_it_test.go
@@ -128,14 +128,14 @@ func testTPRatesSetTPRate(t *testing.T) {
 		TPid: "TPidTpRate",
 		ID:   "RT_FS_USERS",
 		RateSlots: []*utils.RateSlot{
-			&utils.RateSlot{
+			{
 				ConnectFee:         12,
 				Rate:               3,
 				RateUnit:           "6s",
 				RateIncrement:      "6s",
 				GroupIntervalStart: "0s",
 			},
-			&utils.RateSlot{
+			{
 				ConnectFee:         12,
 				Rate:               3,
 				RateUnit:           "4s",
@@ -174,21 +174,21 @@ func testTPRatesGetTPRateIds(t *testing.T) {
 func testTPRatesUpdateTPRate(t *testing.T) {
 	var result string
 	tpRate.RateSlots = []*utils.RateSlot{
-		&utils.RateSlot{
+		{
 			ConnectFee:         12,
 			Rate:               3,
 			RateUnit:           "6s",
 			RateIncrement:      "6s",
 			GroupIntervalStart: "0s",
 		},
-		&utils.RateSlot{
+		{
 			ConnectFee:         12,
 			Rate:               10,
 			RateUnit:           "4s",
 			RateIncrement:      "6s",
 			GroupIntervalStart: "1s",
 		},
-		&utils.RateSlot{
+		{
 			ConnectFee:         5,
 			Rate:               10,
 			RateUnit:           "4s",
diff --git a/apier/v1/tpratingplans_it_test.go b/apier/v1/tpratingplans_it_test.go
index 4e4962f0c..73b0c7d89 100644
--- a/apier/v1/tpratingplans_it_test.go
+++ b/apier/v1/tpratingplans_it_test.go
@@ -128,12 +128,12 @@ func testTPRatingPlansSetTPRatingPlan(t *testing.T) {
 		TPid: "TPRP1",
 		ID:   "Plan1",
 		RatingPlanBindings: []*utils.TPRatingPlanBinding{
-			&utils.TPRatingPlanBinding{
+			{
 				DestinationRatesId: "RateId",
 				TimingId:           "TimingID",
 				Weight:             12,
 			},
-			&utils.TPRatingPlanBinding{
+			{
 				DestinationRatesId: "DR_FREESWITCH_USERS",
 				TimingId:           "ALWAYS",
 				Weight:             10,
@@ -175,17 +175,17 @@ func testTPRatingPlansGetTPRatingPlanIds(t *testing.T) {
 
 func testTPRatingPlansUpdateTPRatingPlan(t *testing.T) {
 	tpRatingPlan.RatingPlanBindings = []*utils.TPRatingPlanBinding{
-		&utils.TPRatingPlanBinding{
+		{
 			DestinationRatesId: "RateId",
 			TimingId:           "TimingID",
 			Weight:             12,
 		},
-		&utils.TPRatingPlanBinding{
+		{
 			DestinationRatesId: "DR_FREESWITCH_USERS",
 			TimingId:           "ALWAYS",
 			Weight:             10,
 		},
-		&utils.TPRatingPlanBinding{
+		{
 			DestinationRatesId: "RateID2",
 			TimingId:           "ALWAYS",
 			Weight:             11,
diff --git a/apier/v1/tpratingprofiles_it_test.go b/apier/v1/tpratingprofiles_it_test.go
index 35ae7984f..09ccad258 100644
--- a/apier/v1/tpratingprofiles_it_test.go
+++ b/apier/v1/tpratingprofiles_it_test.go
@@ -134,12 +134,12 @@ func testTPRatingProfilesSetTPRatingProfile(t *testing.T) {
 		Category: "Category",
 		Subject:  "Subject",
 		RatingPlanActivations: []*utils.TPRatingActivation{
-			&utils.TPRatingActivation{
+			{
 				ActivationTime:   "2014-07-29T15:00:00Z",
 				RatingPlanId:     "PlanOne",
 				FallbackSubjects: "FallBack",
 			},
-			&utils.TPRatingActivation{
+			{
 				ActivationTime:   "2015-07-29T10:00:00Z",
 				RatingPlanId:     "PlanTwo",
 				FallbackSubjects: "FallOut",
@@ -209,17 +209,17 @@ func testTPRatingProfilesGetTPRatingProfilesByLoadID(t *testing.T) {
 func testTPRatingProfilesUpdateTPRatingProfile(t *testing.T) {
 	var result string
 	tpRatingProfile.RatingPlanActivations = []*utils.TPRatingActivation{
-		&utils.TPRatingActivation{
+		{
 			ActivationTime:   "2014-07-29T15:00:00Z",
 			RatingPlanId:     "PlanOne",
 			FallbackSubjects: "FallBack",
 		},
-		&utils.TPRatingActivation{
+		{
 			ActivationTime:   "2015-07-29T10:00:00Z",
 			RatingPlanId:     "PlanTwo",
 			FallbackSubjects: "FallOut",
 		},
-		&utils.TPRatingActivation{
+		{
 			ActivationTime:   "2017-07-29T10:00:00Z",
 			RatingPlanId:     "BackupPlan",
 			FallbackSubjects: "Retreat",
diff --git a/apier/v1/tproutes_it_test.go b/apier/v1/tproutes_it_test.go
index 0f11047ab..6edf46c5c 100644
--- a/apier/v1/tproutes_it_test.go
+++ b/apier/v1/tproutes_it_test.go
@@ -134,7 +134,7 @@ func testTPRouteSetTPRoute(t *testing.T) {
 		},
 		Sorting: "*lc",
 		Routes: []*utils.TPRoute{
-			&utils.TPRoute{
+			{
 				ID:              "route1",
 				FilterIDs:       []string{"FLTR_1"},
 				AccountIDs:      []string{"Acc1", "Acc2"},
@@ -184,7 +184,7 @@ func testTPRouteGetTPRouteIDs(t *testing.T) {
 
 func testTPRouteUpdateTPRoute(t *testing.T) {
 	tpRoutePrf.Routes = []*utils.TPRoute{
-		&utils.TPRoute{
+		{
 			ID:              "route1",
 			FilterIDs:       []string{"FLTR_1"},
 			AccountIDs:      []string{"Acc1", "Acc2"},
@@ -195,7 +195,7 @@ func testTPRouteUpdateTPRoute(t *testing.T) {
 			Blocker:         true,
 			RouteParameters: "SortingParam1",
 		},
-		&utils.TPRoute{
+		{
 			ID:              "route2",
 			FilterIDs:       []string{"FLTR_1"},
 			AccountIDs:      []string{"Acc3"},
diff --git a/apier/v1/tpsharedgroups_it_test.go b/apier/v1/tpsharedgroups_it_test.go
index 086ac62f5..5f80beed4 100644
--- a/apier/v1/tpsharedgroups_it_test.go
+++ b/apier/v1/tpsharedgroups_it_test.go
@@ -127,12 +127,12 @@ func testTPSharedGroupsSetSharedGroups(t *testing.T) {
 		TPid: "TPS1",
 		ID:   "Group1",
 		SharedGroups: []*utils.TPSharedGroup{
-			&utils.TPSharedGroup{
+			{
 				Account:       "AccOne",
 				Strategy:      "StrategyOne",
 				RatingSubject: "SubOne",
 			},
-			&utils.TPSharedGroup{
+			{
 				Account:       "AccTow",
 				Strategy:      "StrategyTwo",
 				RatingSubject: "SubTwo",
@@ -174,17 +174,17 @@ func testTPSharedGroupsGetTPSharedGroupIds(t *testing.T) {
 func testTPSharedGroupsUpdateTPShareGroups(t *testing.T) {
 	var result string
 	tpSharedGroups.SharedGroups = []*utils.TPSharedGroup{
-		&utils.TPSharedGroup{
+		{
 			Account:       "AccOne",
 			Strategy:      "StrategyOne",
 			RatingSubject: "SubOne",
 		},
-		&utils.TPSharedGroup{
+		{
 			Account:       "AccTow",
 			Strategy:      "StrategyTwo",
 			RatingSubject: "SubTwo",
 		},
-		&utils.TPSharedGroup{
+		{
 			Account:       "AccPlus",
 			Strategy:      "StrategyPlus",
 			RatingSubject: "SubPlus",
diff --git a/apier/v1/tpstats_it_test.go b/apier/v1/tpstats_it_test.go
index 008c74faf..271ee2472 100644
--- a/apier/v1/tpstats_it_test.go
+++ b/apier/v1/tpstats_it_test.go
@@ -132,7 +132,7 @@ func testTPStatsSetTPStat(t *testing.T) {
 		},
 		TTL: "1",
 		Metrics: []*utils.MetricWithFilters{
-			&utils.MetricWithFilters{
+			{
 				MetricID: "*sum",
 			},
 		},
@@ -167,10 +167,10 @@ func testTPStatsUpdateTPStat(t *testing.T) {
 	var result string
 	tpStat.Weight = 21
 	tpStat.Metrics = []*utils.MetricWithFilters{
-		&utils.MetricWithFilters{
+		{
 			MetricID: "*sum",
 		},
-		&utils.MetricWithFilters{
+		{
 			MetricID: "*averege",
 		},
 	}
diff --git a/apier/v2/apierv2_it_test.go b/apier/v2/apierv2_it_test.go
index b3786647b..26ee8642b 100644
--- a/apier/v2/apierv2_it_test.go
+++ b/apier/v2/apierv2_it_test.go
@@ -402,7 +402,7 @@ func testAPIerSv2itSetActionPlanWithWrongTiming(t *testing.T) {
 	tNow := time.Now().Add(time.Minute).String()
 	argAP1 := &v1.AttrSetActionPlan{Id: "TestAPIerSv2itSetAccountWithAPWithWrongTiming",
 		ActionPlan: []*v1.AttrActionPlan{
-			&v1.AttrActionPlan{
+			{
 				ActionsId: "TestAPIerSv2itSetAccountWithAP_ACT_1",
 				Time:      tNow,
 				Weight:    20.0,
@@ -420,7 +420,7 @@ func testAPIerSv2itSetActionPlanWithWrongTiming2(t *testing.T) {
 	var reply string
 	argAP1 := &v1.AttrSetActionPlan{Id: "TestAPIerSv2itSetAccountWithAPWithWrongTiming",
 		ActionPlan: []*v1.AttrActionPlan{
-			&v1.AttrActionPlan{
+			{
 				ActionsId: "TestAPIerSv2itSetAccountWithAP_ACT_1",
 				Time:      "aa:bb:cc",
 				Weight:    20.0,
diff --git a/dispatchers/dispatchers_test.go b/dispatchers/dispatchers_test.go
index d0fff894e..9dbd37bd9 100644
--- a/dispatchers/dispatchers_test.go
+++ b/dispatchers/dispatchers_test.go
@@ -1006,7 +1006,7 @@ func TestDispatcherServiceDispatcherProfileForEventNotNotFound(t *testing.T) {
 			if cnt == 0 {
 				cnt++
 				return map[string]utils.StringSet{
-					idxKey: utils.StringSet{"cgrates.org:dsp1": {}},
+					idxKey: {"cgrates.org:dsp1": {}},
 				}, nil
 			}
 			return nil, utils.ErrNotImplemented
diff --git a/engine/model_helpers_test.go b/engine/model_helpers_test.go
index 8b0fa3f36..bd302cf1e 100644
--- a/engine/model_helpers_test.go
+++ b/engine/model_helpers_test.go
@@ -4749,7 +4749,7 @@ func TestRouteProfileToAPICase1(t *testing.T) {
 		},
 		SortingParameters: []string{"Param1", "Param2"},
 		Routes: []*Route{
-			&Route{ID: "ResGroup2"},
+			{ID: "ResGroup2"},
 		},
 	}
 
@@ -5815,7 +5815,7 @@ func TestModelHelpersMapTPSharedGroup2(t *testing.T) {
 		},
 	}
 	expStruct := map[string][]*utils.TPSharedGroup{
-		"2": []*utils.TPSharedGroup{
+		"2": {
 			{
 				Account:       "",
 				Strategy:      "",
@@ -5855,7 +5855,7 @@ func TestSharedGroupMdlsAsMapTPSharedGroups2(t *testing.T) {
 		},
 	}
 	expStruct := map[string]*utils.TPSharedGroups{
-		"": &utils.TPSharedGroups{
+		"": {
 			TPid: "2",
 			ID:   "",
 			SharedGroups: []*utils.TPSharedGroup{
diff --git a/migrator/accounts_test.go b/migrator/accounts_test.go
index cebcd69e8..f78fbac66 100644
--- a/migrator/accounts_test.go
+++ b/migrator/accounts_test.go
@@ -31,7 +31,7 @@ func TestV1AccountAsAccount(t *testing.T) {
 		Weight:         10,
 		DestinationIds: "NAT",
 		Timings: []*engine.RITiming{
-			&engine.RITiming{
+			{
 				StartTime: "00:00:00",
 			},
 		},
@@ -41,7 +41,7 @@ func TestV1AccountAsAccount(t *testing.T) {
 		Weight:         10,
 		DestinationIds: "NAT",
 		Timings: []*engine.RITiming{
-			&engine.RITiming{
+			{
 				StartTime: "00:00:00",
 			},
 		},
@@ -49,12 +49,12 @@ func TestV1AccountAsAccount(t *testing.T) {
 	v1Acc := &v1Account{
 		Id: "*OUT:CUSTOMER_1:rif",
 		BalanceMap: map[string]v1BalanceChain{
-			utils.MetaData:  v1BalanceChain{d1b},
-			utils.MetaVoice: v1BalanceChain{v1b},
-			utils.MetaMonetary: v1BalanceChain{&v1Balance{
+			utils.MetaData:  {d1b},
+			utils.MetaVoice: {v1b},
+			utils.MetaMonetary: {&v1Balance{
 				Value: 21,
 				Timings: []*engine.RITiming{
-					&engine.RITiming{
+					{
 						StartTime: "00:00:00",
 					},
 				},
@@ -70,7 +70,7 @@ func TestV1AccountAsAccount(t *testing.T) {
 		RatingSubject:  "",
 		Categories:     utils.NewStringMap(""),
 		SharedGroups:   utils.NewStringMap(""),
-		Timings:        []*engine.RITiming{&engine.RITiming{StartTime: "00:00:00"}},
+		Timings:        []*engine.RITiming{{StartTime: "00:00:00"}},
 		TimingIDs:      utils.NewStringMap(""),
 		Factor:         engine.ValueFactor{},
 	}
@@ -83,7 +83,7 @@ func TestV1AccountAsAccount(t *testing.T) {
 		RatingSubject:  "",
 		Categories:     utils.NewStringMap(""),
 		SharedGroups:   utils.NewStringMap(""),
-		Timings:        []*engine.RITiming{&engine.RITiming{StartTime: "00:00:00"}},
+		Timings:        []*engine.RITiming{{StartTime: "00:00:00"}},
 		TimingIDs:      utils.NewStringMap(""),
 		Factor:         engine.ValueFactor{},
 	}
@@ -95,16 +95,16 @@ func TestV1AccountAsAccount(t *testing.T) {
 		RatingSubject:  "",
 		Categories:     utils.NewStringMap(""),
 		SharedGroups:   utils.NewStringMap(""),
-		Timings:        []*engine.RITiming{&engine.RITiming{StartTime: "00:00:00"}},
+		Timings:        []*engine.RITiming{{StartTime: "00:00:00"}},
 		TimingIDs:      utils.NewStringMap(""),
 		Factor:         engine.ValueFactor{},
 	}
 	testAccount := &engine.Account{
 		ID: "CUSTOMER_1:rif",
 		BalanceMap: map[string]engine.Balances{
-			utils.MetaData:     engine.Balances{d2},
-			utils.MetaVoice:    engine.Balances{v2},
-			utils.MetaMonetary: engine.Balances{m2},
+			utils.MetaData:     {d2},
+			utils.MetaVoice:    {v2},
+			utils.MetaMonetary: {m2},
 		},
 		UnitCounters:   engine.UnitCounters{},
 		ActionTriggers: engine.ActionTriggers{},
diff --git a/migrator/action_plan_test.go b/migrator/action_plan_test.go
index 9b7722291..ae8dae9b1 100644
--- a/migrator/action_plan_test.go
+++ b/migrator/action_plan_test.go
@@ -35,7 +35,7 @@ func TestV1ActionPlanAsActionPlan(t *testing.T) {
 		Id:         "test",
 		AccountIDs: utils.StringMap{"one": true},
 		ActionTimings: []*engine.ActionTiming{
-			&engine.ActionTiming{
+			{
 				Timing: &engine.RateInterval{
 					Timing: new(engine.RITiming),
 				},
diff --git a/migrator/alias_it_test.go b/migrator/alias_it_test.go
index 29755cca0..917739810 100644
--- a/migrator/alias_it_test.go
+++ b/migrator/alias_it_test.go
@@ -131,10 +131,10 @@ func testAlsITMigrateAndMove(t *testing.T) {
 			&v1AliasValue{
 				DestinationId: "DST_1003",
 				Pairs: map[string]map[string]string{
-					"Account": map[string]string{
+					"Account": {
 						"1001": "1002",
 					},
-					"Category": map[string]string{
+					"Category": {
 						"call_1001": "call_1002",
 					},
 				},
diff --git a/migrator/alias_test.go b/migrator/alias_test.go
index 98f685f71..88872ccde 100644
--- a/migrator/alias_test.go
+++ b/migrator/alias_test.go
@@ -52,7 +52,7 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 				&v1AliasValue{
 					DestinationId: utils.MetaAny,
 					Pairs: map[string]map[string]string{
-						"Account": map[string]string{
+						"Account": {
 							"1001": "1002",
 						},
 					},
@@ -71,7 +71,7 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 				&v1AliasValue{
 					DestinationId: utils.MetaAny,
 					Pairs: map[string]map[string]string{
-						"Account": map[string]string{
+						"Account": {
 							"1001": "1002",
 							"1003": "1004",
 						},
@@ -91,7 +91,7 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 				&v1AliasValue{
 					DestinationId: utils.MetaAny,
 					Pairs: map[string]map[string]string{
-						"Account": map[string]string{
+						"Account": {
 							"1001": "1002",
 							"1003": "1004",
 						},
@@ -111,10 +111,10 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 				&v1AliasValue{
 					DestinationId: "DST_1003",
 					Pairs: map[string]map[string]string{
-						"Account": map[string]string{
+						"Account": {
 							"": "1002",
 						},
-						"Subject": map[string]string{
+						"Subject": {
 							"": "call_1001",
 						},
 					},
@@ -133,10 +133,10 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 				&v1AliasValue{
 					DestinationId: "DST_1003",
 					Pairs: map[string]map[string]string{
-						"Account": map[string]string{
+						"Account": {
 							"1001": "1002",
 						},
-						"Category": map[string]string{
+						"Category": {
 							"call_1001": "call_1002",
 						},
 					},
@@ -153,7 +153,7 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 			Values: v1AliasValues{
 				&v1AliasValue{
 					Pairs: map[string]map[string]string{
-						utils.Category: map[string]string{
+						utils.Category: {
 							"somecateg_5141": "somecateg_roam_fromz4",
 						},
 					},
diff --git a/migrator/attributes_test.go b/migrator/attributes_test.go
index 82bf2b6fd..cf6566646 100644
--- a/migrator/attributes_test.go
+++ b/migrator/attributes_test.go
@@ -59,7 +59,7 @@ func TestV1AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v2Attribute{
-			&v2Attribute{
+			{
 				FieldName:  "FL1",
 				Initial:    "In1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -87,7 +87,7 @@ func TestV2AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v2Attribute{
-			&v2Attribute{
+			{
 				FieldName:  "FL1",
 				Initial:    "In1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -106,7 +106,7 @@ func TestV2AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v3Attribute{
-			&v3Attribute{
+			{
 				FilterIDs:  []string{"*string:FL1:In1"},
 				FieldName:  "FL1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -133,7 +133,7 @@ func TestV2AttributeProfileAsAttributeProfile2(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v2Attribute{
-			&v2Attribute{
+			{
 				FieldName:  "FL1",
 				Initial:    nil,
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -152,7 +152,7 @@ func TestV2AttributeProfileAsAttributeProfile2(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v3Attribute{
-			&v3Attribute{
+			{
 				FilterIDs:  []string{"*string:FL1:"},
 				FieldName:  "FL1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -179,7 +179,7 @@ func TestV3AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v3Attribute{
-			&v3Attribute{
+			{
 				FilterIDs:  []string{"*string:FL1:In1"},
 				FieldName:  "FL1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -197,7 +197,7 @@ func TestV3AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v4Attribute{
-			&v4Attribute{
+			{
 				FilterIDs: []string{"*string:FL1:In1"},
 				FieldName: "FL1",
 				Type:      utils.MetaVariable,
@@ -225,7 +225,7 @@ func TestV4AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v4Attribute{
-			&v4Attribute{
+			{
 				FieldName: "FL1",
 				Type:      utils.MetaVariable,
 				Value:     config.NewRSRParsersMustCompile("~Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.InfieldSep),
@@ -243,7 +243,7 @@ func TestV4AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*engine.Attribute{
-			&engine.Attribute{
+			{
 				Path:  utils.MetaReq + utils.NestingSep + "FL1",
 				Type:  utils.MetaVariable,
 				Value: config.NewRSRParsersMustCompile("~*req.Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.InfieldSep),
@@ -294,7 +294,7 @@ func TestAsAttributeProfileV2(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v2Attribute{
-			&v2Attribute{
+			{
 				FieldName:  "FL1",
 				Initial:    "In1",
 				Substitute: sbstPrsr,
@@ -323,7 +323,7 @@ func TestAsAttributeProfileV3(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v2Attribute{
-			&v2Attribute{
+			{
 				FieldName:  "FL1",
 				Initial:    "In1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -342,7 +342,7 @@ func TestAsAttributeProfileV3(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v3Attribute{
-			&v3Attribute{
+			{
 				FilterIDs:  []string{"*string:FL1:In1"}, //here
 				FieldName:  "FL1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -367,7 +367,7 @@ func TestAsAttributeProfileV4(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v3Attribute{
-			&v3Attribute{
+			{
 				FilterIDs:  []string{"*string:FL1:In1"},
 				FieldName:  "FL1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -385,7 +385,7 @@ func TestAsAttributeProfileV4(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v4Attribute{
-			&v4Attribute{
+			{
 				FilterIDs: []string{"*string:FL1:In1"},
 				FieldName: "FL1",
 				Type:      utils.MetaVariable,
@@ -414,7 +414,7 @@ func TestAsAttributeProfileV5(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v4Attribute{
-			&v4Attribute{
+			{
 				FilterIDs: []string{"*string:FL1:In1"},
 				FieldName: "FL1",
 				Type:      utils.MetaVariable,
@@ -434,7 +434,7 @@ func TestAsAttributeProfileV5(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*engine.Attribute{
-			&engine.Attribute{
+			{
 				FilterIDs: []string{"*string:FL1:In1"},
 				Path:      utils.MetaReq + utils.NestingSep + "FL1",
 				Type:      utils.MetaVariable,
@@ -487,7 +487,7 @@ func TestAsAttributeProfileV1To4(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v4Attribute{
-			&v4Attribute{
+			{
 				FieldName: "FL1",
 				Type:      utils.MetaVariable,
 				Value:     sbstPrsr,
diff --git a/migrator/rating_plan_it_test.go b/migrator/rating_plan_it_test.go
index 146988166..f8c7e274f 100644
--- a/migrator/rating_plan_it_test.go
+++ b/migrator/rating_plan_it_test.go
@@ -182,7 +182,7 @@ func testRtPlITMigrateAndMove(t *testing.T) {
 		Id:      "RT_PLAN1",
 		Timings: map[string]*engine.RITiming{},
 		Ratings: map[string]*engine.RIRate{
-			"asjkilj": &engine.RIRate{
+			"asjkilj": {
 				ConnectFee:       10,
 				RoundingMethod:   utils.MetaRoundingUp,
 				RoundingDecimals: 1,
diff --git a/migrator/session_costs_test.go b/migrator/session_costs_test.go
index 3be06bf44..57c4d4882 100644
--- a/migrator/session_costs_test.go
+++ b/migrator/session_costs_test.go
@@ -60,7 +60,7 @@ func TestV2toV3Cost(t *testing.T) {
 			Tenant: "cgrates.org",
 			ID:     "1001",
 			BalanceSummaries: []*engine.BalanceSummary{
-				&engine.BalanceSummary{
+				{
 					UUID:  "UUID",
 					ID:    "First",
 					Type:  utils.MetaMonetary,
diff --git a/migrator/sharedgroup_test.go b/migrator/sharedgroup_test.go
index a13afaa7f..8e400d71d 100644
--- a/migrator/sharedgroup_test.go
+++ b/migrator/sharedgroup_test.go
@@ -29,14 +29,14 @@ func TestV1SharedGroupAsSharedGroup(t *testing.T) {
 	v1sg := &v1SharedGroup{
 		Id: "Test",
 		AccountParameters: map[string]*engine.SharingParameters{
-			"test": &engine.SharingParameters{Strategy: "*highest"},
+			"test": {Strategy: "*highest"},
 		},
 		MemberIds: []string{"1", "2", "3"},
 	}
 	sg := &engine.SharedGroup{
 		Id: "Test",
 		AccountParameters: map[string]*engine.SharingParameters{
-			"test": &engine.SharingParameters{Strategy: "*highest"},
+			"test": {Strategy: "*highest"},
 		},
 		MemberIds: utils.NewStringMap("1", "2", "3"),
 	}
diff --git a/migrator/tp_stats_it_test.go b/migrator/tp_stats_it_test.go
index aa519bf44..ec5c3747c 100644
--- a/migrator/tp_stats_it_test.go
+++ b/migrator/tp_stats_it_test.go
@@ -117,7 +117,7 @@ func testTpStatsITPopulate(t *testing.T) {
 			},
 			TTL: "1",
 			Metrics: []*utils.MetricWithFilters{
-				&utils.MetricWithFilters{
+				{
 					MetricID: "*sum#Param1",
 				},
 			},
diff --git a/utils/orderednavigablemap_test.go b/utils/orderednavigablemap_test.go
index 9ab91a461..76c825bb7 100644
--- a/utils/orderednavigablemap_test.go
+++ b/utils/orderednavigablemap_test.go
@@ -885,7 +885,7 @@ func TestOrderedNavigableMapString(t *testing.T) {
 	onm.nm = &DataNode{
 		Type: NMMapType,
 		Map: map[string]*DataNode{
-			"test1": &DataNode{
+			"test1": {
 				Value: &DataLeaf{
 					Data: "data!",
 				},
@@ -903,7 +903,7 @@ func TestOrderedNavigableMapInterface(t *testing.T) {
 	onm.nm = &DataNode{
 		Type: NMMapType,
 		Map: map[string]*DataNode{
-			"test1": &DataNode{
+			"test1": {
 				Value: &DataLeaf{
 					Data: "data!",
 				},
@@ -939,7 +939,7 @@ func TestOrderedNavigableMapCompose(t *testing.T) {
 	}, NewLeafNode("1003"))
 	onm.orderRef = make(map[string][]*PathItemElement)
 	onm.orderRef = map[string][]*PathItemElement{
-		"Field1.Field2[0]": []*PathItemElement{&PathItemElement{Value: []string{"test"}}},
+		"Field1.Field2[0]": {{Value: []string{"test"}}},
 	}
 	if err := onm.Compose(&FullPath{
 		PathSlice: []string{"Field1", "Field2", "0"},