diff --git a/src/tests/test_devices.c b/src/tests/test_devices.c
index 8a19e63..ae32c1c 100644
--- a/src/tests/test_devices.c
+++ b/src/tests/test_devices.c
@@ -28,12 +28,13 @@
 
 /*--------------------------------------------------------------------------*/
 
-void device_create_set_state_remove(const char *capability, const char *test_name_true, const char *test_name_false)
+void device_create_set_state_free(const char *capability, const char *test_name_true, const char *test_name_false)
 {
     struct json_object *root_node;
     devices_manager_t *dm;
     int ret;
     char *device_serialized;
+
     dm = devices_manager_new();
     ASSERT_NOT_NULL(dm);
 
@@ -73,6 +74,13 @@ void device_create_set_state_remove(const char *capability, const char *test_nam
 
 /*--------------------------------------------------------------------------*/
 
+void device_create_three_devices_remove_second(const char *capability)
+{
+
+}
+
+/*--------------------------------------------------------------------------*/
+
 void device_create_error_case(const char *capability)
 {
     struct json_object *root_node;
diff --git a/src/tests/test_outlet.c b/src/tests/test_outlet.c
index 900e51f..8b1dfbf 100644
--- a/src/tests/test_outlet.c
+++ b/src/tests/test_outlet.c
@@ -32,9 +32,9 @@
 
 /*--------------------------------------------------------------------------*/
 
-TEST("Outlet    - create set_state remove\t")
+TEST("Outlet    - create set_state free\t")
 {
-    device_create_set_state_remove(kOutletEntry, kOutletTestNameTrue, kOutletTestNameFalse);
+    device_create_set_state_free(kOutletEntry, kOutletTestNameTrue, kOutletTestNameFalse);
 }
 
 /*--------------------------------------------------------------------------*/
diff --git a/src/tests/test_shutter.c b/src/tests/test_shutter.c
index c48917c..d6c54d2 100644
--- a/src/tests/test_shutter.c
+++ b/src/tests/test_shutter.c
@@ -32,9 +32,9 @@
 
 /*--------------------------------------------------------------------------*/
 
-TEST("Shutter   - create set_state remove\t")
+TEST("Shutter   - create set_state free\t")
 {
-    device_create_set_state_remove(kShutterEntry, kShutterTestNameTrue, kShutterTestNameFalse);
+    device_create_set_state_free(kShutterEntry, kShutterTestNameTrue, kShutterTestNameFalse);
 }
 
 /*--------------------------------------------------------------------------*/
diff --git a/src/tests/test_sprinkler.c b/src/tests/test_sprinkler.c
index 6b64a7e..6b1b1e0 100644
--- a/src/tests/test_sprinkler.c
+++ b/src/tests/test_sprinkler.c
@@ -32,9 +32,16 @@
 
 /*--------------------------------------------------------------------------*/
 
-TEST("Sprinkler - create set_state remove\t")
+TEST("Sprinkler - create set_state free\t")
 {
-    device_create_set_state_remove(kSprinklerEntry, kSprinklerTestNameTrue, kSprinklerTestNameFalse);
+    device_create_set_state_free(kSprinklerEntry, kSprinklerTestNameTrue, kSprinklerTestNameFalse);
+}
+
+/*--------------------------------------------------------------------------*/
+
+TEST("Sprinkler - create 3 devices and remove second\t")
+{
+    device_create_three_devices_remove_second(kSprinklerEntry);
 }
 
 /*--------------------------------------------------------------------------*/