diff --git a/src/00/03/z2ui5_cl_util_abap.clas.testclasses.abap b/src/00/03/z2ui5_cl_util_abap.clas.testclasses.abap
new file mode 100644
index 00000000..c274e5c8
--- /dev/null
+++ b/src/00/03/z2ui5_cl_util_abap.clas.testclasses.abap
@@ -0,0 +1,68 @@
+
+CLASS ltcl_test DEFINITION FINAL
+  FOR TESTING RISK LEVEL HARMLESS DURATION SHORT.
+
+  PRIVATE SECTION.
+    METHODS test_func_get_uuid_32  FOR TESTING RAISING cx_static_check.
+    METHODS test_func_get_uuid_22  FOR TESTING RAISING cx_static_check.
+    METHODS test_encoding          FOR TESTING RAISING cx_static_check.
+    METHODS test_element_text      FOR TESTING RAISING cx_static_check.
+    METHODS test_classes_impl_intf FOR TESTING RAISING cx_static_check.
+
+ENDCLASS.
+
+
+CLASS ltcl_test IMPLEMENTATION.
+  METHOD test_func_get_uuid_32.
+
+    DATA(lv_uuid) = z2ui5_cl_util_abap=>uuid_get_c32( ).
+    cl_abap_unit_assert=>assert_not_initial( lv_uuid ).
+    cl_abap_unit_assert=>assert_equals( exp = strlen( lv_uuid )
+                                        act = 32 ).
+
+  ENDMETHOD.
+
+  METHOD test_func_get_uuid_22.
+
+    DATA(lv_uuid) = z2ui5_cl_util_abap=>uuid_get_c22( ).
+    cl_abap_unit_assert=>assert_not_initial( lv_uuid ).
+    cl_abap_unit_assert=>assert_equals( exp = strlen( lv_uuid )
+                                        act = 22 ).
+
+  ENDMETHOD.
+
+  METHOD test_encoding.
+
+    DATA(lv_string)   = `my string`.
+    DATA(lv_xstring)  = z2ui5_cl_util_abap=>conv_get_xstring_by_string( lv_string ).
+    DATA(lv_string2)  = z2ui5_cl_util_abap=>conv_encode_x_base64( lv_xstring ).
+    DATA(lv_xstring2) = z2ui5_cl_util_abap=>conv_decode_x_base64( lv_string2 ).
+    DATA(lv_string3)  = z2ui5_cl_util_abap=>conv_get_string_by_xstring( lv_xstring2 ).
+
+    cl_abap_unit_assert=>assert_equals( exp = lv_string
+                                        act = lv_string3 ).
+
+  ENDMETHOD.
+
+  METHOD test_element_text.
+
+    IF sy-sysid = 'ABC'.
+      RETURN.
+    ENDIF.
+
+    DATA(ls_result) = z2ui5_cl_util_abap=>rtti_get_data_element_texts( `UNAME` ).
+    cl_abap_unit_assert=>assert_not_initial( ls_result ).
+
+  ENDMETHOD.
+
+  METHOD test_classes_impl_intf.
+
+    IF sy-sysid = 'ABC'.
+      RETURN.
+    ENDIF.
+
+    DATA(mt_classes) = z2ui5_cl_util_abap=>rtti_get_classes_impl_intf( `IF_SERIALIZABLE_OBJECT`  ).
+    cl_abap_unit_assert=>assert_not_initial( mt_classes ).
+
+  ENDMETHOD.
+ENDCLASS.
diff --git a/src/00/03/z2ui5_cl_util_abap.clas.xml b/src/00/03/z2ui5_cl_util_abap.clas.xml
index 163e9589..e1061bf2 100644
--- a/src/00/03/z2ui5_cl_util_abap.clas.xml
+++ b/src/00/03/z2ui5_cl_util_abap.clas.xml
@@ -10,6 +10,7 @@
     <CLSCCINCL>X</CLSCCINCL>
     <FIXPT>X</FIXPT>
     <UNICODE>X</UNICODE>
+    <WITH_UNIT_TESTS>X</WITH_UNIT_TESTS>
    </VSEOCLASS>
   </asx:values>
  </asx:abap>
diff --git a/src/00/04/package.devc.xml b/src/00/04/package.devc.xml
deleted file mode 100644
index e1ce3f18..00000000
--- a/src/00/04/package.devc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<abapGit version="v1.0.0" serializer="LCL_OBJECT_DEVC" serializer_version="v1.0.0">
- <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
-  <asx:values>
-   <DEVC>
-    <CTEXT>abap api - https://github.com/oblomov-dev/abap-api</CTEXT>
-   </DEVC>
-  </asx:values>
- </asx:abap>
-</abapGit>