diff --git a/ees/elastic_it_test.go b/ees/elastic_it_test.go
index f1c1f6d7a..7da80f688 100644
--- a/ees/elastic_it_test.go
+++ b/ees/elastic_it_test.go
@@ -120,111 +120,103 @@ func testElasticStartElasticsearch(t *testing.T) {
 func testElasticExportEvents(t *testing.T) {
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"ElasticsearchExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         1.01,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         1.01,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
 
 	eventData := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"ElasticsearchExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "dataEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaData,
-					utils.OriginID:     "abcdef",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "AnotherTenant",
-					utils.Category:     "call", //for data CDR use different Tenant
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Nanosecond,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         0.012,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "dataEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaData,
+				utils.OriginID:     "abcdef",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "AnotherTenant",
+				utils.Category:     "call", //for data CDR use different Tenant
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Nanosecond,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         0.012,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
 
 	eventSMS := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"ElasticsearchExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "SMSEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaSMS,
-					utils.OriginID:     "sdfwer",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        time.Duration(1),
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         0.15,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "SMSEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaSMS,
+				utils.OriginID:     "sdfwer",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        time.Duration(1),
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         0.15,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
 
 	eventSMSNoFields := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"ElasticExporterWithNoFields"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "SMSEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaSMS,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.RunID:        utils.MetaDefault,
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "SMSEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaSMS,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.RunID:        utils.MetaDefault,
 			},
 			Opts: map[string]interface{}{
 				"ExporterUsed": "ElasticExporterWithNoFields",
diff --git a/ees/filecsv_it_test.go b/ees/filecsv_it_test.go
index 513c93ed7..8098991b0 100644
--- a/ees/filecsv_it_test.go
+++ b/ees/filecsv_it_test.go
@@ -108,84 +108,78 @@ func testCsvRPCConn(t *testing.T) {
 func testCsvExportEvent(t *testing.T) {
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"CSVExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         1.01,
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         1.01,
 			},
 		},
 	}
 
 	eventData := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"CSVExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "dataEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaData,
-					utils.OriginID:     "abcdef",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "AnotherTenant",
-					utils.Category:     "call", //for data CDR use different Tenant
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Nanosecond,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         0.012,
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "dataEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaData,
+				utils.OriginID:     "abcdef",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "AnotherTenant",
+				utils.Category:     "call", //for data CDR use different Tenant
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Nanosecond,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         0.012,
 			},
 		},
 	}
 
 	eventSMS := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"CSVExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "SMSEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaSMS,
-					utils.OriginID:     "sdfwer",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        1,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         0.15,
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "SMSEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaSMS,
+				utils.OriginID:     "sdfwer",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        1,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         0.15,
 			},
 		},
 	}
@@ -233,62 +227,58 @@ func testCsvVerifyExports(t *testing.T) {
 func testCsvExportComposedEvent(t *testing.T) {
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"CSVExporterComposed"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:         utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:           utils.MetaVoice,
-					"ComposedOriginID1": "dsaf",
-					"ComposedOriginID2": "dsaf",
-					utils.OriginHost:    "192.168.1.1",
-					utils.RequestType:   utils.MetaRated,
-					utils.Tenant:        "cgrates.org",
-					utils.Category:      "call",
-					utils.AccountField:  "1001",
-					utils.Subject:       "1001",
-					utils.Destination:   "1002",
-					utils.SetupTime:     time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:    time.Unix(1383813746, 0).UTC(),
-					utils.Usage:         10 * time.Second,
-					utils.RunID:         utils.MetaDefault,
-					utils.Cost:          1.016374,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:         utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:           utils.MetaVoice,
+				"ComposedOriginID1": "dsaf",
+				"ComposedOriginID2": "dsaf",
+				utils.OriginHost:    "192.168.1.1",
+				utils.RequestType:   utils.MetaRated,
+				utils.Tenant:        "cgrates.org",
+				utils.Category:      "call",
+				utils.AccountField:  "1001",
+				utils.Subject:       "1001",
+				utils.Destination:   "1002",
+				utils.SetupTime:     time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:    time.Unix(1383813746, 0).UTC(),
+				utils.Usage:         10 * time.Second,
+				utils.RunID:         utils.MetaDefault,
+				utils.Cost:          1.016374,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
 
 	eventSMS := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"CSVExporterComposed"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "SMSEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:         utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:           utils.MetaSMS,
-					"ComposedOriginID1": "sdf",
-					"ComposedOriginID2": "wer",
-					utils.OriginHost:    "192.168.1.1",
-					utils.RequestType:   utils.MetaRated,
-					utils.Tenant:        "cgrates.org",
-					utils.Category:      "call",
-					utils.AccountField:  "1001",
-					utils.Subject:       "1001",
-					utils.Destination:   "1002",
-					utils.SetupTime:     time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:    time.Unix(1383813746, 0).UTC(),
-					utils.Usage:         1,
-					utils.RunID:         utils.MetaDefault,
-					utils.Cost:          0.155462,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "SMSEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:         utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:           utils.MetaSMS,
+				"ComposedOriginID1": "sdf",
+				"ComposedOriginID2": "wer",
+				utils.OriginHost:    "192.168.1.1",
+				utils.RequestType:   utils.MetaRated,
+				utils.Tenant:        "cgrates.org",
+				utils.Category:      "call",
+				utils.AccountField:  "1001",
+				utils.Subject:       "1001",
+				utils.Destination:   "1002",
+				utils.SetupTime:     time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:    time.Unix(1383813746, 0).UTC(),
+				utils.Usage:         1,
+				utils.RunID:         utils.MetaDefault,
+				utils.Cost:          0.155462,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
@@ -339,28 +329,26 @@ func testCsvExportMaskedDestination(t *testing.T) {
 
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"CSVMaskedDestination"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "+4986517174963",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         1.01,
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "+4986517174963",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         1.01,
 			},
 		},
 	}
@@ -396,90 +384,84 @@ func testCsvVerifyMaskedDestination(t *testing.T) {
 func testCsvExportEventWithInflateTemplate(t *testing.T) {
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"CSVExporterWIthTemplate"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         1.01,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         1.01,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
 
 	eventData := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"CSVExporterWIthTemplate"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "dataEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaData,
-					utils.OriginID:     "abcdef",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "AnotherTenant",
-					utils.Category:     "call", //for data CDR use different Tenant
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Nanosecond,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         0.012,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "dataEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaData,
+				utils.OriginID:     "abcdef",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "AnotherTenant",
+				utils.Category:     "call", //for data CDR use different Tenant
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Nanosecond,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         0.012,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
 
 	eventSMS := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"CSVExporterWIthTemplate"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "SMSEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaSMS,
-					utils.OriginID:     "sdfwer",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        1,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         0.15,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "SMSEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaSMS,
+				utils.OriginID:     "sdfwer",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        1,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         0.15,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
@@ -526,30 +508,28 @@ func testCsvVerifyExportsWithInflateTemplate(t *testing.T) {
 func testCsvExportNotFoundExporter(t *testing.T) {
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"ExporterNotFound"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         1.01,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         1.01,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
diff --git a/ees/filefwv_it_test.go b/ees/filefwv_it_test.go
index 653a4d7c3..0cd9fc890 100644
--- a/ees/filefwv_it_test.go
+++ b/ees/filefwv_it_test.go
@@ -99,30 +99,28 @@ func testFwvRPCConn(t *testing.T) {
 func testFwvExportEvent(t *testing.T) {
 	event := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"FwvExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "Event",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.OrderID:      1,
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC),
-					utils.AnswerTime:   time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         2.34567,
-					"ExtraFields":      map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "Event",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.OrderID:      1,
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC),
+				utils.AnswerTime:   time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         2.34567,
+				"ExtraFields":      map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"},
 			},
 		},
 	}
diff --git a/ees/httppost_it_test.go b/ees/httppost_it_test.go
index 9d6e6a405..d5a9e6c80 100644
--- a/ees/httppost_it_test.go
+++ b/ees/httppost_it_test.go
@@ -116,113 +116,105 @@ func testHTTPStartHTTPServer(t *testing.T) {
 func testHTTPExportEvent(t *testing.T) {
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"HTTPPostExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         1.01,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         1.01,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
 
 	eventData := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"HTTPPostExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "dataEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaData,
-					utils.OriginID:     "abcdef",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "AnotherTenant",
-					utils.Category:     "call", //for data CDR use different Tenant
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Nanosecond,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         0.012,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "dataEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaData,
+				utils.OriginID:     "abcdef",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "AnotherTenant",
+				utils.Category:     "call", //for data CDR use different Tenant
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Nanosecond,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         0.012,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
 
 	eventSMS := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"HTTPPostExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "SMSEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaSMS,
-					utils.OriginID:     "sdfwer",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        1,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         0.15,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "SMSEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaSMS,
+				utils.OriginID:     "sdfwer",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        1,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         0.15,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
 
 	eventSMSNoFields := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"HTTPPostExporterWithNoFields"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "SMSEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaSMS,
-					utils.OriginID:     "sms2",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.RunID:        utils.MetaDefault,
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "SMSEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaSMS,
+				utils.OriginID:     "sms2",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.RunID:        utils.MetaDefault,
 			},
 		},
 	}
diff --git a/ees/posterjsonmap_it_test.go b/ees/posterjsonmap_it_test.go
index a99ae53d9..5fbae5de0 100644
--- a/ees/posterjsonmap_it_test.go
+++ b/ees/posterjsonmap_it_test.go
@@ -113,30 +113,28 @@ func testHTTPJsonMapStartHTTPServer(t *testing.T) {
 func testHTTPJsonMapExportEvent(t *testing.T) {
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"HTTPJsonMapExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         1.01,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         1.01,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 			Opts: map[string]interface{}{
 				utils.MetaEventType: utils.CDR,
@@ -146,30 +144,28 @@ func testHTTPJsonMapExportEvent(t *testing.T) {
 
 	eventData := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"HTTPJsonMapExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "dataEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaData,
-					utils.OriginID:     "abcdef",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "AnotherTenant",
-					utils.Category:     "call", //for data CDR use different Tenant
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Nanosecond,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         0.012,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "dataEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("abcdef", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaData,
+				utils.OriginID:     "abcdef",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "AnotherTenant",
+				utils.Category:     "call", //for data CDR use different Tenant
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Nanosecond,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         0.012,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 			Opts: map[string]interface{}{
 				utils.MetaEventType: utils.CDR,
@@ -179,31 +175,29 @@ func testHTTPJsonMapExportEvent(t *testing.T) {
 
 	eventSMS := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"HTTPJsonMapExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "SMSEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaSMS,
-					utils.OriginID:     "sdfwer",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        1,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         0.15,
-					utils.OrderID:      10,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "SMSEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("sdfwer", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaSMS,
+				utils.OriginID:     "sdfwer",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        1,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         0.15,
+				utils.OrderID:      10,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 			Opts: map[string]interface{}{
 				utils.MetaEventType: utils.CDR,
@@ -213,20 +207,18 @@ func testHTTPJsonMapExportEvent(t *testing.T) {
 
 	eventSMSNoFields := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"HTTPJsonMapExporterWithNoFields"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "SMSEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaSMS,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Destination:  "1002",
-					utils.RunID:        utils.MetaDefault,
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "SMSEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaSMS,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Destination:  "1002",
+				utils.RunID:        utils.MetaDefault,
 			},
 		},
 	}
diff --git a/ees/sql_it_test.go b/ees/sql_it_test.go
index 6ad665360..66c8bdee1 100644
--- a/ees/sql_it_test.go
+++ b/ees/sql_it_test.go
@@ -144,30 +144,28 @@ func testSqlEeRPCConn(t *testing.T) {
 func testSqlEeExportEventFull(t *testing.T) {
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"SQLExporterFull"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         1.01,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         1.01,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
@@ -182,30 +180,28 @@ func testSqlEeExportEventFull(t *testing.T) {
 func testSqlEeExportEventPartial(t *testing.T) {
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"SQLExporterPartial"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("asd", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        utils.MetaDefault,
-					utils.Cost:         123,
-					"ExtraFields": map[string]string{"extra1": "val_extra1",
-						"extra2": "val_extra2", "extra3": "val_extra3"},
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("asd", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        utils.MetaDefault,
+				utils.Cost:         123,
+				"ExtraFields": map[string]string{"extra1": "val_extra1",
+					"extra2": "val_extra2", "extra3": "val_extra3"},
 			},
 		},
 	}
diff --git a/ees/virtual_ee_it_test.go b/ees/virtual_ee_it_test.go
index 3960c4809..3f075b0f0 100644
--- a/ees/virtual_ee_it_test.go
+++ b/ees/virtual_ee_it_test.go
@@ -101,28 +101,26 @@ func testVirtRPCConn(t *testing.T) {
 func testVirtExportSupplierEvent(t *testing.T) {
 	supplierEvent := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"RouteExporter"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "supplierEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        "SupplierRun",
-					utils.Cost:         1.23,
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "supplierEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        "SupplierRun",
+				utils.Cost:         1.23,
 			},
 		},
 	}
@@ -137,28 +135,26 @@ func testVirtExportSupplierEvent(t *testing.T) {
 func testVirtExportEvents(t *testing.T) {
 	eventVoice := &utils.CGREventWithEeIDs{
 		EeIDs: []string{"CSVExporterFromVirt"},
-		CGREventWithOpts: &utils.CGREventWithOpts{
-			CGREvent: &utils.CGREvent{
-				Tenant: "cgrates.org",
-				ID:     "voiceEvent",
-				Time:   utils.TimePointer(time.Now()),
-				Event: map[string]interface{}{
-					utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
-					utils.ToR:          utils.MetaVoice,
-					utils.OriginID:     "dsafdsaf",
-					utils.OriginHost:   "192.168.1.1",
-					utils.RequestType:  utils.MetaRated,
-					utils.Tenant:       "cgrates.org",
-					utils.Category:     "call",
-					utils.AccountField: "1001",
-					utils.Subject:      "1001",
-					utils.Destination:  "1002",
-					utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
-					utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
-					utils.Usage:        10 * time.Second,
-					utils.RunID:        "SupplierRun",
-					utils.Cost:         1.01,
-				},
+		CGREvent: &utils.CGREvent{
+			Tenant: "cgrates.org",
+			ID:     "voiceEvent",
+			Time:   utils.TimePointer(time.Now()),
+			Event: map[string]interface{}{
+				utils.CGRID:        utils.Sha1("dsafdsaf", time.Unix(1383813745, 0).UTC().String()),
+				utils.ToR:          utils.MetaVoice,
+				utils.OriginID:     "dsafdsaf",
+				utils.OriginHost:   "192.168.1.1",
+				utils.RequestType:  utils.MetaRated,
+				utils.Tenant:       "cgrates.org",
+				utils.Category:     "call",
+				utils.AccountField: "1001",
+				utils.Subject:      "1001",
+				utils.Destination:  "1002",
+				utils.SetupTime:    time.Unix(1383813745, 0).UTC(),
+				utils.AnswerTime:   time.Unix(1383813746, 0).UTC(),
+				utils.Usage:        10 * time.Second,
+				utils.RunID:        "SupplierRun",
+				utils.Cost:         1.01,
 			},
 		},
 	}