diff --git a/apier/v1/accountprofiles_it_test.go b/apier/v1/accountprofiles_it_test.go
index 890513d97..604aba3c4 100644
--- a/apier/v1/accountprofiles_it_test.go
+++ b/apier/v1/accountprofiles_it_test.go
@@ -136,6 +136,13 @@ func testAccountSGetAccountProfile(t *testing.T) {
 				ID:     "GenericBalance1",
 				Weight: 20,
 				Type:   utils.MetaAbstract,
+				Units:  &utils.Decimal{decimal.New(int64(time.Hour), 0)},
+				UnitFactors: []*utils.UnitFactor{
+					&utils.UnitFactor{
+						FilterIDs: []string{"*string:~*req.ToR:*data"},
+						Factor:    &utils.Decimal{decimal.New(1024, 3)},
+					},
+				},
 				CostIncrements: []*utils.CostIncrement{
 					&utils.CostIncrement{
 						FilterIDs:    []string{"*string:~*req.ToR:*voice"},
@@ -150,22 +157,12 @@ func testAccountSGetAccountProfile(t *testing.T) {
 						RecurrentFee: &utils.Decimal{decimal.New(1, 2)},
 					},
 				},
-				UnitFactors: []*utils.UnitFactor{
-					&utils.UnitFactor{
-						FilterIDs: []string{"*string:~*req.ToR:*voice"},
-						Factor:    &utils.Decimal{decimal.New(int64(time.Second), 0)},
-					},
-					&utils.UnitFactor{
-						FilterIDs: []string{"*string:~*req.ToR:*data"},
-						Factor:    &utils.Decimal{decimal.New(int64(1024*time.Second), 0)},
-					},
-				},
-				Units: &utils.Decimal{decimal.New(int64(time.Hour), 0)},
 			},
 			"MonetaryBalance1": &utils.Balance{
 				ID:     "MonetaryBalance1",
 				Weight: 30,
 				Type:   utils.MetaConcrete,
+				Units:  &utils.Decimal{decimal.New(5, 0)},
 				CostIncrements: []*utils.CostIncrement{
 					&utils.CostIncrement{
 						FilterIDs:    []string{"*string:~*req.ToR:*voice"},
@@ -180,13 +177,20 @@ func testAccountSGetAccountProfile(t *testing.T) {
 						RecurrentFee: &utils.Decimal{decimal.New(1, 2)},
 					},
 				},
-				Units: &utils.Decimal{decimal.New(5, 0)},
 			},
 			"MonetaryBalance2": &utils.Balance{
 				ID:     "MonetaryBalance2",
 				Weight: 10,
 				Type:   utils.MetaConcrete,
 				Units:  &utils.Decimal{decimal.New(3, 0)},
+				CostIncrements: []*utils.CostIncrement{
+					&utils.CostIncrement{
+						FilterIDs:    []string{"*string:~*req.ToR:*voice"},
+						Increment:    &utils.Decimal{decimal.New(int64(time.Second), 0)},
+						FixedFee:     &utils.Decimal{decimal.New(0, 0)},
+						RecurrentFee: &utils.Decimal{decimal.New(1, 0)},
+					},
+				},
 			},
 		},
 		ThresholdIDs: []string{utils.MetaNone},
diff --git a/apier/v1/actions_it_test.go b/apier/v1/actions_it_test.go
index d60e48560..dd00060ad 100644
--- a/apier/v1/actions_it_test.go
+++ b/apier/v1/actions_it_test.go
@@ -136,39 +136,34 @@ func testActionSGetActionProfile(t *testing.T) {
 		},
 		Actions: []*engine.APAction{
 			{
-				ID:        "TOPUP",
-				FilterIDs: []string{},
-				Type:      "*topup",
-				Path:      "~*balance.TestBalance.Value",
-				Value:     config.NewRSRParsersMustCompile("10", actPrfCfg.GeneralCfg().RSRSep),
+				ID:    "TOPUP",
+				Type:  "*topup",
+				Path:  "~*balance.TestBalance.Value",
+				Value: config.NewRSRParsersMustCompile("10", actPrfCfg.GeneralCfg().RSRSep),
 			},
 			{
-				ID:        "SET_BALANCE_TEST_DATA",
-				FilterIDs: []string{},
-				Type:      "*set_balance",
-				Path:      "~*balance.TestDataBalance.Type",
-				Value:     config.NewRSRParsersMustCompile("*data", actPrfCfg.GeneralCfg().RSRSep),
+				ID:    "SET_BALANCE_TEST_DATA",
+				Type:  "*set_balance",
+				Path:  "~*balance.TestDataBalance.Type",
+				Value: config.NewRSRParsersMustCompile("*data", actPrfCfg.GeneralCfg().RSRSep),
 			},
 			{
-				ID:        "TOPUP_TEST_DATA",
-				FilterIDs: []string{},
-				Type:      "*topup",
-				Path:      "~*balance.TestDataBalance.Value",
-				Value:     config.NewRSRParsersMustCompile("1024", actPrfCfg.GeneralCfg().RSRSep),
+				ID:    "TOPUP_TEST_DATA",
+				Type:  "*topup",
+				Path:  "~*balance.TestDataBalance.Value",
+				Value: config.NewRSRParsersMustCompile("1024", actPrfCfg.GeneralCfg().RSRSep),
 			},
 			{
-				ID:        "SET_BALANCE_TEST_VOICE",
-				FilterIDs: []string{},
-				Type:      "*set_balance",
-				Path:      "~*balance.TestVoiceBalance.Type",
-				Value:     config.NewRSRParsersMustCompile("*voice", actPrfCfg.GeneralCfg().RSRSep),
+				ID:    "SET_BALANCE_TEST_VOICE",
+				Type:  "*set_balance",
+				Path:  "~*balance.TestVoiceBalance.Type",
+				Value: config.NewRSRParsersMustCompile("*voice", actPrfCfg.GeneralCfg().RSRSep),
 			},
 			{
-				ID:        "TOPUP_TEST_VOICE",
-				FilterIDs: []string{},
-				Type:      "*topup",
-				Path:      "~*balance.TestVoiceBalance.Value",
-				Value:     config.NewRSRParsersMustCompile("15m15s", actPrfCfg.GeneralCfg().RSRSep),
+				ID:    "TOPUP_TEST_VOICE",
+				Type:  "*topup",
+				Path:  "~*balance.TestVoiceBalance.Value",
+				Value: config.NewRSRParsersMustCompile("15m15s", actPrfCfg.GeneralCfg().RSRSep),
 			},
 		},
 	}
diff --git a/engine/z_stordb_it_test.go b/engine/z_stordb_it_test.go
index ef3689149..275322c44 100644
--- a/engine/z_stordb_it_test.go
+++ b/engine/z_stordb_it_test.go
@@ -242,10 +242,9 @@ func testStorDBitCRUDTPActionProfiles(t *testing.T) {
 			Schedule:  utils.MetaASAP,
 			Actions: []*utils.TPAPAction{
 				{
-					ID:        "TOPUP",
-					FilterIDs: []string{},
-					Type:      "*topup",
-					Path:      "~*balance.TestBalance.Value",
+					ID:   "TOPUP",
+					Type: "*topup",
+					Path: "~*balance.TestBalance.Value",
 				},
 			},
 		},
diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go
index f83191723..cf25becfb 100644
--- a/general_tests/export_it_test.go
+++ b/general_tests/export_it_test.go
@@ -430,40 +430,35 @@ func testExpVerifyActionProfiles(t *testing.T) {
 		},
 		Actions: []*engine.APAction{
 			{
-				ID:        "TOPUP",
-				FilterIDs: []string{},
-				Type:      utils.MetaTopUp,
-				Path:      utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestBalance" + utils.NestingSep + utils.Value,
-				Value:     config.NewRSRParsersMustCompile("10", utils.InfieldSep),
+				ID:    "TOPUP",
+				Type:  utils.MetaTopUp,
+				Path:  utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestBalance" + utils.NestingSep + utils.Value,
+				Value: config.NewRSRParsersMustCompile("10", utils.InfieldSep),
 			},
 
 			{
-				ID:        "SET_BALANCE_TEST_DATA",
-				FilterIDs: []string{},
-				Type:      utils.MetaSetBalance,
-				Path:      utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Type,
-				Value:     config.NewRSRParsersMustCompile(utils.MetaData, utils.InfieldSep),
+				ID:    "SET_BALANCE_TEST_DATA",
+				Type:  utils.MetaSetBalance,
+				Path:  utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Type,
+				Value: config.NewRSRParsersMustCompile(utils.MetaData, utils.InfieldSep),
 			},
 			{
-				ID:        "TOPUP_TEST_DATA",
-				FilterIDs: []string{},
-				Type:      utils.MetaTopUp,
-				Path:      utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Value,
-				Value:     config.NewRSRParsersMustCompile("1024", utils.InfieldSep),
+				ID:    "TOPUP_TEST_DATA",
+				Type:  utils.MetaTopUp,
+				Path:  utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Value,
+				Value: config.NewRSRParsersMustCompile("1024", utils.InfieldSep),
 			},
 			{
-				ID:        "SET_BALANCE_TEST_VOICE",
-				FilterIDs: []string{},
-				Type:      utils.MetaSetBalance,
-				Path:      utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Type,
-				Value:     config.NewRSRParsersMustCompile(utils.MetaVoice, utils.InfieldSep),
+				ID:    "SET_BALANCE_TEST_VOICE",
+				Type:  utils.MetaSetBalance,
+				Path:  utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Type,
+				Value: config.NewRSRParsersMustCompile(utils.MetaVoice, utils.InfieldSep),
 			},
 			{
-				ID:        "TOPUP_TEST_VOICE",
-				FilterIDs: []string{},
-				Type:      utils.MetaTopUp,
-				Path:      utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Value,
-				Value:     config.NewRSRParsersMustCompile("15m15s", utils.InfieldSep),
+				ID:    "TOPUP_TEST_VOICE",
+				Type:  utils.MetaTopUp,
+				Path:  utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Value,
+				Value: config.NewRSRParsersMustCompile("15m15s", utils.InfieldSep),
 			},
 		},
 	}
@@ -495,10 +490,9 @@ func testExpVerifyAccountProfiles(t *testing.T) {
 		Weight:    20,
 		Balances: map[string]*utils.Balance{
 			"MonetaryBalance": {
-				ID:        "MonetaryBalance",
-				FilterIDs: []string{},
-				Weight:    10,
-				Type:      "*monetary",
+				ID:     "MonetaryBalance",
+				Weight: 10,
+				Type:   "*monetary",
 				CostIncrements: []*utils.CostIncrement{
 					{
 						FilterIDs:    []string{"fltr1", "fltr2"},
@@ -507,8 +501,7 @@ func testExpVerifyAccountProfiles(t *testing.T) {
 						RecurrentFee: utils.NewDecimal(33, 1),
 					},
 				},
-				AttributeIDs:   []string{"attr1", "attr2"},
-				RateProfileIDs: []string{},
+				AttributeIDs: []string{"attr1", "attr2"},
 				UnitFactors: []*utils.UnitFactor{
 					{
 						FilterIDs: []string{"fltr1", "fltr2"},