diff --git a/agents/asterisk_event_test.go b/agents/asterisk_event_test.go
index 0765e89b4..94aa13dd9 100644
--- a/agents/asterisk_event_test.go
+++ b/agents/asterisk_event_test.go
@@ -377,6 +377,7 @@ func TestSMAEventUpdateFromEvent(t *testing.T) {
 }
 */
 
+//Here
 func TestSMAEventAsSMGenericEvent(t *testing.T) {
 	var ev map[string]interface{}
 	if err := json.Unmarshal([]byte(stasisStart), &ev); err != nil {
diff --git a/engine/fscdr_test.go b/engine/fscdr_test.go
index 11c866a9f..6c796779e 100644
--- a/engine/fscdr_test.go
+++ b/engine/fscdr_test.go
@@ -525,3 +525,16 @@ func TestFsCdrDDazRSRExtraFields(t *testing.T) {
 		t.Errorf("Unexpected effective_caller_id_number received: %+v", extraFields["effective_caller_id_number"])
 	}
 }
+
+func TestFsCdrFirstDefined(t *testing.T) {
+	fsCdr, _ := NewFSCdr(body, fsCdrCfg)
+	value := fsCdr.firstDefined([]string{utils.CGR_SUBJECT, utils.CGR_ACCOUNT, FS_USERNAME}, FsUsername)
+	if value != "1001" {
+		t.Errorf("Expecting: 1001, received: %s", value)
+	}
+	value = fsCdr.firstDefined([]string{utils.CGR_ACCOUNT, FS_USERNAME}, FsUsername)
+	if value != "1001" {
+		t.Errorf("Expecting: 1001, received: %s", value)
+	}
+
+}