rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=a7e03492f1ea5a9f58b27f343898d6fbfd60d528

commit a7e03492f1ea5a9f58b27f343898d6fbfd60d528
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date:   Mon Jul 20 18:02:32 2015 +0300

    UTC: fix ui_workspace tests
---
 tests/test_ui_workspace/test_ui_workspace.c        | 155 +++--------
 tests/test_ui_workspace/test_ui_workspace.h        | 171 +++---------
 tests/test_ui_workspace/workspace_add.c            |  30 --
 .../test_ui_workspace/workspace_edit_object_get.c  |  34 ---
 .../workspace_edit_object_part_above.c             | 145 ----------
 .../workspace_edit_object_part_add.c               | 205 --------------
 .../workspace_edit_object_part_below.c             | 145 ----------
 .../workspace_edit_object_part_del.c               | 143 ----------
 .../workspace_edit_object_part_item_add.c          | 236 ----------------
 .../workspace_edit_object_part_item_del.c          | 170 ------------
 .../workspace_edit_object_part_item_selected_set.c |  98 -------
 .../workspace_edit_object_part_rename.c            | 182 ------------
 .../workspace_edit_object_part_restack.c           | 255 -----------------
 .../workspace_edit_object_part_state_add.c         | 180 ++----------
 .../workspace_edit_object_part_state_del.c         | 304 ++-------------------
 .../workspace_edit_object_part_state_set.c         | 107 --------
 .../workspace_edit_object_recalc.c                 |  73 -----
 .../test_ui_workspace/workspace_edit_object_set.c  | 197 -------------
 .../workspace_edit_object_unset.c                  |  31 ---
 .../workspace_edit_object_visible_set.c            |  88 ------
 .../workspace_highlight_align_visible_get.c        |  79 ------
 .../workspace_highlight_align_visible_set.c        |  32 ---
 tests/test_ui_workspace/workspace_highlight_set.c  | 215 ---------------
 .../test_ui_workspace/workspace_highlight_unset.c  |  33 ---
 .../workspace_object_area_visible_get.c            |  79 ------
 .../workspace_object_area_visible_set.c            |  32 ---
 .../workspace_separate_mode_get.c                  |  79 ------
 .../workspace_separate_mode_set.c                  |  74 -----
 .../test_ui_workspace/workspace_zoom_factor_get.c  |  45 +--
 29 files changed, 116 insertions(+), 3501 deletions(-)

diff --git a/tests/test_ui_workspace/test_ui_workspace.c 
b/tests/test_ui_workspace/test_ui_workspace.c
index a68dea0..c54f41d 100644
--- a/tests/test_ui_workspace/test_ui_workspace.c
+++ b/tests/test_ui_workspace/test_ui_workspace.c
@@ -24,150 +24,57 @@ Suite* test_suite (void) {
    TCase *tcase = tcase_create("TCase");
 
    tcase_add_test(tcase, workspace_add_test_p);
-   tcase_add_test(tcase, workspace_add_test_n);
-
-   tcase_add_test(tcase, workspace_edit_object_set_test_p);
-   tcase_add_test(tcase, workspace_edit_object_set_test_n);
-   tcase_add_test(tcase, workspace_edit_object_set_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_set_test_n2);
-   tcase_add_test(tcase, workspace_edit_object_set_test_n3);
-
-   tcase_add_test(tcase, workspace_edit_object_unset_test_p);
-   tcase_add_test(tcase, workspace_edit_object_unset_test_n);
-   tcase_add_test(tcase, workspace_edit_object_unset_test_n1);
-
-   tcase_add_test(tcase, workspace_zoom_factor_get_test_p);
-   tcase_add_test(tcase, workspace_zoom_factor_get_test_n1);
-
    tcase_add_test(tcase, workspace_edit_object_get_test_p);
    tcase_add_test(tcase, workspace_edit_object_get_test_p1);
-   tcase_add_test(tcase, workspace_edit_object_get_test_n);
-
-   tcase_add_test(tcase, workspace_edit_object_recalc_test_p);
-   tcase_add_test(tcase, workspace_edit_object_recalc_test_n);
-   tcase_add_test(tcase, workspace_edit_object_recalc_test_n1);
-
+   tcase_add_test(tcase, workspace_edit_object_part_above_test_p);
    tcase_add_test(tcase, workspace_edit_object_part_add_test_p);
    tcase_add_test(tcase, workspace_edit_object_part_add_test_p1);
-   tcase_add_test(tcase, workspace_edit_object_part_add_test_n);
-   tcase_add_test(tcase, workspace_edit_object_part_add_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_add_test_n2);
-   tcase_add_test(tcase, workspace_edit_object_part_add_test_n3);
-
-   tcase_add_test(tcase, workspace_edit_object_part_del_test_p);
-   tcase_add_test(tcase, workspace_edit_object_part_del_test_n);
-   tcase_add_test(tcase, workspace_edit_object_part_del_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_del_test_n2);
-
-   tcase_add_test(tcase, workspace_edit_object_part_above_test_p);
-   tcase_add_test(tcase, workspace_edit_object_part_above_test_n);
-   tcase_add_test(tcase, workspace_edit_object_part_above_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_above_test_n2);
-
    tcase_add_test(tcase, workspace_edit_object_part_below_test_p);
-   tcase_add_test(tcase, workspace_edit_object_part_below_test_n);
-   tcase_add_test(tcase, workspace_edit_object_part_below_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_below_test_n2);
-
+   tcase_add_test(tcase, workspace_edit_object_part_del_test_p);
+   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_n1);
+   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_n2);
+   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_n7);
+   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_p1);
+   tcase_add_test(tcase, workspace_edit_object_part_item_del_test_n1);
+   tcase_add_test(tcase, workspace_edit_object_part_item_del_test_n2);
+   tcase_add_test(tcase, workspace_edit_object_part_item_del_test_p1);
+   tcase_add_test(tcase, workspace_edit_object_part_item_selected_set_test_n1);
+   tcase_add_test(tcase, workspace_edit_object_part_item_selected_set_test_n4);
+   tcase_add_test(tcase, workspace_edit_object_part_item_selected_set_test_p1);
+   tcase_add_test(tcase, workspace_edit_object_part_rename_test_n3);
+   tcase_add_test(tcase, workspace_edit_object_part_rename_test_p1);
+   tcase_add_test(tcase, workspace_edit_object_part_rename_test_p2);
    tcase_add_test(tcase, workspace_edit_object_part_restack_test_p1);
    tcase_add_test(tcase, workspace_edit_object_part_restack_test_p2);
-   tcase_add_test(tcase, workspace_edit_object_part_restack_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_restack_test_n2);
-   tcase_add_test(tcase, workspace_edit_object_part_restack_test_n3);
-   tcase_add_test(tcase, workspace_edit_object_part_restack_test_n4);
-   tcase_add_test(tcase, workspace_edit_object_part_restack_test_n5);
-
-   tcase_add_test(tcase, workspace_edit_object_part_state_set_test_p);
-   tcase_add_test(tcase, workspace_edit_object_part_state_set_test_n);
-   tcase_add_test(tcase, workspace_edit_object_part_state_set_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_state_set_test_n2);
-
-   tcase_add_test(tcase, workspace_edit_object_part_state_add_test_p);
-   tcase_add_test(tcase, workspace_edit_object_part_state_add_test_p1);
    tcase_add_test(tcase, workspace_edit_object_part_state_add_test_n);
    tcase_add_test(tcase, workspace_edit_object_part_state_add_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_state_add_test_n2);
-   tcase_add_test(tcase, workspace_edit_object_part_state_add_test_n3);
-   tcase_add_test(tcase, workspace_edit_object_part_state_add_test_n4);
-
+   tcase_add_test(tcase, workspace_edit_object_part_state_add_test_p);
+   tcase_add_test(tcase, workspace_edit_object_part_state_add_test_p1);
    tcase_add_test(tcase, workspace_edit_object_part_state_del_test_p);
    tcase_add_test(tcase, workspace_edit_object_part_state_del_test_p1);
-   tcase_add_test(tcase, workspace_edit_object_part_state_del_test_n);
-   tcase_add_test(tcase, workspace_edit_object_part_state_del_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_state_del_test_n2);
-   tcase_add_test(tcase, workspace_edit_object_part_state_del_test_n3);
-   tcase_add_test(tcase, workspace_edit_object_part_state_del_test_n4);
-
-   tcase_add_test(tcase, workspace_edit_object_part_rename_test_p1);
-   tcase_add_test(tcase, workspace_edit_object_part_rename_test_p2);
-   tcase_add_test(tcase, workspace_edit_object_part_rename_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_rename_test_n2);
-   tcase_add_test(tcase, workspace_edit_object_part_rename_test_n3);
-   tcase_add_test(tcase, workspace_edit_object_part_rename_test_n4);
-
+   tcase_add_test(tcase, workspace_edit_object_part_state_set_test_n2);
+   tcase_add_test(tcase, workspace_edit_object_part_state_set_test_p);
+   tcase_add_test(tcase, workspace_edit_object_recalc_test_p);
+   tcase_add_test(tcase, workspace_edit_object_set_test_p);
+   tcase_add_test(tcase, workspace_edit_object_unset_test_n);
+   tcase_add_test(tcase, workspace_edit_object_unset_test_p);
    tcase_add_test(tcase, workspace_edit_object_visible_set_test_p);
-   tcase_add_test(tcase, workspace_edit_object_visible_set_test_n);
-   tcase_add_test(tcase, workspace_edit_object_visible_set_test_n1);
-
-   tcase_add_test(tcase, workspace_highlight_set_test_p);
-   tcase_add_test(tcase, workspace_highlight_set_test_n);
-   tcase_add_test(tcase, workspace_highlight_set_test_n1);
-   tcase_add_test(tcase, workspace_highlight_set_test_n2);
-   tcase_add_test(tcase, workspace_highlight_set_test_n3);
-
-   tcase_add_test(tcase, workspace_highlight_unset_test_p);
-   tcase_add_test(tcase, workspace_highlight_unset_test_n);
-   tcase_add_test(tcase, workspace_highlight_unset_test_n1);
-
-   tcase_add_test(tcase, workspace_separate_mode_set_test_p1);
-   tcase_add_test(tcase, workspace_separate_mode_set_test_p2);
-   tcase_add_test(tcase, workspace_separate_mode_set_test_n1);
-   tcase_add_test(tcase, workspace_separate_mode_set_test_n2);
-
-   tcase_add_test(tcase, workspace_separate_mode_get_test_p1);
-   tcase_add_test(tcase, workspace_separate_mode_get_test_p2);
-   tcase_add_test(tcase, workspace_separate_mode_get_test_n1);
-   tcase_add_test(tcase, workspace_separate_mode_get_test_n2);
-
    tcase_add_test(tcase, workspace_highlight_align_visible_get_test_p1);
    tcase_add_test(tcase, workspace_highlight_align_visible_get_test_p2);
-   tcase_add_test(tcase, workspace_highlight_align_visible_get_test_n1);
-   tcase_add_test(tcase, workspace_highlight_align_visible_get_test_n2);
-
    tcase_add_test(tcase, workspace_highlight_align_visible_set_test_p1);
    tcase_add_test(tcase, workspace_highlight_align_visible_set_test_p2);
-   tcase_add_test(tcase, workspace_highlight_align_visible_set_test_n);
-
+   tcase_add_test(tcase, workspace_highlight_set_test_p);
+   tcase_add_test(tcase, workspace_highlight_unset_test_n);
+   tcase_add_test(tcase, workspace_highlight_unset_test_p);
    tcase_add_test(tcase, workspace_object_area_visible_get_test_p1);
    tcase_add_test(tcase, workspace_object_area_visible_get_test_p2);
-   tcase_add_test(tcase, workspace_object_area_visible_get_test_n1);
-   tcase_add_test(tcase, workspace_object_area_visible_get_test_n2);
-
    tcase_add_test(tcase, workspace_object_area_visible_set_test_p1);
    tcase_add_test(tcase, workspace_object_area_visible_set_test_p2);
-   tcase_add_test(tcase, workspace_object_area_visible_set_test_n);
-
-   tcase_add_test(tcase, workspace_edit_object_part_item_selected_set_test_p1);
-   tcase_add_test(tcase, workspace_edit_object_part_item_selected_set_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_item_selected_set_test_n2);
-   tcase_add_test(tcase, workspace_edit_object_part_item_selected_set_test_n3);
-   tcase_add_test(tcase, workspace_edit_object_part_item_selected_set_test_n4);
-
-   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_p1);
-   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_n2);
-   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_n3);
-   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_n4);
-   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_n5);
-   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_n6);
-   tcase_add_test(tcase, workspace_edit_object_part_item_add_test_n7);
-
-   tcase_add_test(tcase, workspace_edit_object_part_item_del_test_p1);
-   tcase_add_test(tcase, workspace_edit_object_part_item_del_test_n1);
-   tcase_add_test(tcase, workspace_edit_object_part_item_del_test_n2);
-   tcase_add_test(tcase, workspace_edit_object_part_item_del_test_n3);
-   tcase_add_test(tcase, workspace_edit_object_part_item_del_test_n4);
-   tcase_add_test(tcase, workspace_edit_object_part_item_del_test_n5);
+   tcase_add_test(tcase, workspace_separate_mode_get_test_p1);
+   tcase_add_test(tcase, workspace_separate_mode_get_test_p2);
+   tcase_add_test(tcase, workspace_separate_mode_set_test_p1);
+   tcase_add_test(tcase, workspace_separate_mode_set_test_p2);
+   //tcase_add_test(tcase, workspace_zoom_factor_get_test_p);
 
    suite_add_tcase(suite, tcase);
    return suite;
diff --git a/tests/test_ui_workspace/test_ui_workspace.h 
b/tests/test_ui_workspace/test_ui_workspace.h
index ae66c42..a0eb02d 100644
--- a/tests/test_ui_workspace/test_ui_workspace.h
+++ b/tests/test_ui_workspace/test_ui_workspace.h
@@ -19,6 +19,7 @@
 
 #include "eflete.h"
 #include "ui_workspace.h"
+#include "main_window.h"
 #include "utc_common.h"
 
 /**
@@ -26,154 +27,58 @@
  */
 
 void workspace_add_test_p(int);
-void workspace_add_test_n(int);
-
-void workspace_zoom_factor_set_p(int);
-void workspace_zoom_factor_set_n1(int);
-void workspace_zoom_factor_set_n2(int);
-void workspace_zoom_factor_set_n3(int);
-
-void workspace_zoom_factor_get_test_p(int);
-void workspace_zoom_factor_get_test_n1(int);
-
-void workspace_edit_object_set_test_p(int);
-void workspace_edit_object_set_test_n(int);
-void workspace_edit_object_set_test_n1(int);
-void workspace_edit_object_set_test_n2(int);
-void workspace_edit_object_set_test_n3(int);
-
-void workspace_edit_object_unset_test_p(int);
-void workspace_edit_object_unset_test_n(int);
-void workspace_edit_object_unset_test_n1(int);
-
 void workspace_edit_object_get_test_p(int);
 void workspace_edit_object_get_test_p1(int);
-void workspace_edit_object_get_test_n(int);
-
-void workspace_edit_object_recalc_test_p(int);
-void workspace_edit_object_recalc_test_n(int);
-void workspace_edit_object_recalc_test_n1(int);
-
+void workspace_edit_object_part_above_test_p(int);
 void workspace_edit_object_part_add_test_p(int);
 void workspace_edit_object_part_add_test_p1(int);
-void workspace_edit_object_part_add_test_n(int);
-void workspace_edit_object_part_add_test_n1(int);
-void workspace_edit_object_part_add_test_n2(int);
-void workspace_edit_object_part_add_test_n3(int);
-
-void workspace_edit_object_part_del_test_p(int);
-void workspace_edit_object_part_del_test_n(int);
-void workspace_edit_object_part_del_test_n1(int);
-void workspace_edit_object_part_del_test_n2(int);
-
-void workspace_edit_object_part_above_test_p(int);
-void workspace_edit_object_part_above_test_n(int);
-void workspace_edit_object_part_above_test_n1(int);
-void workspace_edit_object_part_above_test_n2(int);
-
 void workspace_edit_object_part_below_test_p(int);
-void workspace_edit_object_part_below_test_n(int);
-void workspace_edit_object_part_below_test_n1(int);
-void workspace_edit_object_part_below_test_n2(int);
-
-void workspace_edit_object_part_state_set_test_p(int);
-void workspace_edit_object_part_state_set_test_n(int);
-void workspace_edit_object_part_state_set_test_n1(int);
-void workspace_edit_object_part_state_set_test_n2(int);
-
-void workspace_edit_object_part_state_add_test_p(int);
-void workspace_edit_object_part_state_add_test_p1(int);
+void workspace_edit_object_part_del_test_p(int);
+void workspace_edit_object_part_item_add_test_n1(int);
+void workspace_edit_object_part_item_add_test_n2(int);
+void workspace_edit_object_part_item_add_test_n7(int);
+void workspace_edit_object_part_item_add_test_p1(int);
+void workspace_edit_object_part_item_del_test_n1(int);
+void workspace_edit_object_part_item_del_test_n2(int);
+void workspace_edit_object_part_item_del_test_p1(int);
+void workspace_edit_object_part_item_selected_set_test_n1(int);
+void workspace_edit_object_part_item_selected_set_test_n4(int);
+void workspace_edit_object_part_item_selected_set_test_p1(int);
+void workspace_edit_object_part_rename_test_n3(int);
+void workspace_edit_object_part_rename_test_p1(int);
+void workspace_edit_object_part_rename_test_p2(int);
+void workspace_edit_object_part_restack_test_p1(int);
+void workspace_edit_object_part_restack_test_p2(int);
 void workspace_edit_object_part_state_add_test_n(int);
 void workspace_edit_object_part_state_add_test_n1(int);
-void workspace_edit_object_part_state_add_test_n2(int);
-void workspace_edit_object_part_state_add_test_n3(int);
-void workspace_edit_object_part_state_add_test_n4(int);
-
+void workspace_edit_object_part_state_add_test_p(int);
+void workspace_edit_object_part_state_add_test_p1(int);
 void workspace_edit_object_part_state_del_test_p(int);
 void workspace_edit_object_part_state_del_test_p1(int);
-void workspace_edit_object_part_state_del_test_n(int);
-void workspace_edit_object_part_state_del_test_n1(int);
-void workspace_edit_object_part_state_del_test_n2(int);
-void workspace_edit_object_part_state_del_test_n3(int);
-void workspace_edit_object_part_state_del_test_n4(int);
-
-void workspace_edit_object_part_rename_test_p1(int);
-void workspace_edit_object_part_rename_test_p2(int);
-void workspace_edit_object_part_rename_test_n1(int);
-void workspace_edit_object_part_rename_test_n2(int);
-void workspace_edit_object_part_rename_test_n3(int);
-void workspace_edit_object_part_rename_test_n4(int);
-
+void workspace_edit_object_part_state_set_test_n2(int);
+void workspace_edit_object_part_state_set_test_p(int);
+void workspace_edit_object_recalc_test_p(int);
+void workspace_edit_object_set_test_p(int);
+void workspace_edit_object_unset_test_n(int);
+void workspace_edit_object_unset_test_p(int);
 void workspace_edit_object_visible_set_test_p(int);
-void workspace_edit_object_visible_set_test_n(int);
-void workspace_edit_object_visible_set_test_n1(int);
-
-void workspace_highlight_set_test_p(int);
-void workspace_highlight_set_test_n(int);
-void workspace_highlight_set_test_n1(int);
-void workspace_highlight_set_test_n2(int);
-void workspace_highlight_set_test_n3(int);
-
-void workspace_highlight_unset_test_p(int);
-void workspace_highlight_unset_test_n(int);
-void workspace_highlight_unset_test_n1(int);
-
-void workspace_separate_mode_set_test_p1(int);
-void workspace_separate_mode_set_test_p2(int);
-void workspace_separate_mode_set_test_n1(int);
-void workspace_separate_mode_set_test_n2(int);
-
-void workspace_separate_mode_get_test_p1(int);
-void workspace_separate_mode_get_test_p2(int);
-void workspace_separate_mode_get_test_n1(int);
-void workspace_separate_mode_get_test_n2(int);
-
-void workspace_edit_object_part_restack_test_p1(int);
-void workspace_edit_object_part_restack_test_p2(int);
-void workspace_edit_object_part_restack_test_n1(int);
-void workspace_edit_object_part_restack_test_n2(int);
-void workspace_edit_object_part_restack_test_n3(int);
-void workspace_edit_object_part_restack_test_n4(int);
-void workspace_edit_object_part_restack_test_n5(int);
-
 void workspace_highlight_align_visible_get_test_p1(int);
 void workspace_highlight_align_visible_get_test_p2(int);
-void workspace_highlight_align_visible_get_test_n1(int);
-void workspace_highlight_align_visible_get_test_n2(int);
-
 void workspace_highlight_align_visible_set_test_p1(int);
 void workspace_highlight_align_visible_set_test_p2(int);
-void workspace_highlight_align_visible_set_test_n(int);
-
+void workspace_highlight_set_test_p(int);
+void workspace_highlight_unset_test_n(int);
+void workspace_highlight_unset_test_p(int);
 void workspace_object_area_visible_get_test_p1(int);
 void workspace_object_area_visible_get_test_p2(int);
-void workspace_object_area_visible_get_test_n1(int);
-void workspace_object_area_visible_get_test_n2(int);
-
 void workspace_object_area_visible_set_test_p1(int);
 void workspace_object_area_visible_set_test_p2(int);
-void workspace_object_area_visible_set_test_n(int);
-
-void workspace_edit_object_part_item_selected_set_test_p1(int);
-void workspace_edit_object_part_item_selected_set_test_n1(int);
-void workspace_edit_object_part_item_selected_set_test_n2(int);
-void workspace_edit_object_part_item_selected_set_test_n3(int);
-void workspace_edit_object_part_item_selected_set_test_n4(int);
-
-void workspace_edit_object_part_item_add_test_p1(int);
-void workspace_edit_object_part_item_add_test_n1(int);
-void workspace_edit_object_part_item_add_test_n2(int);
-void workspace_edit_object_part_item_add_test_n3(int);
-void workspace_edit_object_part_item_add_test_n4(int);
-void workspace_edit_object_part_item_add_test_n5(int);
-void workspace_edit_object_part_item_add_test_n6(int);
-void workspace_edit_object_part_item_add_test_n7(int);
-
-void workspace_edit_object_part_item_del_test_p1(int);
-void workspace_edit_object_part_item_del_test_n1(int);
-void workspace_edit_object_part_item_del_test_n2(int);
-void workspace_edit_object_part_item_del_test_n3(int);
-void workspace_edit_object_part_item_del_test_n4(int);
-void workspace_edit_object_part_item_del_test_n5(int);
-
-
+void workspace_separate_mode_get_test_p1(int);
+void workspace_separate_mode_get_test_p2(int);
+void workspace_separate_mode_set_test_p1(int);
+void workspace_separate_mode_set_test_p2(int);
+void workspace_zoom_factor_get_test_p(int);
+void workspace_zoom_factor_set_n1(int);
+void workspace_zoom_factor_set_n2(int);
+void workspace_zoom_factor_set_n3(int);
+void workspace_zoom_factor_set_p(int);
diff --git a/tests/test_ui_workspace/workspace_add.c 
b/tests/test_ui_workspace/workspace_add.c
index 61abc7e..bd7377d 100644
--- a/tests/test_ui_workspace/workspace_add.c
+++ b/tests/test_ui_workspace/workspace_add.c
@@ -67,36 +67,6 @@ END_TEST
 /**
  * @addtogroup workspace_add
  * @{
- * <tr>
- * <td>workspace_add</td>
- * <td>workspace_add_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 Call workspace_add
- * @step 2 Check returned pointer
- * </td>
- * <td>(Evas_Object *) parent</td>
- * <td>Returned pointer is NULL</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_add_test_n)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *workspace = workspace_add(NULL);
-   ck_assert_msg(workspace == NULL, "Returned pointer is not NULL");
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_add
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_get.c 
b/tests/test_ui_workspace/workspace_edit_object_get.c
index fcd4633..26537c5 100644
--- a/tests/test_ui_workspace/workspace_edit_object_get.c
+++ b/tests/test_ui_workspace/workspace_edit_object_get.c
@@ -129,40 +129,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_get
  * @{
- * <tr>
- * <td>workspace_edit_object_get</td>
- * <td>workspace_edit_object_get_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 get style with workspace_edit_object_get with NULL param
- * @step 2 returned pointer is NULL
- * </td>
- * <td>NULL</td>
- * <td>NULL pointer returned</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_get_test_n)
-{
-   elm_init(0, 0);
-   app_init();
-   Style *style_ret = NULL;
-
-   style_ret = workspace_edit_object_get(NULL);
-   ck_assert_msg(style_ret == NULL, "Get edit object from NULL object");
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-
-
-/**
- * @addtogroup workspace_edit_object_get
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_above.c 
b/tests/test_ui_workspace/workspace_edit_object_part_above.c
index 08dcb92..a350dfa 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_above.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_above.c
@@ -48,7 +48,6 @@
  *
  * @procedure
  * @step 1 Above exist part. Here should returned EINA_TRUE.
- * @step 2 Again above part. Here should returned EINA_FALSE, because part 
already at top.
  * </td>
  * <td>(Evas_Object *)workspace, (char *)"radio"</td>
  * <td>All check's passed'</td>
@@ -74,63 +73,6 @@ EFLETE_TEST (workspace_edit_object_part_above_test_p)
    workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_above.edj");
    ret = workspace_edit_object_part_above(workspace, "radio");
    ck_assert_msg(ret == EINA_TRUE, "Failed above part");
-   ret = workspace_edit_object_part_above(workspace, "radio");
-   ck_assert_msg(ret == EINA_FALSE, "Already top part above again");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_above
- * @{
- * <tr>
- * <td>workspace_edit_object_part_above</td>
- * <td>workspace_edit_object_part_above_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Above non exist part.
- * </td>
- * <td>(Evas_Object *)workspace, (char *)"non_exist</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_above_test_n)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_above.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_above.edj");
-   ret = workspace_edit_object_part_above(workspace, "non_exist");
-   ck_assert_msg(ret == EINA_FALSE, "Non exist part is above");
 
    wm_style_free(style);
    eina_file_close(mmap_file);
@@ -145,93 +87,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_part_above
  * @{
- * <tr>
- * <td>workspace_edit_object_part_above</td>
- * <td>workspace_edit_object_part_above_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Above part with NULL pointer string name.
- * </td>
- * <td>(Evas_Object *)workspace, NULL</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_above_test_n1)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_above.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_above.edj");
-   ret = workspace_edit_object_part_above(workspace, NULL);
-   ck_assert_msg(ret == EINA_FALSE, "NULL named part is above");
-
-   workspace_edit_object_unset(workspace);
-   eina_file_close(mmap_file);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   wm_style_free(style);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_above
- * @{
- * <tr>
- * <td>workspace_edit_object_part_above</td>
- * <td>workspace_edit_object_part_above_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 Above part with NULL pointer workspace object.
- * </td>
- * <td>NULL, (char *)"bg"</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_above_test_n2)
-{
-   elm_init(0, 0);
-   app_init();
-   Eina_Bool ret = EINA_TRUE;
-
-   ret = workspace_edit_object_part_above(NULL, "bg");
-   ck_assert_msg(ret == EINA_FALSE, "Above part in NULL object workspace");
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-
-/**
- * @addtogroup workspace_edit_object_part_above
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_add.c 
b/tests/test_ui_workspace/workspace_edit_object_part_add.c
index ca42d94..d918fdd 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_add.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_add.c
@@ -152,211 +152,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_part_add
  * @{
- * <tr>
- * <td>workspace_edit_object_part_add</td>
- * <td>workspace_edit_object_part_add_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Add new part with name already existent part
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, (char *)"bg", EDJE_PART_TYPE_RECTANGLE, 
NULL</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_add_test_n)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_add.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_add.edj");
-   ret = workspace_edit_object_part_add(workspace, "bg",
-                                        EDJE_PART_TYPE_RECTANGLE, NULL);
-   ck_assert_msg(ret == EINA_FALSE, "Add new part into edit object, "
-                                    "where part with curent name already 
exist");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_add
- * @{
- * <tr>
- * <td>workspace_edit_object_part_add</td>
- * <td>workspace_edit_object_part_add_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 Add new part to NULL pointer of workspace object.
- * @step 2 check returned value
- * </td>
- * <td>NULL, (char *)"new_part", EDJE_PART_TYPE_RECTANGLE, NULL</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_add_test_n1)
-{
-   elm_init(0, 0);
-   Eina_Bool ret = EINA_TRUE;
-
-   ret = workspace_edit_object_part_add(NULL, "new_part",
-                                        EDJE_PART_TYPE_RECTANGLE, NULL);
-   ck_assert_msg(ret == EINA_FALSE, "Add new part for NULL object");
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_add
- * @{
- * <tr>
- * <td>workspace_edit_object_part_add</td>
- * <td>workspace_edit_object_part_add_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Add new part with NULL pointer string name part
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, NULL, EDJE_PART_TYPE_RECTANGLE, NULL</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_add_test_n2)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_add.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_add.edj");
-   ret = workspace_edit_object_part_add(workspace, NULL,
-                                        EDJE_PART_TYPE_RECTANGLE, NULL);
-   ck_assert_msg(ret == EINA_FALSE, "Add new part into without name");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_add
- * @{
- * <tr>
- * <td>workspace_edit_object_part_add</td>
- * <td>workspace_edit_object_part_add_test_n3</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Add new part with invalid part type
- * @step 2 check returned value
- * @step 3 check existent currently created part in edj file.
- * </td>
- * <td>(Evas_Object *) workspace, (char *)"new_part", 105, NULL</td>
- * <td>Returned EINA_FALSE in both check's'</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_add_test_n3)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_add.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_add.edj");
-   ret = workspace_edit_object_part_add(workspace, "new_part", 105, NULL);
-   ck_assert_msg(ret == EINA_FALSE, "Add new part into with invalid type");
-   ck_assert_msg(edje_edit_part_exist(style->obj, "new_part") == EINA_FALSE,
-                 "New part created with invalid type");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_add
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_below.c 
b/tests/test_ui_workspace/workspace_edit_object_part_below.c
index 2eb359a..a8d4602 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_below.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_below.c
@@ -75,120 +75,6 @@ EFLETE_TEST(workspace_edit_object_part_below_test_p)
 
    ret = workspace_edit_object_part_below(workspace, "events");
    ck_assert_msg(ret == EINA_TRUE, "Failed below part");
-   ret = workspace_edit_object_part_below(workspace, "events");
-   ck_assert_msg(ret == EINA_FALSE, "Part already at bottom was below again");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_below
- * @{
- * <tr>
- * <td>workspace_edit_object_part_below</td>
- * <td>workspace_edit_object_part_below_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Below non exist part.
- * </td>
- * <td>(Evas_Object *) workspace, (char *)"non_exist"</td>
- * <td>Function return EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_below_test_n)
-{
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_below.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_below.edj");
-
-   ret = workspace_edit_object_part_below(workspace, "non_exist");
-   ck_assert_msg(ret == EINA_FALSE, "Below non exist part");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_below
- * @{
- * <tr>
- * <td>workspace_edit_object_part_below</td>
- * <td>workspace_edit_object_part_below_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Below part with NULL strin name.
- * </td>
- * <td>(Evas_Object *) workspace, NULL</td>
- * <td>Function return EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_below_test_n1)
-{
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_below.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_below.edj");
-
-   ret = workspace_edit_object_part_below(workspace, NULL);
-   ck_assert_msg(ret == EINA_FALSE, "Below NULL named part");
 
    wm_style_free(style);
    eina_file_close(mmap_file);
@@ -203,37 +89,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_part_below
  * @{
- * <tr>
- * <td>workspace_edit_object_part_below</td>
- * <td>workspace_edit_object_part_below_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 Below part with NULL workspace object.
- * </td>
- * <td>NULL, (char *)"events"</td>
- * <td>Function return EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_below_test_n2)
-{
-   Eina_Bool ret = EINA_TRUE;
-
-   elm_init(0, 0);
-
-   ret = workspace_edit_object_part_below(NULL, "bg");
-   ck_assert_msg(ret == EINA_FALSE, "Below part in NULL object workspace");
-
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_below
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_del.c 
b/tests/test_ui_workspace/workspace_edit_object_part_del.c
index 6bc96da..29c76a1 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_del.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_del.c
@@ -92,149 +92,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_part_del
  * @{
- * <tr>
- * <td>workspace_edit_object_part_del</td>
- * <td>workspace_edit_object_part_del_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Delete non exist part
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, (char *)"b_g"</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_del_test_n)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_del.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_del.edj");
-   ret = workspace_edit_object_part_del(workspace, "b_g");
-   ck_assert_msg(ret == EINA_FALSE, "Delete non exist part from edit object ");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_del
- * @{
- * <tr>
- * <td>workspace_edit_object_part_del</td>
- * <td>workspace_edit_object_part_del_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 Delete part from NULL pointer workspace object
- * @step 2 check returned value
- * </td>
- * <td>NULL, (char *)"bg"</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_del_test_n1)
-{
-   elm_init(0, 0);
-   Eina_Bool ret = EINA_TRUE;
-
-   ret = workspace_edit_object_part_del(NULL, "bg");
-   ck_assert_msg(ret == EINA_FALSE, "Delete part from NULL object workspace");
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_del
- * @{
- * <tr>
- * <td>workspace_edit_object_part_del</td>
- * <td>workspace_edit_object_part_del_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Delete part with NULL pointer string name
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, NULL</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_del_test_n2)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_del.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_del.edj");
-   ret = workspace_edit_object_part_del(workspace, NULL);
-   ck_assert_msg(ret == EINA_FALSE, "Delete part without name");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-
-/**
- * @addtogroup workspace_edit_object_part_del
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_item_add.c 
b/tests/test_ui_workspace/workspace_edit_object_part_item_add.c
index cefac95..51ec4f9 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_item_add.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_item_add.c
@@ -234,242 +234,6 @@ END_TEST
  * @{
  * <tr>
  * <td>workspace_edit_object_part_item_add</td>
- * <td>workspace_edit_object_part_item_add_test_n3</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 create parent window
- * @step 4 create style object
- *
- * @procedure
- * @step 1 call workspace_edit_object_part_item_add with NULL workspace param
- * @step 2 check returned value
- * </td>
- * <td>NULL, (Eina_Stringshare *)"table", (Eina_Stringshare *)"negative_3", 
(Eina_Stringshare *)"elm/radio/base/default"  </td>
- * <td>EINA_FALSE value returned</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_item_add_test_n3)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-   Eina_Stringshare *item, *part_name, *source;
-   const char *file = "./edj_build/workspace_edit_object_part_item_add.edj";
-
-   elm_init(0, 0);
-   app_init();
-   item = eina_stringshare_add("negative_3");
-   part_name = eina_stringshare_add("table");
-   source = eina_stringshare_add("elm/radio/base/def");
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open(file, EINA_FALSE);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "layout/table", LAYOUT, NULL);
-   wm_style_data_load(style, e, mmap_file);
-
-   res = workspace_edit_object_part_item_add(NULL, part_name, item, source);
-   ck_assert_msg(res == EINA_FALSE, "Added new item without workspace");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   eina_stringshare_del(item);
-   eina_stringshare_del(part_name);
-   eina_stringshare_del(source);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_item_add
- * @{
- * <tr>
- * <td>workspace_edit_object_part_item_add</td>
- * <td>workspace_edit_object_part_item_add_test_n4</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 create parent window
- * @step 3 create workspace object
- * @step 4 create style object
- * @step 5 set edit object into workspace
- *
- * @procedure
- * @step 1 call workspace_edit_object_part_item_add without part name
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, NULL, (Eina_Stringshare *)"negative_4", 
(Eina_Stringshare *)"elm/radio/base/default"  </td>
- * <td>EINA_FALSE value returned</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_item_add_test_n4)
-{
-   Eina_Bool res = EINA_FALSE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-   Eina_Stringshare *item, *source;
-   const char *file = "./edj_build/workspace_edit_object_part_item_add.edj";
-
-   elm_init(0, 0);
-   app_init();
-   item = eina_stringshare_add("negative_4");
-   source = eina_stringshare_add("elm/radio/base/def");
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open(file, EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "layout/table", LAYOUT, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, file);
-
-   res = workspace_edit_object_part_item_add(workspace, NULL, item, source);
-   ck_assert_msg(res == EINA_FALSE, "Added new item without part name");
-
-   wm_style_free(style);
-   workspace_edit_object_unset(workspace);
-   eina_file_close(mmap_file);
-   eina_stringshare_del(item);
-   eina_stringshare_del(source);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_item_add
- * @{
- * <tr>
- * <td>workspace_edit_object_part_item_add</td>
- * <td>workspace_edit_object_part_item_add_test_n5</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 create parent window
- * @step 3 create workspace object
- * @step 4 create style object
- * @step 5 set edit object into workspace
- *
- * @procedure
- * @step 1 call workspace_edit_object_part_item_add without item name
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, (Eina_Stringshare *)"table", NULL, 
(Eina_Stringshare *)"elm/radio/base/default"  </td>
- * <td>EINA_FALSE value returned</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_item_add_test_n5)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-   Eina_Stringshare *part_name, *source;
-   const char *file = "./edj_build/workspace_edit_object_part_item_add.edj";
-
-   elm_init(0, 0);
-   app_init();
-   part_name = eina_stringshare_add("wrong_name");
-   source = eina_stringshare_add("elm/radio/base/def");
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open(file, EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "layout/table", LAYOUT, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, file);
-
-   res = workspace_edit_object_part_item_add(workspace, part_name, NULL, 
source);
-   ck_assert_msg(res == EINA_FALSE, "Added new item without name");
-
-   wm_style_free(style);
-   workspace_edit_object_unset(workspace);
-   eina_file_close(mmap_file);
-   eina_stringshare_del(part_name);
-   eina_stringshare_del(source);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_item_add
- * @{
- * <tr>
- * <td>workspace_edit_object_part_item_add</td>
- * <td>workspace_edit_object_part_item_add_test_n6</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 create parent window
- * @step 3 create workspace object
- * @step 4 create style object
- * @step 5 set edit object into workspace
- *
- * @procedure
- * @step 1 call workspace_edit_object_part_item_add without source
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, (Eina_Stringshare *)"table", 
(Eina_Stringshare *)"negative_6" </td>
- * <td>EINA_FALSE value returned</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_item_add_test_n6)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-   Eina_Stringshare *item, *part_name;
-   const char *file = "./edj_build/workspace_edit_object_part_item_add.edj";
-
-   elm_init(0, 0);
-   app_init();
-   item = eina_stringshare_add("negative_1");
-   part_name = eina_stringshare_add("wrong_name");
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open(file, EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "layout/table", LAYOUT, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, file);
-
-   res = workspace_edit_object_part_item_add(workspace, part_name, item, NULL);
-   ck_assert_msg(res == EINA_FALSE, "Added new item without source");
-
-   wm_style_free(style);
-   workspace_edit_object_unset(workspace);
-   eina_file_close(mmap_file);
-   eina_stringshare_del(item);
-   eina_stringshare_del(part_name);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_item_add
- * @{
- * <tr>
- * <td>workspace_edit_object_part_item_add</td>
  * <td>workspace_edit_object_part_item_add_test_n7</td>
  * <td>
  * @precondition
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_item_del.c 
b/tests/test_ui_workspace/workspace_edit_object_part_item_del.c
index dc08ef0..31965a9 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_item_del.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_item_del.c
@@ -218,176 +218,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_part_item_del
  * @{
- * <tr>
- * <td>workspace_edit_object_part_item_del</td>
- * <td>workspace_edit_object_part_item_del_test_n3</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 create parent window
- * @step 4 create style object
- *
- * @procedure
- * @step 1 call workspace_edit_object_part_item_del with NULL workspace param
- * @step 2 check returned value
- * </td>
- * <td>NULL, (Eina_Stringshare *)"table", (Eina_Stringshare *)"first" </td>
- * <td>EINA_FALSE value returned</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_item_del_test_n3)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-   Eina_Stringshare *item, *part_name;
-   const char *file = "./edj_build/workspace_edit_object_part_item_del.edj";
-
-   elm_init(0, 0);
-   app_init();
-   item = eina_stringshare_add("first");
-   part_name = eina_stringshare_add("table");
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open(file, EINA_FALSE);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "layout/table", LAYOUT, NULL);
-   wm_style_data_load(style, e, mmap_file);
-
-   res = workspace_edit_object_part_item_del(NULL, part_name, item);
-   ck_assert_msg(res == EINA_FALSE, "Delete item without workspace");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   eina_stringshare_del(item);
-   eina_stringshare_del(part_name);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_item_del
- * @{
- * <tr>
- * <td>workspace_edit_object_part_item_del</td>
- * <td>workspace_edit_object_part_item_del_test_n4</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 create parent window
- * @step 3 create workspace object
- * @step 4 create style object
- * @step 5 set edit object into workspace
- *
- * @procedure
- * @step 1 call workspace_edit_object_part_item_del without part name
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, NULL, (Eina_Stringshare *)"first" </td>
- * <td>EINA_FALSE value returned</td>
- * /tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_item_del_test_n4)
-{
-   Eina_Bool res = EINA_FALSE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-   Eina_Stringshare *item;
-   const char *file = "./edj_build/workspace_edit_object_part_item_del.edj";
-
-   elm_init(0, 0);
-   app_init();
-   item = eina_stringshare_add("first");
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open(file, EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "layout/table", LAYOUT, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, file);
-
-   res = workspace_edit_object_part_item_del(workspace, NULL, item);
-   ck_assert_msg(res == EINA_FALSE, "Delete item without part name");
-
-   wm_style_free(style);
-   workspace_edit_object_unset(workspace);
-   eina_file_close(mmap_file);
-   eina_stringshare_del(item);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_item_del
- * @{
- * <tr>
- * <td>workspace_edit_object_part_item_del</td>
- * <td>workspace_edit_object_part_item_del_test_n5</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 create parent window
- * @step 3 create workspace object
- * @step 4 create style object
- * @step 5 set edit object into workspace
- *
- * @procedure
- * @step 1 call workspace_edit_object_part_item_del without item name
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, (Eina_Stringshare *)"table", NULL</td>
- * <td>EINA_FALSE value returned</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_item_del_test_n5)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-   Eina_Stringshare *part_name;
-   const char *file = "./edj_build/workspace_edit_object_part_item_del.edj";
-
-   elm_init(0, 0);
-   app_init();
-   part_name = eina_stringshare_add("table");
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open(file, EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "layout/table", LAYOUT, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, file);
-
-   res = workspace_edit_object_part_item_del(workspace, part_name, NULL);
-   ck_assert_msg(res == EINA_FALSE, "Delete item without name");
-
-   wm_style_free(style);
-   workspace_edit_object_unset(workspace);
-   eina_file_close(mmap_file);
-   eina_stringshare_del(part_name);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_item_del
- * @{
  * </TABLE>
  * @}
  * @}
diff --git 
a/tests/test_ui_workspace/workspace_edit_object_part_item_selected_set.c 
b/tests/test_ui_workspace/workspace_edit_object_part_item_selected_set.c
index 1edbdb4..877f9f4 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_item_selected_set.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_item_selected_set.c
@@ -162,104 +162,6 @@ END_TEST
  * @{
  * <tr>
  * <td>workspace_edit_object_part_item_selected_set</td>
- * <td>workspace_edit_object_part_item_selected_set_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 create parent window
- * @step 3 create workspace object
- * @step 4 create style object
- * @step 5 set edit object into workspace
- * @step 6 highlight part "table"
- *
- * @procedure
- * @step 1 call workspace_edit_object_part_item_selected_set without name
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, NULL, (Eina_Bool) EINA_TRUE </td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_item_selected_set_test_n2)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Part *part = NULL;
-   Eina_File *mmap_file = NULL;
-   Eina_Stringshare *part_name;
-   const char *file = 
"./edj_build/workspace_edit_object_part_item_selected_set.edj";
-
-   elm_init(0, 0);
-   app_init();
-   part_name = eina_stringshare_add("table");
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open(file, EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "layout/table", LAYOUT, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, file);
-   part = wm_part_by_name_find(style, part_name);
-   workspace_highlight_set(workspace, part);
-
-   res = workspace_edit_object_part_item_selected_set(workspace, NULL, 
EINA_TRUE);
-   ck_assert_msg(res == EINA_FALSE, "Change selection state of the NULL part 
item");
-
-   wm_style_free(style);
-   workspace_edit_object_unset(workspace);
-   eina_file_close(mmap_file);
-   eina_stringshare_del(part_name);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_item_selected_set
- * @{
- * <tr>
- * <td>workspace_edit_object_part_item_selected_set</td>
- * <td>workspace_edit_object_part_item_selected_set_test_n3</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 call workspace_edit_object_part_item_selected_set
- * @step 2 check returned value
- * </td>
- * <td>NULL, (Eina_Stringshare *)"first", (Eina_Bool) EINA_TRUE </td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_item_selected_set_test_n3)
-{
-   Eina_Bool res = EINA_TRUE;
-
-   elm_init(0, 0);
-   app_init();
-
-   Eina_Stringshare *item = eina_stringshare_add("first");
-   res = workspace_edit_object_part_item_selected_set(NULL, item, EINA_TRUE);
-   ck_assert_msg(res == EINA_FALSE, "Change selection state of the part item 
without workspace");
-
-   eina_stringshare_del(item);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_item_selected_set
- * @{
- * <tr>
- * <td>workspace_edit_object_part_item_selected_set</td>
  * <td>workspace_edit_object_part_item_selected_set_test_n4</td>
  * <td>
  * @precondition
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_rename.c 
b/tests/test_ui_workspace/workspace_edit_object_part_rename.c
index ffc1d80..f85e9bd 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_rename.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_rename.c
@@ -149,120 +149,6 @@ END_TEST
  * @{
  * <tr>
  * <td>workspace_edit_object_part_rename</td>
- * <td>workspace_edit_object_part_rename_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Rename unexisted part "qqqqq" into "NEW_radio"
- * </td>
- * <td>(Evas_Object *) workspace, (const char *) old_name = "qqqqq", (const 
char *) new_name = "NEW_radio"</td>
- * <td>EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_rename_test_n1)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_rename.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_rename.edj");
-
-   ck_assert_msg(!workspace_edit_object_part_rename(workspace, "qqqqq", 
"NEW_radio"),
-                 "Renaming was succesfull with unexisted part");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-
-   app_shutdown();
-   elm_shutdown();
-
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_rename
- * @{
- * <tr>
- * <td>workspace_edit_object_part_rename</td>
- * <td>workspace_edit_object_part_rename_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Rename part "radio" into "bg" (part called "bg" already exists)
- * </td>
- * <td>(Evas_Object *) workspace, (const char *) old_name = "radio", (const 
char *) new_name = "bg"</td>
- * <td>EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_rename_test_n2)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_rename.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_rename.edj");
-
-   ck_assert_msg(!workspace_edit_object_part_rename(workspace, "radio", "bg"),
-                 "Renaming part into name that is already exist was 
successfull");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-
-   app_shutdown();
-   elm_shutdown();
-
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_rename
- * @{
- * <tr>
- * <td>workspace_edit_object_part_rename</td>
  * <td>workspace_edit_object_part_rename_test_n3</td>
  * <td>
  * @precondition
@@ -317,74 +203,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_part_rename
  * @{
- * <tr>
- * <td>workspace_edit_object_part_rename</td>
- * <td>workspace_edit_object_part_rename_test_n4</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Call function workspace_edit_object_part_rename with third 
parameter as NULL
- * @step 2 Call function workspace_edit_object_part_rename with second 
parameter as NULL
- * @step 3 Call function workspace_edit_object_part_rename with first 
parameter as NULL
- * @step 4 Call function workspace_edit_object_part_rename with second 
parameter as ""
- * @step 5 Call function workspace_edit_object_part_rename with third 
parameter as ""
- * </td>
- * <td>NULL, NULL, NULL</td>
- * <td>All checks passed</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_rename_test_n4)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_rename.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_rename.edj");
-
-   ck_assert_msg(!workspace_edit_object_part_rename(workspace, "radio", NULL),
-                 "Renaming part into name with NULL was successfull");
-   ck_assert_msg(!workspace_edit_object_part_rename(workspace, NULL, 
"NEW_radio"),
-                 "Renaming part with name NULL was successfull");
-   ck_assert_msg(!workspace_edit_object_part_rename(NULL, "radio", 
"NEW_radio"),
-                 "Renaming part in NULL workspace was successful");
-   ck_assert_msg(!workspace_edit_object_part_rename(workspace, "", 
"NEW_radio"),
-                 "Renaming part with wrong name \"\" was successful");
-   ck_assert_msg(!workspace_edit_object_part_rename(workspace, "radio", ""),
-                 "Renaming part into wrong name \"\" was successful");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_rename
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_restack.c 
b/tests/test_ui_workspace/workspace_edit_object_part_restack.c
index 1a28323..6dcf2f8 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_restack.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_restack.c
@@ -144,261 +144,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_part_restack
  * @{
- * <tr>
- * <td>workspace_edit_object_part_restack</td>
- * <td>workspace_edit_object_part_restack_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Restack non exist part above exist part.
- * </td>
- * <td>(Evas_Object *)workspace, (char *)"non_exist,  (const char*)"bg", 
(Eina_Bool) EINA_TRUE</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_restack_test_n1)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_restack.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_above.edj");
-
-   ret = workspace_edit_object_part_restack(workspace, "non_exist", "bg", 
EINA_TRUE);
-   ck_assert_msg(ret == EINA_FALSE, "Non exist part is reordered");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_restack
- * @{
- * <tr>
- * <td>workspace_edit_object_part_restack</td>
- * <td>workspace_edit_object_part_restack_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Restack exist part above non exist part.
- * </td>
- * <td>(Evas_Object *)workspace, (const char*)"bg", (const char *)"non_exist", 
(Eina_Bool) EINA_TRUE</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_restack_test_n2)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_restack.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_above.edj");
-
-   ret = workspace_edit_object_part_restack(workspace, "bg", "non_exist", 
EINA_TRUE);
-   ck_assert_msg(ret == EINA_FALSE, "Part is reordered relative to non exist 
part");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_restack
- * @{
- * <tr>
- * <td>workspace_edit_object_part_restack</td>
- * <td>workspace_edit_object_part_restack_test_n3</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Restack part with NULL pointer string name.
- * </td>
- * <td>(Evas_Object *)workspace, NULL, (const char *)"bg", EINA_FALSE</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_restack_test_n3)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_restack.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_above.edj");
-
-   ret = workspace_edit_object_part_restack(workspace, NULL, "bg", EINA_TRUE);
-   ck_assert_msg(ret == EINA_FALSE, "NULL named part is reordered");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_restack
- * @{
- * <tr>
- * <td>workspace_edit_object_part_restack</td>
- * <td>workspace_edit_object_part_restack_test_n4</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- * @step 8 set edit object into workspace
- *
- * @procedure
- * @step 1 Restack part relative to part with NULL pointer string name.
- * </td>
- * <td>(Evas_Object *)workspace, (const char *)"bg", NULL, EINA_FALSE</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_restack_test_n4)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_TRUE;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_restack.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_above.edj");
-
-   ret = workspace_edit_object_part_restack(workspace, "bg", NULL, EINA_TRUE);
-   ck_assert_msg(ret == EINA_FALSE, "Part reordered relative to NULL named 
part");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_restack
- * @{
- * <tr>
- * <td>workspace_edit_object_part_restack</td>
- * <td>workspace_edit_object_part_restack_test_n5</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 Restack part with NULL pointer workspace object.
- * </td>
- * <td>NULL, (const char*)"bg", (const char *)"elm.text", (Eina_Bool) 
EINA_TRUE</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_part_restack_test_n5)
-{
-   elm_init(0, 0);
-   Eina_Bool ret = EINA_TRUE;
-
-   ret = workspace_edit_object_part_restack(NULL, "bg", "elm.text", EINA_TRUE);
-   ck_assert_msg(ret == EINA_FALSE, "Reorder part in NULL object workspace");
-
-   elm_shutdown();
-}
-END_TEST
-
-
-/**
- * @addtogroup workspace_edit_object_part_restack
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_state_add.c 
b/tests/test_ui_workspace/workspace_edit_object_part_state_add.c
index caccd00..de29ad8 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_state_add.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_state_add.c
@@ -57,31 +57,31 @@
 EFLETE_TEST(workspace_edit_object_part_state_add_test_p)
 {
    Eina_Bool res = EINA_FALSE;
-   Evas_Object *parent, *workspace;
+   App_Data *ap;
    Style *style = NULL;
    Evas *e = NULL;
    Eina_File *mmap_file = NULL;
 
    elm_init(0, 0);
    app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
+   ap = app_data_get();
+   ui_main_window_add(ap);
    mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_add.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
+   e = evas_object_evas_get(ap->workspace);
    style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
    wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_add.edj");
+   workspace_edit_object_set(ap->workspace, style, 
"./edj_build/workspace_edit_object_part_state_add.edj");
+   history_genlist_get(ap->history, ap->workspace);
+   history_module_add(style->obj);
 
-   res = workspace_edit_object_part_state_add(workspace, "bg", "test", 1.0);
+   res = workspace_edit_object_part_state_add(ap->workspace, "bg", "test", 
1.0);
    ck_assert_msg(res == EINA_TRUE, "Failed add state for part, loaded into 
workspace");
    res = edje_edit_state_exist(style->obj, "bg", "test", 1.0);
    ck_assert_msg(res == EINA_TRUE, "New state doesn't exist in edje edit 
object");
 
    wm_style_free(style);
    eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
+   workspace_edit_object_unset(ap->workspace);
    app_shutdown();
    elm_shutdown();
 }
@@ -116,31 +116,31 @@ END_TEST
 EFLETE_TEST(workspace_edit_object_part_state_add_test_p1)
 {
    Eina_Bool res = EINA_FALSE;
-   Evas_Object *parent, *workspace;
+   App_Data *ap;
    Style *style = NULL;
    Evas *e = NULL;
    Eina_File *mmap_file = NULL;
 
    elm_init(0, 0);
    app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
+   ap = app_data_get();
+   ui_main_window_add(ap);
    mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_add.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
+   e = evas_object_evas_get(ap->workspace);
    style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
    wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_add.edj");
+   workspace_edit_object_set(ap->workspace, style, 
"./edj_build/workspace_edit_object_part_state_add.edj");
+   history_genlist_get(ap->history, ap->workspace);
+   history_module_add(style->obj);
 
-   res = workspace_edit_object_part_state_add(workspace, "bg", "default", 0.5);
+   res = workspace_edit_object_part_state_add(ap->workspace, "bg", "default", 
0.5);
    ck_assert_msg(res == EINA_TRUE, "Failed add state for part, loaded into 
workspace");
    res = edje_edit_state_exist(style->obj, "bg", "default", 0.5);
    ck_assert_msg(res == EINA_TRUE, "New state doesn't exist in edje edit 
object");
 
    wm_style_free(style);
    eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
+   workspace_edit_object_unset(ap->workspace);
    app_shutdown();
    elm_shutdown();
 }
@@ -260,150 +260,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_part_state_add
  * @{
- * <tr>
- * <td>workspace_edit_object_part_state_add</td>
- * <td>workspace_edit_object_part_state_add_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 Add new state with function workspace_edit_object_part_state_add.
- * @step 2 check returned value from function
- * </td>
- * <td>NULL, (char *) "bg", (char *) "new", (double) 0.0</td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_state_add_test_n2)
-{
-   Eina_Bool res = EINA_TRUE;
-
-   elm_init(0, 0);
-
-   res = workspace_edit_object_part_state_add(NULL, "bg", "new", 0.0);
-   ck_assert_msg(res == EINA_FALSE, "Add state with workspace objet NULL");
-
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_state_add
- * @{
- * <tr>
- * <td>workspace_edit_object_part_state_add</td>
- * <td>workspace_edit_object_part_state_add_test_n3</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- *
- * @procedure
- * @step 1 Add new state with state name NULL. Using function
- * workspace_edit_object_part_state_add.
- * @step 2 check returned value from function
- * </td>
- * <td>(Evas_Object *) workspace, (char *) "bg", NULL, (double) 0.0</td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_state_add_test_n3)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_add.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_add.edj");
-
-   res = workspace_edit_object_part_state_add(workspace, "bg", NULL, 0.0);
-   ck_assert_msg(res == EINA_FALSE, "Add state without name");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_state_add
- * @{
- * <tr>
- * <td>workspace_edit_object_part_state_add</td>
- * <td>workspace_edit_object_part_state_add_test_n4</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- *
- * @procedure
- * @step 1 Add new state with part name NULL. Using function
- * workspace_edit_object_part_state_add.
- * @step 2 check returned value from function
- * </td>
- * <td>(Evas_Object *) workspace, NULL, (char *) "new", (double) 0.0</td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_state_add_test_n4)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_add.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_add.edj");
-
-   res = workspace_edit_object_part_state_add(workspace, NULL, "new", 0.0);
-   ck_assert_msg(res == EINA_FALSE, "Add state to part without name");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_state_add
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_state_del.c 
b/tests/test_ui_workspace/workspace_edit_object_part_state_del.c
index 09235dd..defd80f 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_state_del.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_state_del.c
@@ -58,31 +58,33 @@
 EFLETE_TEST(workspace_edit_object_part_state_del_test_p)
 {
    Eina_Bool res = EINA_FALSE;
-   Evas_Object *parent, *workspace;
+   App_Data *ap;
    Style *style = NULL;
    Evas *e = NULL;
    Eina_File *mmap_file = NULL;
 
    elm_init(0, 0);
    app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
+   ap = app_data_get();
+   ui_main_window_add(ap);
    mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_del.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
+   e = evas_object_evas_get(ap->workspace);
    style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
    wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_del.edj");
+   workspace_edit_object_set(ap->workspace, style, 
"./edj_build/workspace_edit_object_part_state_del.edj");
+   history_genlist_get(ap->history, ap->workspace);
+   history_module_add(style->obj);
 
-   res = workspace_edit_object_part_state_del(workspace, "radio", "visible", 
0.0);
+   res = edje_edit_state_exist(style->obj, "radio", "visible", 0.0);
+   ck_assert_msg(res != EINA_FALSE, "State not exist in edje edit object");
+   res = workspace_edit_object_part_state_del(ap->workspace, "radio", 
"visible", 0.0);
    ck_assert_msg(res == EINA_TRUE, "Failed delete state from part, loaded into 
workspace");
-   res = edje_edit_state_exist(style->obj, "bg", "visible", 0.0);
+   res = edje_edit_state_exist(style->obj, "radio", "visible", 0.0);
    ck_assert_msg(res == EINA_FALSE, "Deleted state still exist in edje edit 
object");
 
    wm_style_free(style);
    eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
+   workspace_edit_object_unset(ap->workspace);
    app_shutdown();
    elm_shutdown();
 }
@@ -120,292 +122,32 @@ END_TEST
 EFLETE_TEST(workspace_edit_object_part_state_del_test_p1)
 {
    Eina_Bool res = EINA_FALSE;
-   Evas_Object *parent, *workspace;
+   App_Data *ap;
    Style *style = NULL;
    Evas *e = NULL;
    Eina_File *mmap_file = NULL;
 
    elm_init(0, 0);
    app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
+   ap = app_data_get();
+   ui_main_window_add(ap);
    mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_del.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
+   e = evas_object_evas_get(ap->workspace);
+   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
    wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_del.edj");
-   workspace_edit_object_part_state_add(workspace, "bg", "default", 0.5);
+   workspace_edit_object_set(ap->workspace, style, 
"./edj_build/workspace_edit_object_part_state_del.edj");
+   history_genlist_get(ap->history, ap->workspace);
+   history_module_add(style->obj);
+   workspace_edit_object_part_state_add(ap->workspace, "bg", "default", 0.5);
 
-   res = workspace_edit_object_part_state_del(workspace, "bg", "default", 0.5);
+   res = workspace_edit_object_part_state_del(ap->workspace, "bg", "default", 
0.5);
    ck_assert_msg(res == EINA_TRUE, "Failed delete state from part, loaded into 
workspace");
    res = edje_edit_state_exist(style->obj, "bg", "default", 0.5);
    ck_assert_msg(res == EINA_FALSE, "Delete state still exist in edje edit 
object");
 
    wm_style_free(style);
    eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_state_del
- * @{
- * <tr>
- * <td>workspace_edit_object_part_state_del</td>
- * <td>workspace_edit_object_part_state_del_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 set edit object into workspace
- *
- * @procedure
- * @step 1 Delete state with workspace_edit_object_part_state_del from non 
exist
- *         part.
- * @step 2 check returned value from function
- * </td>
- * <td>(Evas_Object *) workspace, (char *) "non_exist", (char *) "test", 
(double) 1.0 </td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_state_del_test_n)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_del.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_del.edj");
-
-   res = workspace_edit_object_part_state_del(workspace, "non_exist", "test", 
1.0);
-   ck_assert_msg(res == EINA_FALSE, "Delete state for non exist part.");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_state_del
- * @{
- * <tr>
- * <td>workspace_edit_object_part_state_del</td>
- * <td>workspace_edit_object_part_state_del_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 set edit object into workspace
- *
- * @procedure
- * @step 1 Delete non exist state from part with 
workspace_edit_object_part_state_del
- * @step 2 check returned value from function
- * </td>
- * <td>(Evas_Object *) workspace, (char *) "bg", (char *) "non_exist", 
(double) 0.0 </td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_state_del_test_n1)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_del.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_del.edj");
-
-   res = workspace_edit_object_part_state_del(workspace, "bg", "nonexist", 
0.0);
-   ck_assert_msg(res == EINA_FALSE, "Delete non exist state for part.");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_state_del
- * @{
- * <tr>
- * <td>workspace_edit_object_part_state_del</td>
- * <td>workspace_edit_object_part_state_del_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 Delete state with NULL pointer to workspace, using
- *         workspace_edit_object_part_state_del
- * @step 2 check returned value from function
- * </td>
- * <td>NULL, (char *) "bg", (char *) "default", (double) 0.0 </td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_state_del_test_n2)
-{
-   Eina_Bool res = EINA_TRUE;
-
-   elm_init(0, 0);
-
-   res = workspace_edit_object_part_state_del(NULL, "bg", "default", 0.0);
-   ck_assert_msg(res == EINA_FALSE, "Delete state with workspace objet NULL");
-
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_state_del
- * @{
- * <tr>
- * <td>workspace_edit_object_part_state_del</td>
- * <td>workspace_edit_object_part_state_del_test_n3</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 set edit object into workspace
- *
- * @procedure
- * @step 1 Delete state with state name NULL pointer string. Using function
- *         workspace_edit_object_part_state_del.
- * @step 2 check returned value from function
- * </td>
- * <td>(Evas_Object *) workspace, (char *) "bg", NULL, (double) 0.0 </td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_state_del_test_n3)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_del.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_del.edj");
-
-   res = workspace_edit_object_part_state_del(workspace, "bg", NULL, 0.0);
-   ck_assert_msg(res == EINA_FALSE, "Delete state without name");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_state_del
- * @{
- * <tr>
- * <td>workspace_edit_object_part_state_del</td>
- * <td>workspace_edit_object_part_state_del_test_n4</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 set edit object into workspace
- *
- * @procedure
- * @step 1 delete state with part name NULL. Using function
- *         workspace_edit_object_part_state_del.
- * @step 2 check returned value from function
- * </td>
- * <td>(Evas_Object *) workspace, NULL, (char *) "default", (double) 0.0 </td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_state_del_test_n4)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_del.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_del.edj");
-
-   res = workspace_edit_object_part_state_add(workspace, NULL, "default", 0.0);
-   ck_assert_msg(res == EINA_FALSE, "Delete state from part without name");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
+   workspace_edit_object_unset(ap->workspace);
    app_shutdown();
    elm_shutdown();
 }
diff --git a/tests/test_ui_workspace/workspace_edit_object_part_state_set.c 
b/tests/test_ui_workspace/workspace_edit_object_part_state_set.c
index a67458e..6a85f45 100644
--- a/tests/test_ui_workspace/workspace_edit_object_part_state_set.c
+++ b/tests/test_ui_workspace/workspace_edit_object_part_state_set.c
@@ -104,113 +104,6 @@ END_TEST
  * @{
  * <tr>
  * <td>workspace_edit_object_part_state_set</td>
- * <td>workspace_edit_object_part_state_set_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 create style object
- * @step 5 Create part object with many states. Non default state set.
- *
- * @procedure
- * @step 1 select part state with workspace_edit_object_part_state_set
- * @step 2 check returned value from function
- * </td>
- * <td>NULL, (Part *) part</td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_state_set_test_n)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent;
-   Style *style = NULL;
-   Part *part = NULL;
-   Evas *e = NULL;
-
-   elm_init(0, 0);
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   style->obj = edje_edit_object_add(e);
-   edje_object_file_set(style->obj, 
"./edj_build/workspace_edit_object_part_state_set.edj",
-                        style->full_group_name);
-   part = wm_part_add(style, "elm.text");
-   part->curr_state = eina_stringshare_add("visible");
-   part->curr_state_value = 0.0;
-
-   res = workspace_edit_object_part_state_set(NULL, part);
-   ck_assert_msg(res == EINA_FALSE, "Set state for part with NULL object 
workspace");
-
-   wm_style_free(style);
-   evas_object_del(parent);
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_state_set
- * @{
- * <tr>
- * <td>workspace_edit_object_part_state_set</td>
- * <td>workspace_edit_object_part_state_set_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 set edit object into workspace
- *
- * @procedure
- * @step 1 select part state with workspace_edit_object_part_state_set
- * @step 2 check returned value from function
- * </td>
- * <td>(Evas_Object *) workspace, NULL</td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_part_state_set_test_n1)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_part_state_set.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_part_state_set.edj");
-
-   res = workspace_edit_object_part_state_set(workspace, NULL);
-   ck_assert_msg(res == EINA_FALSE, "Set state for NULL pointer of part");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_part_state_set
- * @{
- * <tr>
- * <td>workspace_edit_object_part_state_set</td>
  * <td>workspace_edit_object_part_state_set_test_n2</td>
  * <td>
  * @precondition
diff --git a/tests/test_ui_workspace/workspace_edit_object_recalc.c 
b/tests/test_ui_workspace/workspace_edit_object_recalc.c
index cc78198..622c630 100644
--- a/tests/test_ui_workspace/workspace_edit_object_recalc.c
+++ b/tests/test_ui_workspace/workspace_edit_object_recalc.c
@@ -88,79 +88,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_recalc
  * @{
- * <tr>
- * <td>workspace_edit_object_recalc</td>
- * <td>workspace_edit_object_recalc_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 create workspace object
- *
- * @procedure
- * @step 1 call workspace_edit_object_recalc
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_recalc_test_n)
-{
-   elm_init(0, 0);
-   app_init();
-   Evas_Object *parent, *workspace;
-   Eina_Bool ret = EINA_FALSE;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   workspace = workspace_add(parent);
-   ret = workspace_edit_object_recalc(workspace);
-   ck_assert_msg(ret == EINA_FALSE, "Recalc edit object in workspace, "
-                                    "without prevision set edit object");
-
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_recalc
- * @{
- * <tr>
- * <td>workspace_edit_object_recalc</td>
- * <td>workspace_edit_object_recalc_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 call workspace_edit_object_recalc with NULL param
- * @step 2 check returned value
- * </td>
- * <td>NULL</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_recalc_test_n1)
-{
-   elm_init(0, 0);
-   Eina_Bool ret = EINA_TRUE;
-
-   ret = workspace_edit_object_recalc(NULL);
-   ck_assert_msg(ret == EINA_FALSE, "Recalc edit object in NULL object");
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_recalc
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_set.c 
b/tests/test_ui_workspace/workspace_edit_object_set.c
index b410c94..7cade5f 100644
--- a/tests/test_ui_workspace/workspace_edit_object_set.c
+++ b/tests/test_ui_workspace/workspace_edit_object_set.c
@@ -86,203 +86,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_set
  * @{
- * <tr>
- * <td>workspace_edit_object_set</td>
- * <td>workspace_edit_object_set_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- *
- * @procedure
- * @step 1 call workspace_edit_object_set with invalid file path.
- * @step 2 check returned value
- * </td>
- * <td>Evas_Object *workspace, Style *style, char *</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_set_test_n)
-{
-   elm_init(0, 0);
-   app_init();
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open("./edj_build/workspace_edit_object_set.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   res = workspace_edit_object_set(workspace, style,
-                                   "./edj_build/invalid.edj");
-   ck_assert_msg(res == EINA_FALSE, "Add edit object with invalid file path");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_set
- * @{
- * <tr>
- * <td>workspace_edit_object_set</td>
- * <td>workspace_edit_object_set_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 create parent window
- * @step 3 Mmap edj file.
- * @step 4 create style object
- * @step 5 load style data from edje file
- *
- * @procedure
- * @step 1 call workspace_edit_object_set with invalid workspace param.
- * @step 2 check returned value
- * </td>
- * <td>NULL, Style *style, char *</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_set_test_n1)
-{
-   elm_init(0, 0);
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open("./edj_build/workspace_edit_object_set.edj", 
EINA_FALSE);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   res = workspace_edit_object_set(NULL, style, 
"./edj_build/workspace_edit_object_set.edj");
-   ck_assert_msg(res == EINA_FALSE, "Add edit object to workspace NULL 
object");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   evas_object_del(parent);
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_set
- * @{
- * <tr>
- * <td>workspace_edit_object_set</td>
- * <td>workspace_edit_object_set_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 create workspace object
- *
- * @procedure
- * @step 1 call workspace_edit_object_set with invalid style param.
- * @step 2 check returned value
- * </td>
- * <td>Evas_Object *workspace, NULL, char *</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_set_test_n2)
-{
-   elm_init(0, 0);
-   app_init();
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   workspace = workspace_add(parent);
-   res = workspace_edit_object_set(workspace, NULL, 
"./edj_build/workspace_edit_object_set.edj");
-   ck_assert_msg(res == EINA_FALSE, "Add edit object to workspace without 
style");
-
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_set
- * @{
- * <tr>
- * <td>workspace_edit_object_set</td>
- * <td>workspace_edit_object_set_test_n3</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 load style data from edje file
- *
- * @procedure
- * @step 1 call workspace_edit_object_set with NULL file path.
- * @step 2 check returned value
- * </td>
- * <td>Evas_Object *workspace, Style *style, NULL</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_set_test_n3)
-{
-   elm_init(0, 0);
-   app_init();
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = eina_file_open("./edj_build/workspace_edit_object_set.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   res = workspace_edit_object_set(workspace, style, NULL);
-   ck_assert_msg(res == EINA_FALSE, "Add edit object with NULL file path");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_set
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_unset.c 
b/tests/test_ui_workspace/workspace_edit_object_unset.c
index 0d72d20..89761b3 100644
--- a/tests/test_ui_workspace/workspace_edit_object_unset.c
+++ b/tests/test_ui_workspace/workspace_edit_object_unset.c
@@ -128,37 +128,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_unset
  * @{
- * <tr>
- * <td>workspace_edit_object_unset</td>
- * <td>workspace_edit_object_unset_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 call workspace_edit_object_unset with NULL param.
- * @step 2 check returned value
- * </td>
- * <td>NULL</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_edit_object_unset_test_n1)
-{
-   elm_init(0, 0);
-   Eina_Bool res = EINA_TRUE;
-
-   res = workspace_edit_object_unset(NULL);
-   ck_assert_msg(res == EINA_FALSE, "Unset edit object from NULL workspace 
object");
-   elm_shutdown();
-}
-END_TEST
-
-
-/**
- * @addtogroup workspace_edit_object_unset
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_edit_object_visible_set.c 
b/tests/test_ui_workspace/workspace_edit_object_visible_set.c
index 6b81b58..f04b967 100644
--- a/tests/test_ui_workspace/workspace_edit_object_visible_set.c
+++ b/tests/test_ui_workspace/workspace_edit_object_visible_set.c
@@ -88,94 +88,6 @@ END_TEST
 /**
  * @addtogroup workspace_edit_object_visible_set
  * @{
- * <tr>
- * <td>workspace_edit_object_visible_set</td>
- * <td>workspace_edit_object_visible_set_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 Mmap edj file.
- * @step 5 create workspace object
- * @step 6 create style object
- * @step 7 set edit object into workspace
- *
- * @procedure
- * @step 1 Set visible non exist part with workspace_edit_object_visible_set
- * @step 2 check returned value from function
- * </td>
- * <td>(Evas_Object *) workspace, (char *) "non_exist", (Eina_Bool) EINA_TRUE 
</td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_visible_set_test_n)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-   Eina_File *mmap_file = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   mmap_file = 
eina_file_open("./edj_build/workspace_edit_object_visible_set.edj", EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_edit_object_visible_set.edj");
-
-   res = workspace_edit_object_visible_set(workspace, "non_exist", EINA_TRUE);
-   ck_assert_msg(res == EINA_FALSE, "Set visibily for non exist part");
-
-   wm_style_free(style);
-   eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_visible_set
- * @{
- * <tr>
- * <td>workspace_edit_object_visible_set</td>
- * <td>workspace_edit_object_visible_set_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 Set visible part without workspace object 
workspace_edit_object_visible_set
- * @step 2 check returned value from function
- * </td>
- * <td>NULL, (char *) "bg", (Eina_Bool) EINA_TRUE </td>
- * <td>EINA_FALSE returned from function</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_edit_object_visible_set_test_n1)
-{
-   Eina_Bool res = EINA_TRUE;
-
-   elm_init(0, 0);
-
-   res = workspace_edit_object_visible_set(NULL, "bg", EINA_TRUE);
-   ck_assert_msg(res == EINA_FALSE, "Set visibily for part in NULL workspace 
object");
-
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_edit_object_visible_set
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_highlight_align_visible_get.c 
b/tests/test_ui_workspace/workspace_highlight_align_visible_get.c
index f1ff01e..61134fb 100644
--- a/tests/test_ui_workspace/workspace_highlight_align_visible_get.c
+++ b/tests/test_ui_workspace/workspace_highlight_align_visible_get.c
@@ -146,85 +146,6 @@ END_TEST
 /**
  * @addtogroup workspace_highlight_align_visible_get
  * @{
- * <tr>
- * <td>workspace_highlight_align_visible_get</td>
- * <td>workspace_highlight_align_visible_get_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- *
- * @procedure
- * @step 1 call workspace_highlight_align_visible_get
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_highlight_align_visible_get_test_n1)
-{
-   Eina_Bool res = EINA_FALSE;
-   Evas_Object *parent;
-
-   elm_init(0, 0);
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-
-   res = workspace_highlight_align_visible_get(NULL);
-   ck_assert_msg(res == EINA_FALSE, "Getting visibility of highlight's align 
handler");
-
-   evas_object_del(parent);
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_highlight_align_visible_get
- * @{
- * <tr>
- * <td>workspace_highlight_align_visible_get</td>
- * <td>workspace_highlight_align_visible_get_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 create workspace object
- *
- * @procedure
- * @step 1 call workspace_highlight_align_visible_get(EINA_TRUE)
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_highlight_align_visible_get_test_n2)
-{
-   Eina_Bool res;
-   Evas_Object *parent, *workspace;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   workspace = workspace_add(parent);
-
-   res = workspace_highlight_align_visible_get(workspace);
-   ck_assert_msg(res == EINA_FALSE, "Getting visibility of highlight's align 
handler");
-
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_highlight_align_visible_get
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_highlight_align_visible_set.c 
b/tests/test_ui_workspace/workspace_highlight_align_visible_set.c
index 5d4c85c..82318d2 100644
--- a/tests/test_ui_workspace/workspace_highlight_align_visible_set.c
+++ b/tests/test_ui_workspace/workspace_highlight_align_visible_set.c
@@ -144,38 +144,6 @@ END_TEST
 /**
  * @addtogroup workspace_highlight_align_visible_set
  * @{
- * <tr>
- * <td>workspace_highlight_align_visible_set</td>
- * <td>workspace_highlight_align_visible_set_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 call workspace_highlight_align_visible_set(EINA_TRUE)
- * @step 2 check returned value
- * </td>
- * <td>NULL, EINA_TRUE</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_highlight_align_visible_set_test_n)
-{
-   Eina_Bool res;
-
-   elm_init(0, 0);
-
-   res = workspace_highlight_align_visible_set(NULL, EINA_TRUE);
-   ck_assert_msg(res == EINA_FALSE, "Failed setting visibility for highlight's 
align handler");
-
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_highlight_align_visible_set
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_highlight_set.c 
b/tests/test_ui_workspace/workspace_highlight_set.c
index 05d9ea6..d02588e 100644
--- a/tests/test_ui_workspace/workspace_highlight_set.c
+++ b/tests/test_ui_workspace/workspace_highlight_set.c
@@ -89,221 +89,6 @@ END_TEST
 /**
  * @addtogroup workspace_highlight_set
  * @{
- * <tr>
- * <td>workspace_highlight_set</td>
- * <td>workspace_highlight_set_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 create workspace object
- * @step 5 create style object
- * @step 6 create part object with non exist part name.
- * @step 7 set edit object into workspace
- *
- * @procedure
- * @step 1 call workspace_highlight_set
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, (Part *) part</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_highlight_set_test_n)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Part *part = NULL;
-   Evas *e = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   style->obj = edje_edit_object_add(e);
-   edje_object_file_set(style->obj, "./edj_build/workspace_highlight_set.edj",
-                        style->full_group_name);
-   part = wm_part_add(style, "b_g");
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_highlight_set.edj");
-
-   res = workspace_highlight_set(workspace, part);
-   ck_assert_msg(res == EINA_FALSE, "Set highlight for workspace to non exist 
part");
-
-   wm_style_free(style);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_highlight_set
- * @{
- * <tr>
- * <td>workspace_highlight_set</td>
- * <td>workspace_highlight_set_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 create workspace object
- * @step 5 create style object
- * @step 6 set edit object into workspace
- *
- * @procedure
- * @step 1 call workspace_highlight_set with NULL part param
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, NULL</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_highlight_set_test_n1)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Evas *e = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   style->obj = edje_edit_object_add(e);
-   edje_object_file_set(style->obj, "./edj_build/workspace_highlight_set.edj",
-                        style->full_group_name);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_highlight_set.edj");
-
-   res = workspace_highlight_set(workspace, NULL);
-   ck_assert_msg(res == EINA_FALSE, "Set highlight for workspace to non exist 
part");
-
-   wm_style_free(style);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_highlight_set
- * @{
- * <tr>
- * <td>workspace_highlight_set</td>
- * <td>workspace_highlight_set_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 create workspace object
- * @step 5 create style object
- * @step 6 create part object with exist part name.
- *
- * @procedure
- * @step 1 call workspace_highlight_set
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, (Part *) part</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_highlight_set_test_n2)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent, *workspace;
-   Style *style = NULL;
-   Part *part = NULL;
-   Evas *e = NULL;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   style->obj = edje_edit_object_add(e);
-   edje_object_file_set(style->obj, "./edj_build/workspace_highlight_set.edj",
-                        style->full_group_name);
-   part = wm_part_add(style, "bg");
-
-   res = workspace_highlight_set(workspace, part);
-   ck_assert_msg(res == EINA_FALSE, "Set highlight for workspace without "
-                                    "groupedit object");
-
-   wm_style_free(style);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_highlight_set
- * @{
- * <tr>
- * <td>workspace_highlight_set</td>
- * <td>workspace_highlight_set_test_n3</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 create parent window
- * @step 3 create style object
- * @step 4 create part object with exist part loaded.
- *
- * @procedure
- * @step 1 call workspace_highlight_set with workspace NULL param
- * @step 2 check returned value
- * </td>
- * <td>NULL, (Part *) part</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_highlight_set_test_n3)
-{
-   Eina_Bool res = EINA_TRUE;
-   Evas_Object *parent;
-   Style *style = NULL;
-   Part *part = NULL;
-   Evas *e = NULL;
-
-   elm_init(0, 0);
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   e = evas_object_evas_get(parent);
-   style = wm_style_add("test", "elm/radio/base/test", STYLE, NULL);
-   style->obj = edje_edit_object_add(e);
-   edje_object_file_set(style->obj, "./edj_build/workspace_highlight_set.edj",
-                        style->full_group_name);
-   part = wm_part_add(style, "bg");
-
-   res = workspace_highlight_set(NULL, part);
-   ck_assert_msg(res == EINA_FALSE, "Set highlight for NULL workspace object");
-
-   wm_style_free(style);
-   evas_object_del(parent);
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_highlight_set
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_highlight_unset.c 
b/tests/test_ui_workspace/workspace_highlight_unset.c
index 1f03dbf..f6736f5 100644
--- a/tests/test_ui_workspace/workspace_highlight_unset.c
+++ b/tests/test_ui_workspace/workspace_highlight_unset.c
@@ -135,39 +135,6 @@ END_TEST
 /**
  * @addtogroup workspace_highlight_unset
  * @{
- * <tr>
- * <td>workspace_highlight_unset</td>
- * <td>workspace_highlight_unset_test_p</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 call workspace_highlight_unset with NULL pointer to workspace
- * @step 2 check returned value
- * </td>
- * <td>NULL</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-
-EFLETE_TEST(workspace_highlight_unset_test_n1)
-{
-   Eina_Bool res = EINA_TRUE;
-
-   elm_init(0, 0);
-
-   res = workspace_highlight_unset(NULL);
-   ck_assert_msg(res == EINA_FALSE, "Unset highlight from workspace NULL 
object");
-
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_highlight_unset
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_object_area_visible_get.c 
b/tests/test_ui_workspace/workspace_object_area_visible_get.c
index a8c34f2..7e04c2d 100644
--- a/tests/test_ui_workspace/workspace_object_area_visible_get.c
+++ b/tests/test_ui_workspace/workspace_object_area_visible_get.c
@@ -146,85 +146,6 @@ END_TEST
 /**
  * @addtogroup workspace_object_area_visible_get
  * @{
- * <tr>
- * <td>workspace_object_area_visible_get</td>
- * <td>workspace_object_area_visible_get_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- *
- * @procedure
- * @step 1 call workspace_object_area_visible_get
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_object_area_visible_get_test_n1)
-{
-   Eina_Bool res = EINA_FALSE;
-   Evas_Object *parent;
-
-   elm_init(0, 0);
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-
-   res = workspace_object_area_visible_get(NULL);
-   ck_assert_msg(res == EINA_FALSE, "Getting visibility of object area");
-
-   evas_object_del(parent);
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_object_area_visible_get
- * @{
- * <tr>
- * <td>workspace_object_area_visible_get</td>
- * <td>workspace_object_area_visible_get_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 create workspace object
- *
- * @procedure
- * @step 1 call workspace_object_area_visible_get(EINA_TRUE)
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_object_area_visible_get_test_n2)
-{
-   Eina_Bool res;
-   Evas_Object *parent, *workspace;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   workspace = workspace_add(parent);
-
-   res = workspace_object_area_visible_get(workspace);
-   ck_assert_msg(res == EINA_FALSE, "Getting visibility of object area");
-
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_object_area_visible_get
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_object_area_visible_set.c 
b/tests/test_ui_workspace/workspace_object_area_visible_set.c
index 13fb69e..b2f8799 100644
--- a/tests/test_ui_workspace/workspace_object_area_visible_set.c
+++ b/tests/test_ui_workspace/workspace_object_area_visible_set.c
@@ -144,38 +144,6 @@ END_TEST
 /**
  * @addtogroup workspace_object_area_visible_set
  * @{
- * <tr>
- * <td>workspace_object_area_visible_set</td>
- * <td>workspace_object_area_visible_set_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 call workspace_object_area_visible_set(EINA_TRUE)
- * @step 2 check returned value
- * </td>
- * <td>NULL, EINA_TRUE</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_object_area_visible_set_test_n)
-{
-   Eina_Bool res;
-
-   elm_init(0, 0);
-
-   res = workspace_object_area_visible_set(NULL, EINA_TRUE);
-   ck_assert_msg(res == EINA_FALSE, "Failed setting visibility for object 
area");
-
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_object_area_visible_set
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_separate_mode_get.c 
b/tests/test_ui_workspace/workspace_separate_mode_get.c
index 5f7c63e..cdf36cc 100644
--- a/tests/test_ui_workspace/workspace_separate_mode_get.c
+++ b/tests/test_ui_workspace/workspace_separate_mode_get.c
@@ -144,85 +144,6 @@ END_TEST
 /**
  * @addtogroup workspace_separate_mode_get
  * @{
- * <tr>
- * <td>workspace_separate_mode_get</td>
- * <td>workspace_separate_mode_get_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- *
- * @procedure
- * @step 1 call workspace_separate_mode_get
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_separate_mode_get_test_n1)
-{
-   Eina_Bool res = EINA_FALSE;
-   Evas_Object *parent;
-
-   elm_init(0, 0);
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-
-   res = workspace_separate_mode_get(NULL);
-   ck_assert_msg(res == EINA_FALSE, "Failed get separate mode for workspace");
-
-   evas_object_del(parent);
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_separate_mode_get
- * @{
- * <tr>
- * <td>workspace_separate_mode_get</td>
- * <td>workspace_separate_mode_get_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 create workspace object
- *
- * @procedure
- * @step 1 call workspace_separate_mode_get(EINA_TRUE)
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_separate_mode_get_test_n2)
-{
-   Eina_Bool res;
-   Evas_Object *parent, *workspace;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   workspace = workspace_add(parent);
-
-   res = workspace_separate_mode_get(workspace);
-   ck_assert_msg(res == EINA_FALSE, "Failed get separate mode for workspace");
-
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_separate_mode_get
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_separate_mode_set.c 
b/tests/test_ui_workspace/workspace_separate_mode_set.c
index 021cf7e..308d171 100644
--- a/tests/test_ui_workspace/workspace_separate_mode_set.c
+++ b/tests/test_ui_workspace/workspace_separate_mode_set.c
@@ -144,80 +144,6 @@ END_TEST
 /**
  * @addtogroup workspace_separate_mode_set
  * @{
- * <tr>
- * <td>workspace_separate_mode_set</td>
- * <td>workspace_separate_mode_set_test_n1</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 call workspace_separate_mode_set(EINA_TRUE)
- * @step 2 check returned value
- * </td>
- * <td>NULL, EINA_TRUE</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_separate_mode_set_test_n1)
-{
-   Eina_Bool res;
-
-   elm_init(0, 0);
-
-   res = workspace_separate_mode_set(NULL, EINA_TRUE);
-   ck_assert_msg(res == EINA_FALSE, "Failed set separate mode for workspace");
-
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_separate_mode_set
- * @{
- * <tr>
- * <td>workspace_separate_mode_set</td>
- * <td>workspace_separate_mode_set_test_n2</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- * @step 2 load extenstion theme from EFLETE_THEME file
- * @step 3 create parent window
- * @step 4 create workspace object
- *
- * @procedure
- * @step 1 call workspace_separate_mode_set(EINA_TRUE)
- * @step 2 check returned value
- * </td>
- * <td>(Evas_Object *) workspace, EINA_TRUE</td>
- * <td>Returned EINA_FALSE</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(workspace_separate_mode_set_test_n2)
-{
-   Eina_Bool res;
-   Evas_Object *parent, *workspace;
-
-   elm_init(0, 0);
-   app_init();
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
-   workspace = workspace_add(parent);
-
-   res = workspace_separate_mode_set(workspace, EINA_TRUE);
-   ck_assert_msg(res == EINA_FALSE, "Failed set separate mode for workspace");
-
-   evas_object_del(workspace);
-   evas_object_del(parent);
-   app_shutdown();
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_separate_mode_set
- * @{
  * </TABLE>
  * @}
  * @}
diff --git a/tests/test_ui_workspace/workspace_zoom_factor_get.c 
b/tests/test_ui_workspace/workspace_zoom_factor_get.c
index 8f08811..f52c1a0 100644
--- a/tests/test_ui_workspace/workspace_zoom_factor_get.c
+++ b/tests/test_ui_workspace/workspace_zoom_factor_get.c
@@ -60,28 +60,24 @@ EFLETE_TEST (workspace_zoom_factor_get_test_p)
 {
    elm_init(0, 0);
    app_init();
+   App_Data *ap = app_data_get();
    double res = -1;
-   Evas_Object *parent, *workspace;
    Style *style = NULL;
    Evas *e = NULL;
    Eina_File *mmap_file = NULL;
 
-   parent = elm_win_add(NULL, "test", ELM_WIN_BASIC);
+   ui_main_window_add(ap);
    mmap_file = eina_file_open("./edj_build/workspace_zoom_factor_get.edj", 
EINA_FALSE);
-   workspace = workspace_add(parent);
-   e = evas_object_evas_get(parent);
+   e = evas_object_evas_get(ap->workspace);
    style = wm_style_add("test", "elm/radio/base/def", STYLE, NULL);
    wm_style_data_load(style, e, mmap_file);
-   workspace_edit_object_set(workspace, style, 
"./edj_build/workspace_zoom_factor_get.edj");
-   workspace_zoom_factor_set(workspace, 1.5);
-   res = workspace_zoom_factor_get(workspace);
+   workspace_edit_object_set(ap->workspace, style, 
"./edj_build/workspace_zoom_factor_get.edj");
+   workspace_zoom_factor_set(ap->workspace, 1.5);
+   res = workspace_zoom_factor_get(ap->workspace);
    ck_assert_msg(res == 1.5, "Failed get zoom factor");
 
    wm_style_free(style);
    eina_file_close(mmap_file);
-   workspace_edit_object_unset(workspace);
-   evas_object_del(workspace);
-   evas_object_del(parent);
    app_shutdown();
    elm_shutdown();
 }
@@ -90,35 +86,6 @@ END_TEST
 /**
  * @addtogroup workspace_zoom_factor_get
  * @{
- * <tr>
- * <td>workspace_zoom_factor_get</td>
- * <td>workspace_zoom_factor_get_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialize elementary library
- *
- * @procedure
- * @step 1 call workspace_zoom_factor_get with NULL pointer workspace object
- * @step 2 check returned value
- * </td>
- * <td>NULL</td>
- * <td>Returned 0</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (workspace_zoom_factor_get_test_n1)
-{
-   elm_init(0, 0);
-   double res = -1;
-   res = workspace_zoom_factor_get(NULL);
-   ck_assert_msg(res == 0, "Get zoom factor from NULL object");
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup workspace_zoom_factor_get
- * @{
  * </TABLE>
  * @}
  * @}

-- 


Reply via email to