diff --git a/engine/responder_test.go b/engine/responder_test.go
index f89433a76..1decc865e 100644
--- a/engine/responder_test.go
+++ b/engine/responder_test.go
@@ -56,13 +56,13 @@ func TestResponderGetDerivedChargers(t *testing.T) {
 
 func TestGetDerivedMaxSessionTime(t *testing.T) {
 	testTenant := "vdf"
-	cdr := &utils.StoredCdr{CgrId: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderId: 123, TOR: utils.VOICE, AccId: "dsafdsaf",
+	cdr := utils.StoredCdr{CgrId: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderId: 123, TOR: utils.VOICE, AccId: "dsafdsaf",
 		CdrHost: "192.168.1.1", CdrSource: "test", ReqType: "rated", Direction: "*out", Tenant: testTenant, Category: "call", Account: "dan", Subject: "dan",
 		Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC),
 		MediationRunId: utils.DEFAULT_RUNID, Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"},
 		Cost: 1.01, RatedAccount: "dan", RatedSubject: "dan"}
 	var maxSessionTime float64
-	if err := rsponder.GetDerivedMaxSessionTime(cdr.AsEvent(""), &maxSessionTime); err != nil {
+	if err := rsponder.GetDerivedMaxSessionTime(cdr, &maxSessionTime); err != nil {
 		t.Error(err)
 	} else if maxSessionTime != -1 {
 		t.Error("Unexpected maxSessionTime received: ", maxSessionTime)
@@ -114,7 +114,7 @@ func TestGetDerivedMaxSessionTime(t *testing.T) {
 	} else if !reflect.DeepEqual(dcs, charger1) {
 		t.Errorf("Expecting: %+v, received: %+v ", charger1, dcs)
 	}
-	if err := rsponder.GetDerivedMaxSessionTime(cdr.AsEvent(""), &maxSessionTime); err != nil {
+	if err := rsponder.GetDerivedMaxSessionTime(cdr, &maxSessionTime); err != nil {
 		t.Error(err)
 	} else if maxSessionTime != 1e+10 { // Smallest one, 10 seconds
 		t.Error("Unexpected maxSessionTime received: ", maxSessionTime)
@@ -123,7 +123,7 @@ func TestGetDerivedMaxSessionTime(t *testing.T) {
 
 func TestGetSessionRuns(t *testing.T) {
 	testTenant := "vdf"
-	cdr := &utils.StoredCdr{CgrId: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderId: 123, TOR: utils.VOICE, AccId: "dsafdsaf",
+	cdr := utils.StoredCdr{CgrId: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderId: 123, TOR: utils.VOICE, AccId: "dsafdsaf",
 		CdrHost: "192.168.1.1", CdrSource: "test", ReqType: "prepaid", Direction: "*out", Tenant: testTenant, Category: "call", Account: "dan2", Subject: "dan2",
 		Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC),
 		MediationRunId: utils.DEFAULT_RUNID, Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"},
@@ -150,7 +150,7 @@ func TestGetSessionRuns(t *testing.T) {
 			CallDescriptor: &CallDescriptor{Direction: "*out", Category: "call", Tenant: "vdf", Subject: "ivo", Account: "ivo", Destination: "1002", TimeStart: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC)}},
 		&SessionRun{DerivedCharger: dfDC,
 			CallDescriptor: &CallDescriptor{Direction: "*out", Category: "call", Tenant: "vdf", Subject: "dan2", Account: "dan2", Destination: "1002", TimeStart: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC)}}}
-	if err := rsponder.GetSessionRuns(cdr.AsEvent(""), &sesRuns); err != nil {
+	if err := rsponder.GetSessionRuns(cdr, &sesRuns); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eSRuns, sesRuns) {
 		t.Errorf("Received: %+v", sesRuns)