diff --git a/tests/dcaegen2-collectors-datafile/resources/common-keywords.robot b/tests/dcaegen2-collectors-datafile/resources/common-keywords.robot
new file mode 100644
index 0000000..a113537
--- /dev/null
+++ b/tests/dcaegen2-collectors-datafile/resources/common-keywords.robot
@@ -0,0 +1,18 @@
+*** Settings ***
+Library		OperatingSystem
+Library		RequestsLibrary
+Library		Process
+
+*** Variables ***
+
+${CLI_MRSIM_CTR_REQUESTS}                  curl http://${SIM_IP}:2222/ctr_requests
+${CLI_MRSIM_CTR_RESPONSES}                 curl http://${SIM_IP}:2222/ctr_responses
+${CLI_MRSIM_CTR_FILES}                     curl http://${SIM_IP}:2222/ctr_unique_files
+
+*** Keywords ***
+
+MR Sim Emitted Files Equal
+	[Documentation]				Verify that the number of emitted unique files are equal to a target value    
+	[Arguments]            		${target_ctr_value}
+    ${resp}=					Run Process     ${CLI_MRSIM_CTR_FILES}  shell=yes
+    Should Be Equal As Strings  ${resp.stdout}  ${target_ctr_value}
\ No newline at end of file
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
new file mode 100755
index 0000000..a59fec6
--- /dev/null
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
@@ -0,0 +1,89 @@
+*** Settings ***
+Library		OperatingSystem
+Library		RequestsLibrary
+Library		Process
+
+Resource	../../resources/common-keywords.robot
+
+*** Variables ***
+
+
+*** Test Cases ***
+
+######### Single file, SFTP
+
+Verify single event with single 1MB SFTP file. From event poll to published file
+	[TAGS]							DFC_FUNCTIONAL_1
+	[Documentation]					Verify single event with single SFTP 1MB file from event poll to published file.
+    Set Environment Variable  		MR_TC           --tc100
+    ${cli_cmd_output}=          	Run Process     ./simulators-start.sh    cwd=${SIMGROUP_ROOT}
+	MR Sim Emitted Files Equal    	0													                                #Verify 0 file emitted from MR sim
+	${cli_cmd_output}=          	Run Process		${DFC_ROOT}/dfc-start.sh  cwd=${DFC_ROOT}
+	Wait Until Keyword Succeeds	1 minute	10 sec	MR Sim Emitted Files Equal    	1	                                #Verify 1 file emitted from MR sim
+	${cli_cmd_output}=				Run Process     ${SIMGROUP_ROOT}/simulators-kill.sh
+	${cli_cmd_output}=				Run Process     ${DFC_ROOT}/dfc-kill.sh
+
+Verify single event with single 5MB SFTP file. From event poll to published file
+	[TAGS]							DFC_FUNCTIONAL_2
+	[Documentation]					Verify single event with single SFTP 5MB file from event poll to published file.
+    Set Environment Variable  		MR_TC           --tc101
+    ${cli_cmd_output}=          	Run Process     ./simulators-start.sh    cwd=${SIMGROUP_ROOT}
+	MR Sim Emitted Files Equal    	0													                                #Verify 0 file emitted from MR sim
+	${cli_cmd_output}=          	Run Process		${DFC_ROOT}/dfc-start.sh  cwd=${DFC_ROOT}
+	Wait Until Keyword Succeeds	1 minute	10 sec	MR Sim Emitted Files Equal    	1	                                #Verify 1 file emitted from MR sim
+	${cli_cmd_output}=				Run Process     ${SIMGROUP_ROOT}/simulators-kill.sh
+	${cli_cmd_output}=				Run Process     ${DFC_ROOT}/dfc-kill.sh
+
+Verify single event with single 50MB SFTP file. From event poll to published file
+	[TAGS]							DFC_FUNCTIONAL_3
+	[Documentation]					Verify single event with single SFTP 50MB file from event poll to published file.
+    Set Environment Variable  		MR_TC           --tc102
+    ${cli_cmd_output}=          	Run Process     ./simulators-start.sh    cwd=${SIMGROUP_ROOT}
+	MR Sim Emitted Files Equal    	0													                                #Verify 0 file emitted from MR sim
+	${cli_cmd_output}=          	Run Process		${DFC_ROOT}/dfc-start.sh  cwd=${DFC_ROOT}
+	Wait Until Keyword Succeeds	1 minute	10 sec	MR Sim Emitted Files Equal    	1	                                #Verify 1 file emitted from MR sim
+	${cli_cmd_output}=				Run Process     ${SIMGROUP_ROOT}/simulators-kill.sh
+	${cli_cmd_output}=				Run Process     ${DFC_ROOT}/dfc-kill.sh
+
+
+######### Single file, FTPS
+
+Verify single event with single 1MB FTPS file. From event poll to published file
+	[TAGS]							DFC_FUNCTIONAL_10
+	[Documentation]					Verify single event with single FTPS 1MB file from event poll to published file.
+    Set Environment Variable  		MR_TC           --tc200
+    ${cli_cmd_output}=          	Run Process     ./simulators-start.sh    cwd=${SIMGROUP_ROOT}
+	MR Sim Emitted Files Equal    	0													                                #Verify 0 file emitted from MR sim
+	${cli_cmd_output}=          	Run Process		${DFC_ROOT}/dfc-start.sh  cwd=${DFC_ROOT}
+	Wait Until Keyword Succeeds	1 minute	10 sec	MR Sim Emitted Files Equal    	1	                                #Verify 1 file emitted from MR sim
+	${cli_cmd_output}=				Run Process     ${SIMGROUP_ROOT}/simulators-kill.sh
+	${cli_cmd_output}=				Run Process     ${DFC_ROOT}/dfc-kill.sh
+
+Verify single event with single 5MB FTPS file. From event poll to published file
+	[TAGS]							DFC_FUNCTIONAL_11
+	[Documentation]					Verify single event with single FTPS 5MB file from event poll to published file.
+    Set Environment Variable  		MR_TC           --tc201
+    ${cli_cmd_output}=          	Run Process     ./simulators-start.sh    cwd=${SIMGROUP_ROOT}
+	MR Sim Emitted Files Equal    	0													                                #Verify 0 file emitted from MR sim
+	${cli_cmd_output}=          	Run Process		${DFC_ROOT}/dfc-start.sh  cwd=${DFC_ROOT}
+	Wait Until Keyword Succeeds	1 minute	10 sec	MR Sim Emitted Files Equal    	1	                                #Verify 1 file emitted from MR sim
+	${cli_cmd_output}=				Run Process     ${SIMGROUP_ROOT}/simulators-kill.sh
+	${cli_cmd_output}=				Run Process     ${DFC_ROOT}/dfc-kill.sh
+
+Verify single event with single 50MB FTPS file. From event poll to published file
+	[TAGS]							DFC_FUNCTIONAL_12
+	[Documentation]					Verify single event with single FTPS 50MB file from event poll to published file.
+    Set Environment Variable  		MR_TC           --tc202
+    ${cli_cmd_output}=          	Run Process     ./simulators-start.sh    cwd=${SIMGROUP_ROOT}
+	MR Sim Emitted Files Equal    	0													                                #Verify 0 file emitted from MR sim
+	${cli_cmd_output}=          	Run Process		${DFC_ROOT}/dfc-start.sh  cwd=${DFC_ROOT}
+	Wait Until Keyword Succeeds	1 minute	10 sec	MR Sim Emitted Files Equal    	1	                                #Verify 1 file emitted from MR sim
+	${cli_cmd_output}=				Run Process     ${SIMGROUP_ROOT}/simulators-kill.sh
+	${cli_cmd_output}=				Run Process     ${DFC_ROOT}/dfc-kill.sh
+
+
+*** Keywords ***
+
+
+    
+    
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/__init__.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/__init__.robot
new file mode 100755
index 0000000..dc2d837
--- /dev/null
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    DFC Functional test suite. Single event with single file.
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/ManagementInterface-suite/MI.robot b/tests/dcaegen2-collectors-datafile/testsuites/ManagementInterface-suite/MI.robot
index 7020042..875228b 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/ManagementInterface-suite/MI.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/ManagementInterface-suite/MI.robot
@@ -1,12 +1,14 @@
 *** Settings ***
 Library       OperatingSystem
 Library       RequestsLibrary
+Library  Process
 
 *** Variables ***
 
 
 *** Test Cases ***
 
+
 Heartbeat test
     [Documentation]    Check DFC heartbeat
     Heartbeat    	   I'm living
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/ManagementInterface-suite/__init__.robot b/tests/dcaegen2-collectors-datafile/testsuites/ManagementInterface-suite/__init__.robot
index c5ea9c6..6dc1eed 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/ManagementInterface-suite/__init__.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/ManagementInterface-suite/__init__.robot
@@ -1,2 +1,2 @@
 *** Settings ***
-Documentation    Management Interface suite
+Documentation    DFC Management Interface suite