diff --git a/ees/elastic_test.go b/ees/elastic_test.go
new file mode 100644
index 000000000..e1d96eefa
--- /dev/null
+++ b/ees/elastic_test.go
@@ -0,0 +1,246 @@
+/*
+Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Copyright (C) ITsysCOM GmbH
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+package ees
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/cgrates/cgrates/config"
+	"github.com/cgrates/cgrates/utils"
+)
+
+func TestID(t *testing.T) {
+	ee := &ElasticEe{
+		id: "3",
+	}
+	if rcv := ee.ID(); !reflect.DeepEqual(rcv, "3") {
+		t.Errorf("Expected %+v \n but got %+v", "3", rcv)
+	}
+}
+
+func TestGetMetrics(t *testing.T) {
+	dc, err := newEEMetrics(utils.FirstNonEmpty(
+		"Local",
+		utils.EmptyString,
+	))
+	if err != nil {
+		t.Error(err)
+	}
+	ee := &ElasticEe{
+		dc: dc,
+	}
+
+	if rcv := ee.GetMetrics(); !reflect.DeepEqual(rcv, ee.dc) {
+		t.Errorf("Expected %+v \n but got %+v", utils.ToJSON(rcv), utils.ToJSON(ee.dc))
+	}
+}
+
+func TestInitClient(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	ee.cgrCfg.EEsCfg().Exporters[0].ExportPath = "/\x00"
+	errExpect := `cannot create client: parse "/\x00": net/url: invalid control character in URL`
+	if err := ee.init(); err == nil || err.Error() != errExpect {
+		t.Errorf("Expected %+v \n but got %+v", errExpect, err)
+	}
+}
+func TestInitCase1(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsIndex] = "test"
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	if err := ee.init(); err != nil {
+		t.Error(err)
+	}
+	eeExpect := "test"
+	if !reflect.DeepEqual(ee.opts.Index, eeExpect) {
+		t.Errorf("Expected %+v \n but got %+v", eeExpect, ee.opts.Index)
+	}
+}
+
+func TestInitCase2(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsIfPrimaryTerm] = 20
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	if err := ee.init(); err != nil {
+		t.Error(err)
+	}
+	eeExpect := utils.IntPointer(20)
+	if !reflect.DeepEqual(ee.opts.IfPrimaryTerm, eeExpect) {
+		t.Errorf("Expected %+v \n but got %+v", utils.ToJSON(eeExpect), utils.ToJSON(ee.opts.IfPrimaryTerm))
+	}
+}
+
+func TestInitCase2Err(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsIfPrimaryTerm] = "test"
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	errExpect := "strconv.ParseInt: parsing \"test\": invalid syntax"
+	if err := ee.init(); err == nil || err.Error() != errExpect {
+		t.Errorf("Expected %+v \n but got %+v", errExpect, err)
+	}
+}
+
+func TestInitCase3(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsIfSeqNo] = 20
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	if err := ee.init(); err != nil {
+		t.Error(err)
+	}
+	eeExpect := utils.IntPointer(20)
+	if !reflect.DeepEqual(ee.opts.IfSeqNo, eeExpect) {
+		t.Errorf("Expected %+v \n but got %+v", utils.ToJSON(eeExpect), utils.ToJSON(ee.opts.IfSeqNo))
+	}
+}
+
+func TestInitCase3Err(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsIfSeqNo] = "test"
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	errExpect := "strconv.ParseInt: parsing \"test\": invalid syntax"
+	if err := ee.init(); err == nil || err.Error() != errExpect {
+		t.Errorf("Expected %+v \n but got %+v", errExpect, err)
+	}
+}
+
+func TestInitCase4(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsOpType] = "test"
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	if err := ee.init(); err != nil {
+		t.Error(err)
+	}
+	eeExpect := "test"
+	if !reflect.DeepEqual(ee.opts.OpType, eeExpect) {
+		t.Errorf("Expected %+v \n but got %+v", utils.ToJSON(eeExpect), utils.ToJSON(ee.opts.OpType))
+	}
+}
+
+func TestInitCase5(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsPipeline] = "test"
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	if err := ee.init(); err != nil {
+		t.Error(err)
+	}
+	eeExpect := "test"
+	if !reflect.DeepEqual(ee.opts.Pipeline, eeExpect) {
+		t.Errorf("Expected %+v \n but got %+v", utils.ToJSON(eeExpect), utils.ToJSON(ee.opts.Pipeline))
+	}
+}
+
+func TestInitCase6(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsRouting] = "test"
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	if err := ee.init(); err != nil {
+		t.Error(err)
+	}
+	eeExpect := "test"
+	if !reflect.DeepEqual(ee.opts.Routing, eeExpect) {
+		t.Errorf("Expected %+v \n but got %+v", utils.ToJSON(eeExpect), utils.ToJSON(ee.opts.Routing))
+	}
+}
+
+func TestInitCase7(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsTimeout] = "test"
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	errExpect := "time: invalid duration \"test\""
+	if err := ee.init(); err == nil || err.Error() != errExpect {
+		t.Errorf("Expected %+v \n but got %+v", errExpect, err)
+	}
+}
+
+func TestInitCase8(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsVersionLow] = 20
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	if err := ee.init(); err != nil {
+		t.Error(err)
+	}
+	eeExpect := utils.IntPointer(20)
+	if !reflect.DeepEqual(ee.opts.Version, eeExpect) {
+		t.Errorf("Expected %+v \n but got %+v", utils.ToJSON(eeExpect), utils.ToJSON(ee.opts.Version))
+	}
+}
+
+func TestInitCase8Err(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsVersionLow] = "test"
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	errExpect := "strconv.ParseInt: parsing \"test\": invalid syntax"
+	if err := ee.init(); err == nil || err.Error() != errExpect {
+		t.Errorf("Expected %+v \n but got %+v", errExpect, err)
+	}
+}
+
+func TestInitCase9(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsVersionType] = "test"
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	if err := ee.init(); err != nil {
+		t.Error(err)
+	}
+	eeExpect := "test"
+	if !reflect.DeepEqual(ee.opts.VersionType, eeExpect) {
+		t.Errorf("Expected %+v \n but got %+v", utils.ToJSON(eeExpect), utils.ToJSON(ee.opts.VersionType))
+	}
+}
+
+func TestInitCase10(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].Opts[utils.ElsWaitForActiveShards] = "test"
+	ee := &ElasticEe{
+		cgrCfg: cgrCfg,
+	}
+	if err := ee.init(); err != nil {
+		t.Error(err)
+	}
+	eeExpect := "test"
+	if !reflect.DeepEqual(ee.opts.WaitForActiveShards, eeExpect) {
+		t.Errorf("Expected %+v \n but got %+v", utils.ToJSON(eeExpect), utils.ToJSON(ee.opts.WaitForActiveShards))
+	}
+}
diff --git a/ees/filecsv.go b/ees/filecsv.go
index b56714825..76dc7a162 100644
--- a/ees/filecsv.go
+++ b/ees/filecsv.go
@@ -21,6 +21,7 @@ package ees
 import (
 	"encoding/csv"
 	"fmt"
+	"io"
 	"os"
 	"path"
 	"sync"
@@ -45,7 +46,7 @@ type FileCSVee struct {
 	cgrCfg    *config.CGRConfig
 	cfgIdx    int // index of config instance within ERsCfg.Readers
 	filterS   *engine.FilterS
-	file      *os.File
+	file      io.WriteCloser
 	csvWriter *csv.Writer
 	sync.RWMutex
 	dc utils.MapStorage
diff --git a/ees/filecsv_it_test.go b/ees/filecsv_it_test.go
index 8098991b0..4f6386590 100644
--- a/ees/filecsv_it_test.go
+++ b/ees/filecsv_it_test.go
@@ -541,3 +541,28 @@ func testCsvExportNotFoundExporter(t *testing.T) {
 	}
 
 }
+
+func TestCsvInitFileCSV(t *testing.T) {
+	cgrCfg := config.NewDefaultCGRConfig()
+	cgrCfg.EEsCfg().Exporters[0].ExportPath = "/tmp/TestInitFileCSV"
+	if err := os.MkdirAll("/tmp/TestInitFileCSV", 0666); err != nil {
+		t.Error(err)
+	}
+	dc, err := newEEMetrics(utils.FirstNonEmpty(
+		"Local",
+		utils.EmptyString,
+	))
+	if err != nil {
+		t.Error(err)
+	}
+	fCsv := &FileCSVee{
+		cgrCfg: cgrCfg,
+		dc:     dc,
+	}
+	if err := fCsv.init(); err != nil {
+		t.Error(err)
+	}
+	if err := os.RemoveAll("/tmp/TestInitFileCSV"); err != nil {
+		t.Error(err)
+	}
+}
diff --git a/ees/filecsv_test.go b/ees/filecsv_test.go
new file mode 100644
index 000000000..6f82a9928
--- /dev/null
+++ b/ees/filecsv_test.go
@@ -0,0 +1,52 @@
+/*
+Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Copyright (C) ITsysCOM GmbH
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+package ees
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/cgrates/cgrates/utils"
+)
+
+func TestFileCsvID(t *testing.T) {
+	fCsv := &FileCSVee{
+		id: "3",
+	}
+	if rcv := fCsv.ID(); !reflect.DeepEqual(rcv, "3") {
+		t.Errorf("Expected %+v \n but got %+v", "3", rcv)
+	}
+}
+
+func TestFileCsvGetMetrics(t *testing.T) {
+	dc, err := newEEMetrics(utils.FirstNonEmpty(
+		"Local",
+		utils.EmptyString,
+	))
+	if err != nil {
+		t.Error(err)
+	}
+	fCsv := &FileCSVee{
+		dc: dc,
+	}
+
+	if rcv := fCsv.GetMetrics(); !reflect.DeepEqual(rcv, fCsv.dc) {
+		t.Errorf("Expected %+v \n but got %+v", utils.ToJSON(rcv), utils.ToJSON(fCsv.dc))
+	}
+}