diff --git a/src/main/java/org/openepics/names/rest/api/v1/INames.java b/src/main/java/org/openepics/names/rest/api/v1/INames.java
index 6a16787aef145a5d39ca4e398399b2a1dc8e874f..20d8d42acd81fb30f53b285bf4845845f22c181a 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/INames.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/INames.java
@@ -130,16 +130,16 @@ public interface INames {
     public static final String DEFAULT_SORT_ORDER_ASC  = "true";
 
     /**
-     * Create names by list of name element commands.
+     * Create names by list of name element commands for create.
      * Return list of name elements for created names.
      *
-     * @param nameElements list of name element commands
+     * @param nameElementCommands list of name element commands for create
      * @return list of created name elements
      */
     @Operation(
-            summary     = "Create names by array of name element commands",
+            summary     = "Create names by array of name element commands for create",
             description = """
-                          Create names by array of name element commands.
+                          Create names by array of name element commands for create.
                           Return array of name elements for created names.
 
                           Required attributes:
@@ -832,7 +832,7 @@ public interface INames {
     // ----------------------------------------------------------------------------------------------------
 
     /**
-     * Return if names are valid to create by list of name element commands.
+     * Return if names are valid to create by list of name element commands for create.
      * If names are valid to create, successful create of names can be expected.
      *
      * <p>
@@ -840,14 +840,14 @@ public interface INames {
      * with result for each name element command. Message and details are available if no response is available.
      * </p>
      *
-     * @param nameElements list of name element commands
+     * @param nameElementCommands list of name element commands for create
      * @return if list of names is valid to create
      */
     @Hidden
     @Operation(
-            summary     = "Return if names are valid to create by list of name element commands",
+            summary     = "Return if names are valid to create by list of name element commands for create",
             description = """
-                          Return if names are valid to create by list of name element commands.
+                          Return if names are valid to create by list of name element commands for create.
                           If names are valid to create, successful create of names can be expected.
 
                           Required attributes:
@@ -909,7 +909,7 @@ public interface INames {
             @RequestBody List<NameElementCommandCreate> nameElementCommands);
 
     /**
-     * Return if names are valid to update by list of name element commands.
+     * Return if names are valid to update by list of name element commands for update.
      * If names are valid to update, successful update of names can be expected.
      *
      * <p>
@@ -917,14 +917,14 @@ public interface INames {
      * with result for each name element command. Message and details are available if no response is available.
      * </p>
      *
-     * @param nameElements list of name element commands
+     * @param nameElementCommands list of name element commands for update
      * @return if list of name elements is valid to update
      */
     @Hidden
     @Operation(
-            summary     = "Return if names are valid to update by list of name elements",
+            summary     = "Return if names are valid to update by list of name elements for update",
             description = """
-                          Return if names are valid to update by list of name elements.
+                          Return if names are valid to update by list of name elements for update.
                           If names are valid to update, successful update of names can be expected.
 
                           Required attributes:
@@ -985,7 +985,7 @@ public interface INames {
             @RequestBody List<NameElementCommandUpdate> nameElementCommands);
 
     /**
-     * Return if names are valid to delete by list of name element commands.
+     * Return if names are valid to delete by list of name element commands for confirm.
      * If names are valid to delete, successful delete of names can be expected.
      *
      * <p>
@@ -993,14 +993,14 @@ public interface INames {
      * with result for each name element command. Message and details are available if no response is available.
      * </p>
      *
-     * @param nameElements list of name element commands
+     * @param nameElementCommands list of name element commands for confirm
      * @return if list of name elements is valid to delete
      */
     @Hidden
     @Operation(
-            summary     = "Return if names are valid to delete by list of name element commands",
+            summary     = "Return if names are valid to delete by list of name element commands for confirm",
             description = """
-                          Return if names are valid to delete by list of name element commands.
+                          Return if names are valid to delete by list of name element commands for confirm.
                           If names are valid to delete, successful delete of names can be expected.
 
                           Required attributes:
@@ -1059,16 +1059,16 @@ public interface INames {
     // ----------------------------------------------------------------------------------------------------
 
     /**
-     * Update names by list of name element commands.
+     * Update names by list of name element commands for update.
      * Return list of name elements for updated names.
      *
-     * @param nameElements list of name element commands
+     * @param nameElementCommands list of name element commands for update
      * @return list of name elements for updated names
      */
     @Operation(
-            summary     = "Update names by array of name element commands",
+            summary     = "Update names by array of name element commands for update",
             description = """
-                          Update names by array of name element commands.
+                          Update names by array of name element commands for update.
                           Return array of name elements for updated names.
 
                           Required attributes:
@@ -1189,16 +1189,16 @@ public interface INames {
     // ----------------------------------------------------------------------------------------------------
 
     /**
-     * Delete names by list of name element commands.
+     * Delete names by list of name element commands for confirm.
      * Return list of name elements for deleted names.
      *
-     * @param nameElements list of name element commands
+     * @param nameElementCommands list of name element commands for confirm
      * @return list of name elements for deleted names
      */
     @Operation(
-            summary     = "Delete names by array of name element commands",
+            summary     = "Delete names by array of name element commands for confirm",
             description = """
-                          Delete names by array of name element commands.
+                          Delete names by array of name element commands for confirm.
                           Return array of name elements for deleted names.
 
                           Required attributes:
diff --git a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
index 2b1f9ccc0929936c8fa7ababa8593aa7cd05895b..2055bbfe0a8119124b108e3bae094e9d8da1c486 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
@@ -142,16 +142,16 @@ public interface IStructures {
     public static final String DEFAULT_SORT_ORDER_ASC  = "true";
 
     /**
-     * Create (propose) structures by list of structure element commands.
+     * Create (propose) structures by list of structure element commands for create.
      * Return list of structure elements for created structures (proposals).
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for create
      * @return list of structure elements for created structures (proposals)
      */
     @Operation(
-            summary     = "Create (propose) structures by array of structure element commands",
+            summary     = "Create (propose) structures by array of structure element commands for create",
             description = """
-                          Create (propose) structures by array of structure element commands.
+                          Create (propose) structures by array of structure element commands for create.
                           Return array of structure elements for created structures (proposals).
 
                           Required attributes:
@@ -850,7 +850,7 @@ public interface IStructures {
     // ----------------------------------------------------------------------------------------------------
 
     /**
-     * Return if structures are valid to create (propose) by list of structure element commands.
+     * Return if structures are valid to create (propose) by list of structure element commands for create.
      * If structures are valid to create, successful create of structures can be expected.
      *
      * <p>
@@ -864,14 +864,14 @@ public interface IStructures {
      * </ul>
      * </p>
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for create
      * @return if list of structures is valid to create (propose)
      */
     @Hidden
     @Operation(
-            summary     = "Return if structures are valid to create (propose) by list of structure element commands",
+            summary     = "Return if structures are valid to create (propose) by list of structure element commands for create",
             description = """
-                          Return if structures are valid to create (propose) by list of structure element commands.
+                          Return if structures are valid to create (propose) by list of structure element commands for create.
                           If structures are valid to create, successful create of structures can be expected.
 
                           Required attributes:
@@ -936,7 +936,7 @@ public interface IStructures {
             @RequestBody List<StructureElementCommandCreate> structureElementCommands);
 
     /**
-     * Return if structures are valid to update (propose) by list of structure element commands.
+     * Return if structures are valid to update (propose) by list of structure element commands for update.
      * If structures are valid to update, successful update of structures can be expected.
      *
      * <p>
@@ -950,14 +950,14 @@ public interface IStructures {
      * </ul>
      * </p>
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for update
      * @return if list of structures is valid to update (propose)
      */
     @Hidden
     @Operation(
-            summary     = "Return if structures are valid to update (propose) by list of structure element commands",
+            summary     = "Return if structures are valid to update (propose) by list of structure element commands for update",
             description = """
-                          Return if structures are valid to update (propose) by list of structure element commands.
+                          Return if structures are valid to update (propose) by list of structure element commands for update.
                           If structures are valid to update, successful update of structures can be expected.
 
                           Required attributes:
@@ -1023,7 +1023,7 @@ public interface IStructures {
             @RequestBody List<StructureElementCommandUpdate> structureElementCommands);
 
     /**
-     * Return if structures are valid to delete (propose) by list of structure element commands.
+     * Return if structures are valid to delete (propose) by list of structure element commands for confirm.
      * If structures are valid to delete, successful delete of structures can be expected.
      *
      * <p>
@@ -1037,14 +1037,14 @@ public interface IStructures {
      * </ul>
      * </p>
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for confirm
      * @return if list of structures is valid to delete (propose)
      */
     @Hidden
     @Operation(
-            summary     = "Return if structures are valid to delete (propose) by list of structure element commands",
+            summary     = "Return if structures are valid to delete (propose) by list of structure element commands for confirm",
             description = """
-                          Return if structures are valid to delete (propose) by list of structure element commands.
+                          Return if structures are valid to delete (propose) by list of structure element commands for confirm.
                           If structures are valid to delete, successful delete of structures can be expected.
 
                           Required attributes:
@@ -1106,7 +1106,7 @@ public interface IStructures {
             @RequestBody List<StructureElementCommandConfirm> structureElementCommands);
 
     /**
-     * Return if structures are valid to approve by list of structure element commands.
+     * Return if structures are valid to approve by list of structure element commands for confirm.
      * If structures are valid to approve, successful approve of structures can be expected.
      *
      * <p>
@@ -1120,14 +1120,14 @@ public interface IStructures {
      * </ul>
      * </p>
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for confirm
      * @return if list of structures is valid to approve
      */
     @Hidden
     @Operation(
-            summary     = "Return if structures are valid to approve by list of structure element commands",
+            summary     = "Return if structures are valid to approve by list of structure element commands for confirm",
             description = """
-                          Return if structures are valid to approve by list of structure element commands.
+                          Return if structures are valid to approve by list of structure element commands for confirm.
                           If structures are valid to approve, successful approve of structures can be expected.
 
                           Required attributes:
@@ -1189,7 +1189,7 @@ public interface IStructures {
             @RequestBody List<StructureElementCommandConfirm> structureElementCommands);
 
     /**
-     * Return if structures are valid to cancel by list of structure element commands.
+     * Return if structures are valid to cancel by list of structure element commands for confirm.
      * If structures are valid to cancel, successful cancel of structures can be expected.
      *
      * <p>
@@ -1203,14 +1203,14 @@ public interface IStructures {
      * </ul>
      * </p>
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for confirm
      * @return if list of structures is valid to cancel
      */
     @Hidden
     @Operation(
-            summary     = "Return if structures are valid to cancel by list of structure element commands",
+            summary     = "Return if structures are valid to cancel by list of structure element commands for confirm",
             description = """
-                          Return if structures are valid to cancel by list of structure element commands.
+                          Return if structures are valid to cancel by list of structure element commands for confirm.
                           If structures are valid to cancel, successful cancel of structures can be expected.
 
                           Required attributes:
@@ -1272,7 +1272,7 @@ public interface IStructures {
             @RequestBody List<StructureElementCommandConfirm> structureElementCommands);
 
     /**
-     * Return if structures are valid to reject by list of structure element commands.
+     * Return if structures are valid to reject by list of structure element commands for confirm.
      * If structures are valid to reject, successful reject of structures can be expected.
      *
      * <p>
@@ -1286,14 +1286,14 @@ public interface IStructures {
      * </ul>
      * </p>
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for confirm
      * @return if list of structures is valid to reject
      */
     @Hidden
     @Operation(
-            summary     = "Return if structures are valid to reject by list of structure element commands",
+            summary     = "Return if structures are valid to reject by list of structure element commands for confirm",
             description = """
-                          Return if structures are valid to reject by list of structure element commands.
+                          Return if structures are valid to reject by list of structure element commands for confirm.
                           If structures are valid to reject, successful reject of structures can be expected.
 
                           Required attributes:
@@ -1357,16 +1357,16 @@ public interface IStructures {
     // ----------------------------------------------------------------------------------------------------
 
     /**
-     * Update (propose) structures by list of structure element commands.
+     * Update (propose) structures by list of structure element commands for update.
      * Return list of structure elements for updated structures (proposals).
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for update
      * @return list of structure elements for updated structures (proposals)
      */
     @Operation(
-            summary     = "Update (propose) structures by array of structure element commands",
+            summary     = "Update (propose) structures by array of structure element commands for update",
             description = """
-                          Update (propose) structures by array of structure element commands.
+                          Update (propose) structures by array of structure element commands for update.
                           Return array of structure elements for updated structures (proposals).
 
                           Required attributes:
@@ -1497,16 +1497,16 @@ public interface IStructures {
     // ----------------------------------------------------------------------------------------------------
 
     /**
-     * Delete (propose) structures by list of structure element commands.
+     * Delete (propose) structures by list of structure element commands for confirm.
      * Return list of structure elements for deleted structures (proposals).
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for confirm
      * @return list of structure elements for deleted structures (proposals)
      */
     @Operation(
-            summary     = "Delete (propose) structures by array of structure element commands",
+            summary     = "Delete (propose) structures by array of structure element commands for confirm",
             description = """
-                          Delete (propose) structures by array of structure element commands.
+                          Delete (propose) structures by array of structure element commands for confirm.
                           Return array of structure elements for deleted structures (proposals).
 
                           Required attributes:
@@ -1632,20 +1632,20 @@ public interface IStructures {
     // ----------------------------------------------------------------------------------------------------
 
     /**
-     * Approve structures (proposals) by list of structure element commands.
+     * Approve structures (proposals) by list of structure element commands for confirm.
      * Return list of structure elements for approved structures.
      *
      * <p>
      * Name is automatically created name when creation of system structure is approved.
      * </p>
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for confirm
      * @return list of structure elements for approved structures
      */
     @Operation(
-            summary     = "Approve structures (proposals) by array of structure element commands",
+            summary     = "Approve structures (proposals) by array of structure element commands for confirm",
             description = """
-                          Approve structures (proposals) by array of structure element commands.
+                          Approve structures (proposals) by array of structure element commands for confirm.
                           Return array of structure elements for approved structures.
 
                           Name is automatically created name when creation of system structure is approved.
@@ -1775,16 +1775,16 @@ public interface IStructures {
             @RequestParam("file") MultipartFile file);
 
     /**
-     * Cancel structures (proposals) by list of structure element commands.
+     * Cancel structures (proposals) by list of structure element commands for confirm.
      * Return list of cancelled structure elements.
      *
-     * @param structureElements list of structure elements
+     * @param structureElementCommands list of structure elements commands for confirm
      * @return list of structure elements for cancelled structures
      */
     @Operation(
-            summary     = "Cancel structures (proposals) by array of structure element commands",
+            summary     = "Cancel structures (proposals) by array of structure element commands for confirm",
             description = """
-                          Cancel structures (proposals) by array of structure element commands.
+                          Cancel structures (proposals) by array of structure element commands for confirm.
                           Return array of structure elements for cancelled structures.
 
                           Required attributes:
@@ -1906,16 +1906,16 @@ public interface IStructures {
             @RequestParam("file") MultipartFile file);
 
     /**
-     * Reject structures (proposals) by list of structure element commands.
+     * Reject structures (proposals) by list of structure element commands for confirm.
      * Return list of rejected structure elements.
      *
-     * @param structureElements list of structure element commands
+     * @param structureElementCommands list of structure element commands for confirm
      * @return list of structure elements for rejected structures
      */
     @Operation(
-            summary     = "Reject structures (proposals) by array of structure element commands",
+            summary     = "Reject structures (proposals) by array of structure element commands for confirm",
             description = """
-                          Reject structures (proposals) by array of structure element commands.
+                          Reject structures (proposals) by array of structure element commands for confirm.
                           Return array of structure elements for rejected structures.
 
                           Required attributes:
diff --git a/src/main/java/org/openepics/names/rest/controller/StructuresController.java b/src/main/java/org/openepics/names/rest/controller/StructuresController.java
index 576496775442e5af7c1c5ef01bcded91727fd979..175f8113dd833cf554f2bbbb8dced39f964da2f2 100644
--- a/src/main/java/org/openepics/names/rest/controller/StructuresController.java
+++ b/src/main/java/org/openepics/names/rest/controller/StructuresController.java
@@ -342,9 +342,7 @@ public class StructuresController implements IStructures {
         boolean response = true;
         String reason = "";
         List<ResponseBoolean> responses = Lists.newArrayList();
-        LOGGER.log(Level.INFO, "validateStructuresCreate, commands.size: " + commands.size());
         for (StructureElementCommand command : commands) {
-            LOGGER.log(Level.INFO, "validateStructuresCreate, command: " + command);
             try {
                 structuresService.validateStructuresCreate(command);
                 responses.add(new ResponseBoolean(Boolean.TRUE));
diff --git a/src/main/java/org/openepics/names/service/StructuresService.java b/src/main/java/org/openepics/names/service/StructuresService.java
index befbaef6ceeb5c956f9f6873fd650613a954106c..7088dfffd3a27520aad30281fec0af9181c1a6f2 100644
--- a/src/main/java/org/openepics/names/service/StructuresService.java
+++ b/src/main/java/org/openepics/names/service/StructuresService.java
@@ -553,8 +553,6 @@ public class StructuresService {
             List<Discipline> disciplines = holderRepositories.getDisciplineRepository().readDisciplines(Status.APPROVED, false, null, null, null, null, mnemonicPath, null);
             return !disciplines.isEmpty();
         } else if (Type.DEVICEGROUP.equals(type)) {
-//            List<DeviceGroup> deviceGroups = holderRepositories.getDeviceGroupRepository().readDeviceGroups(Status.APPROVED, false, null, null, null, null, null, mnemonicPath, null);
-//            return !deviceGroups.isEmpty();
             return Boolean.FALSE;
         } else if (Type.DEVICETYPE.equals(type)) {
             List<DeviceType> deviceTypes = holderRepositories.getDeviceTypeRepository().readDeviceTypes(Status.APPROVED, false, null, null, null, null, null, mnemonicPath, null);
diff --git a/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java b/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java
index a6c219e35ea8edcb6b95d3e42097523b7626da0f..b75b8e842a77887048e8fe0f247e668db98215a4 100644
--- a/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java
+++ b/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java
@@ -167,31 +167,6 @@ public class ValidateNameElementUtil {
         }
 
         ValidateUtil.validateInputComment(comment);
-
-//        if (NameCommand.CREATE.equals(nameCommand)) {
-//            ExceptionUtil.validateConditionInputNotEmptyException(uuid == null,
-//                    TextUtil.VALUE_IS_NOT_EMPTY, uuid != null ? uuid.toString() : null, TextUtil.UUID);
-//        } else {
-//            ValidateUtil.validateInputUuid(uuid != null ? uuid.toString() : null);
-//        }
-//
-//        if (!NameCommand.DELETE.equals(nameCommand)) {
-//            ExceptionUtil.validateConditionInputNotAvailableException(parentSystemStructure != null,
-//                    TextUtil.VALUE_IS_NOT_AVAILABLE, nameElementCommand.toString(), TextUtil.PARENTSYSTEMSTRUCTURE);
-//
-//            // optional (either none or both)
-//            //     parentDeviceStructure
-//            // 	   index
-//            if (parentDeviceStructure != null && index == null) {
-//                throw ExceptionUtil.createInputNotCorrectException(null, nameElementCommand.toString(), TextUtil.INDEX);
-//            } else if (parentDeviceStructure == null && index != null) {
-//                throw ExceptionUtil.createInputNotCorrectException(null, nameElementCommand.toString(), TextUtil.PARENTDEVICESTRUCTURE);
-//            }
-//
-//            ValidateUtil.validateInputDescription(description);
-//        }
-//
-//        ValidateUtil.validateInputComment(comment);
     }
 
     // ----------------------------------------------------------------------------------------------------
diff --git a/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java b/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java
index d1db929137717cc21969bc25c23d515162d6a958..89ded2c3a30bd015658539767aa02a6442092655 100644
--- a/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java
+++ b/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java
@@ -19,8 +19,6 @@ package org.openepics.names.util;
 
 import java.util.List;
 import java.util.UUID;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.apache.commons.lang3.StringUtils;
 import org.openepics.names.exception.DataConflictException;
@@ -62,8 +60,6 @@ public class ValidateStructureElementUtil {
     //	       cancel  - uuid, type,                                      comment
     //	       reject  - uuid, type,                                      comment
 
-    private static final Logger LOGGER = Logger.getLogger(ValidateStructureElementUtil.class.getName());
-
     /**
      * This class is not to be instantiated.
      */
@@ -218,36 +214,6 @@ public class ValidateStructureElementUtil {
         }
 
         ValidateUtil.validateInputComment(comment);
-
-//        if (StructureCommand.CREATE.equals(structureCommand)) {
-//            ExceptionUtil.validateConditionInputNotEmptyException(uuid == null,
-//                    TextUtil.VALUE_IS_NOT_EMPTY, uuid != null ? uuid.toString() : null, TextUtil.UUID);
-//        } else {
-//            ValidateUtil.validateInputUuid(uuid != null ? uuid.toString() : null);
-//        }
-//
-//        ValidateUtil.validateInputType(type);
-//
-//        if (!StructureCommand.DELETE.equals(structureCommand)) {
-//            if (ValidateUtil.isAnyEqual(type, Type.SYSTEM, Type.SUBSYSTEM, Type.DEVICEGROUP, Type.DEVICETYPE)) {
-//                ExceptionUtil.validateConditionInputNotAvailableException(parent != null,
-//                        TextUtil.PARENT_IS_NOT_AVAILABLE, structureElementCommand.toString(), TextUtil.PARENT);
-//                ValidateUtil.validateInputUuid(parent.toString());
-//            }
-//
-//            ValidateUtil.validateInputName(name);
-//
-//            // validate mnemonic
-//            //     validate mnemonic input (value itself, not in relation to other values)
-//            //     validateMnemonic takes isMnemonicRequired into account
-//            MnemonicValidation mnemonicValidation = namingConvention.validateMnemonic(type, mnemonic);
-//            ExceptionUtil.validateConditionInputNotValidException(MnemonicValidation.VALID.equals(mnemonicValidation),
-//                    TextUtil.MNEMONIC_IS_NOT_VALID, structureElementCommand.toString(), TextUtil.MNEMONIC);
-//
-//            ValidateUtil.validateInputDescription(description);
-//        }
-//
-//        ValidateUtil.validateInputComment(comment);
     }
 
     // ----------------------------------------------------------------------------------------------------
@@ -566,11 +532,6 @@ public class ValidateStructureElementUtil {
                 validateStructuresStatusSize1(uuid, type, Status.PENDING, null,
                         holderRepositories, message, details, field);
             } else if (Type.SYSTEM.equals(type)) {
-                LOGGER.log(Level.INFO, "validateStructureElementDataRelativeOtherData, SYSTEM, uuid:     " + uuid);
-                LOGGER.log(Level.INFO, "validateStructureElementDataRelativeOtherData, SYSTEM, type:     " + type);
-                LOGGER.log(Level.INFO, "validateStructureElementDataRelativeOtherData, SYSTEM, parent:   " + parent);
-                LOGGER.log(Level.INFO, "validateStructureElementDataRelativeOtherData, SYSTEM, mnemonic: " + mnemonic);
-
                 // status, uuid
                 message = TextUtil.SYSTEM_IS_NOT_CORRECT;
                 validateStructuresStatusSize1(uuid, type, Status.PENDING, null,
@@ -611,9 +572,6 @@ public class ValidateStructureElementUtil {
                 message = TextUtil.DISCIPLINE_IS_NOT_CORRECT;
                 validateStructuresStatusSize1(deviceGroups.get(0).getParentUuid(), Type.DISCIPLINE, Status.APPROVED, false,
                         holderRepositories, message, details, field);
-
-//                // no mnemonic for device group
-//                ExceptionUtil.validateConditionDataConflictException(StringUtils.isEmpty(mnemonic), message, details, field);
             } else if (Type.DEVICETYPE.equals(type)) {
                 // status, uuid
                 message = TextUtil.DEVICETYPE_IS_NOT_CORRECT;
@@ -782,10 +740,6 @@ public class ValidateStructureElementUtil {
         String[] path = NamingConventionUtil.string2MnemonicPath(mnemonicPath);
         String mnemonicpathEquivalence = namingConvention.equivalenceClassRepresentative(mnemonicPath);
 
-        LOGGER.log(Level.INFO, "validateStructureDataCreate, type: " + type);
-        LOGGER.log(Level.INFO, "validateStructureDataCreate, path: " + path);
-        LOGGER.log(Level.INFO, "validateStructureDataCreate, mnemonicpathEquivalence: " + mnemonicpathEquivalence);
-
         // validate path, including null check
         ExceptionUtil.validateConditionDataNotValidException(path != null && path.length >= 1 && path.length <= 2,
                 TextUtil.STRUCTURE_MNEMONIC_PATH_IS_NOT_VALID, details, field);
diff --git a/src/test/java/org/openepics/names/docker/NamesIT.java b/src/test/java/org/openepics/names/docker/NamesIT.java
index 6b96311f2badcdaecdb9531a3d090b024cca6ccc..3bf0952dc2e56246a82903d93d35ef596d249e0a 100644
--- a/src/test/java/org/openepics/names/docker/NamesIT.java
+++ b/src/test/java/org/openepics/names/docker/NamesIT.java
@@ -641,18 +641,14 @@ class NamesIT {
         try {
             NameElementCommandCreate nameElementCommandCreate = null;
             NameElementCommandUpdate nameElementCommandUpdate = null;
+            NameElementCommand nameElementCommand = null;
             NameElement createdNameElement = null;
 
-            nameElementCommandCreate = new NameElementCommandCreate(
-                    subsystem010PRL, deviceTypeRFA, "054",
+            nameElementCommand = new NameElementCommand(
+                    null, subsystem010PRL, deviceTypeRFA, "054",
                     "description", "comment");
-            nameElementCommandUpdate = new NameElementCommandUpdate(
-                    null,
-                    nameElementCommandCreate.getParentSystemStructure(),
-                    nameElementCommandCreate.getParentDeviceStructure(),
-                    nameElementCommandCreate.getIndex(),
-                    nameElementCommandCreate.getDescription(),
-                    nameElementCommandCreate.getComment());
+            nameElementCommandCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommand);
+            nameElementCommandUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommand);
 
             ITUtilNameElement.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
 
@@ -747,7 +743,6 @@ class NamesIT {
             NameElementCommandCreate nameElementCommandCreate = null;
             NameElementCommandConfirm nameElementCommandConfirm = null;
             NameElement createdNameElement = null;
-            NameElement deletedNameElement = null;
 
             nameElementCommandCreate = new NameElementCommandCreate(
                     subsystem010PRL, deviceTypeRFA, "056",
@@ -766,8 +761,7 @@ class NamesIT {
             ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
 
             // delete
-            deletedNameElement = ITUtilNameElement.assertDelete(nameElementCommandConfirm);
-            nameElementCommandConfirm = NameElementUtil.convertElement2CommandConfirm(deletedNameElement);
+            ITUtilNameElement.assertDelete(nameElementCommandConfirm);
 
             ITUtilNameElement.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
         } catch (Exception e) {
@@ -800,9 +794,8 @@ class NamesIT {
                 "description", "comment");
 
         // create
-        responseNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
-        nameElement1 = responseNameElement;
-        uuid = responseNameElement.getUuid();
+        nameElement1 = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+        uuid = nameElement1.getUuid();
 
         nameElementCommandCreate = new NameElementCommandCreate(
                 subsystem010, deviceTypeFS, "002",
@@ -813,53 +806,50 @@ class NamesIT {
         nameElementCommandCreate = new NameElementCommandCreate(
                 subsystem010, deviceTypeFS, "003",
                 "description", "comment");
-        responseNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+        ITUtilNameElement.assertCreate(nameElementCommandCreate);
 
         nameElementCommandCreate = new NameElementCommandCreate(
                 subsystem010, deviceTypeFS, "004",
                 "description", "comment");
-        responseNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+        ITUtilNameElement.assertCreate(nameElementCommandCreate);
 
         nameElementCommandCreate = new NameElementCommandCreate(
                 subsystem010, deviceTypeFS, "005",
                 "description", "comment");
-        responseNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+        ITUtilNameElement.assertCreate(nameElementCommandCreate);
 
         nameElementCommandCreate = new NameElementCommandCreate(
                 subsystem010, deviceTypeFS, "006",
                 "description", "comment");
-        responseNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
+        ITUtilNameElement.assertCreate(nameElementCommandCreate);
 
         nameElementCommandCreate = new NameElementCommandCreate(
                 subsystem010, deviceTypeFS, "007",
                 "description", "comment");
-        responseNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
-        nameElement7 = responseNameElement;
+        nameElement7 = ITUtilNameElement.assertCreate(nameElementCommandCreate);
 
         nameElementCommandCreate = new NameElementCommandCreate(
                 subsystem010, deviceTypeFS, "008",
                 "description", "comment");
-        responseNameElement = ITUtilNameElement.assertCreate(nameElementCommandCreate);
-        nameElement8 = responseNameElement;
+        nameElement8 = ITUtilNameElement.assertCreate(nameElementCommandCreate);
 
         // update element 1 twice
         nameElementCommandUpdate = NameElementUtil.convertElement2CommandUpdate(nameElement1);
         nameElementCommandUpdate.setDescription("updated description");
         nameElementCommandUpdate.setComment("updated comment");
 
-        responseNameElement = ITUtilNameElement.assertUpdate(nameElementCommandUpdate);
-        nameElementCommandUpdate = NameElementUtil.convertElement2CommandUpdate(responseNameElement);
+        ITUtilNameElement.assertUpdate(nameElementCommandUpdate);
 
         nameElementCommandUpdate.setDescription("updated description again");
         nameElementCommandUpdate.setComment("updated comment again");
 
-        responseNameElement = ITUtilNameElement.assertUpdate(nameElementCommandUpdate);
+        ITUtilNameElement.assertUpdate(nameElementCommandUpdate);
 
         // delete element 7, 8
         nameElementCommandConfirm = NameElementUtil.convertElement2CommandConfirm(nameElement7);
-        responseNameElement = ITUtilNameElement.assertDelete(nameElementCommandConfirm);
+        ITUtilNameElement.assertDelete(nameElementCommandConfirm);
         nameElementCommandConfirm = NameElementUtil.convertElement2CommandConfirm(nameElement8);
-        responseNameElement = ITUtilNameElement.assertDelete(nameElementCommandConfirm);
+        ITUtilNameElement.assertDelete(nameElementCommandConfirm);
 
         try {
             // read & search
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
index 4a53260585837c63d4bc452c32e92c955fef64e6..661c67617977b33e4e03f8d82aca95c25e839474 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
@@ -330,10 +330,10 @@ class StructuresDeviceGroupIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICEGROUP, "Di", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // create
@@ -341,27 +341,23 @@ class StructuresDeviceGroupIT {
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.DEVICEGROUP, "Di", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICEGROUP, "Di", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
-//            structureElement.setUuid(null);
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.TRUE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
         }
@@ -394,38 +390,33 @@ class StructuresDeviceGroupIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICEGROUP, "Di", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.DEVICEGROUP, "Di", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICEGROUP, "Di", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
-//            structureElement.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -459,38 +450,33 @@ class StructuresDeviceGroupIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICEGROUP, "Di", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.DEVICEGROUP, "Di", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICEGROUP, "Di", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICEGROUP, "Di", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "Di", Boolean.FALSE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
-//            structureElement.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -536,7 +522,6 @@ class StructuresDeviceGroupIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate update
@@ -622,23 +607,22 @@ class StructuresDeviceGroupIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update approve check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -677,23 +661,22 @@ class StructuresDeviceGroupIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update cancel check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -732,23 +715,22 @@ class StructuresDeviceGroupIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update reject check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -790,7 +772,6 @@ class StructuresDeviceGroupIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate delete
@@ -847,7 +828,6 @@ class StructuresDeviceGroupIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete approve check");
 
@@ -900,7 +880,6 @@ class StructuresDeviceGroupIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment update delete check");
 
@@ -953,7 +932,6 @@ class StructuresDeviceGroupIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete reject check");
 
@@ -1002,7 +980,6 @@ class StructuresDeviceGroupIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize();
@@ -1087,7 +1064,6 @@ class StructuresDeviceGroupIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize();
@@ -1172,7 +1148,6 @@ class StructuresDeviceGroupIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/DEVICEGROUP", 1, -1).getListSize();
@@ -1262,7 +1237,7 @@ class StructuresDeviceGroupIT {
         //         include if latest not exists             (considered present + future)
 
         StructureElementCommandCreate structureElementCommandCreate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1270,32 +1245,32 @@ class StructuresDeviceGroupIT {
                 Type.DEVICEGROUP, disciplineUuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, disciplineUuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        uuid2 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, disciplineUuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        uuid3 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, disciplineUuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid4 = createdStructureElement.getUuid();
 
         try {
             // from first structure element
@@ -1378,21 +1353,21 @@ class StructuresDeviceGroupIT {
         uuid = responseStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
@@ -1404,21 +1379,21 @@ class StructuresDeviceGroupIT {
         uuid2 = responseStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
@@ -1430,21 +1405,21 @@ class StructuresDeviceGroupIT {
         uuid3 = responseStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
@@ -1456,21 +1431,21 @@ class StructuresDeviceGroupIT {
         uuid4 = responseStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         try {
             // from first structure element
@@ -1527,114 +1502,114 @@ class StructuresDeviceGroupIT {
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
         StructureElementCommandConfirm structureElementCommandConfirm = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid = null;
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
 
         String description2 = "some other description";
         String comment2 = "some other comment";
@@ -1645,161 +1620,161 @@ class StructuresDeviceGroupIT {
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICEGROUP, discipline2Uuid,
                 "name", null,
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         // 60 device group entries
 
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
index 0212df55bb936c46d6abb21b10e6b9672520a556..59cb99d58e44f8f43ceb019119ccc23cab499731 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
@@ -342,29 +342,29 @@ class StructuresDeviceTypeIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
+            ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Ca", Boolean.TRUE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Ca", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -398,38 +398,33 @@ class StructuresDeviceTypeIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cc", Boolean.TRUE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
-//            structureElement.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -463,38 +458,33 @@ class StructuresDeviceTypeIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cr", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cr", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di-Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE, "Di-Cr", Boolean.TRUE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
-//            structureElement.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -540,7 +530,6 @@ class StructuresDeviceTypeIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate update
@@ -626,23 +615,22 @@ class StructuresDeviceTypeIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update approve check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -681,23 +669,22 @@ class StructuresDeviceTypeIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update cancel check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -736,23 +723,22 @@ class StructuresDeviceTypeIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update reject check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -794,7 +780,6 @@ class StructuresDeviceTypeIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate delete
@@ -851,7 +836,6 @@ class StructuresDeviceTypeIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete approve check");
 
@@ -904,7 +888,6 @@ class StructuresDeviceTypeIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment update delete check");
 
@@ -957,7 +940,6 @@ class StructuresDeviceTypeIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete reject check");
 
@@ -1006,7 +988,6 @@ class StructuresDeviceTypeIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize();
@@ -1093,7 +1074,6 @@ class StructuresDeviceTypeIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize();
@@ -1180,7 +1160,6 @@ class StructuresDeviceTypeIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/DEVICETYPE", 1, -1).getListSize();
@@ -1272,7 +1251,7 @@ class StructuresDeviceTypeIT {
         //         include if latest not exists             (considered present + future)
 
         StructureElementCommandCreate structureElementCommandCreate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1280,32 +1259,32 @@ class StructuresDeviceTypeIT {
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "P1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "C1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        uuid2 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "R1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        uuid3 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "A1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid4 = createdStructureElement.getUuid();
 
         try {
             // from first structure element
@@ -1378,7 +1357,7 @@ class StructuresDeviceTypeIT {
 
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1386,104 +1365,104 @@ class StructuresDeviceTypeIT {
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "P9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "C9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid2 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "R9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid3 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "A9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid4 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         try {
             // from first structure element
@@ -1543,114 +1522,114 @@ class StructuresDeviceTypeIT {
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
         StructureElementCommandConfirm structureElementCommandConfirm = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid = null;
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AA1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AA2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AA3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AA4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AA5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AB1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AB2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AB3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AB4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AB5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AC1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AC2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AC3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AC4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AC5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AD1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AD2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AD3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AD4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AD5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
 
         String description2 = "some other description";
         String comment2 = "some other comment";
@@ -1661,161 +1640,161 @@ class StructuresDeviceTypeIT {
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AE1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AE2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AE3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AE4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AE5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AF1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AF1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AF3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AF4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AF5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AG1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AG2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AG3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AG4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DEVICETYPE, deviceGroupUuid,
                 "name", "AG5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         // 60 device type entries
 
diff --git a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
index 9e5b63ecea30ad51ee69f68a296d3fd6bffebc29..cf4b64f373a7ebe02cbf3a614f3e628647134b14 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
@@ -298,29 +298,29 @@ class StructuresDisciplineIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.DISCIPLINE, "Ca", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Ca", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Ca", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
 
-            ITUtilStructureElement.assertExists         (Type.DISCIPLINE, "Ca", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Ca", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Ca", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.DISCIPLINE, "Ca", Boolean.TRUE);
+            ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Ca", Boolean.TRUE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Ca", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -354,38 +354,33 @@ class StructuresDisciplineIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.DISCIPLINE, "Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.DISCIPLINE, "Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.DISCIPLINE, "Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cc", Boolean.TRUE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
-//            structureElement.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -419,38 +414,33 @@ class StructuresDisciplineIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.DISCIPLINE, "Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cr", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.DISCIPLINE, "Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cr", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.DISCIPLINE, "Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.DISCIPLINE, "Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE, "Cr", Boolean.TRUE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
-//            structureElement.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -495,7 +485,6 @@ class StructuresDisciplineIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate update
@@ -575,23 +564,22 @@ class StructuresDisciplineIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update approve check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -630,23 +618,22 @@ class StructuresDisciplineIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update cancel check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -685,23 +672,22 @@ class StructuresDisciplineIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update reject check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -743,7 +729,6 @@ class StructuresDisciplineIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate delete
@@ -800,7 +785,6 @@ class StructuresDisciplineIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete approve check");
 
@@ -853,7 +837,6 @@ class StructuresDisciplineIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment update delete check");
 
@@ -906,7 +889,6 @@ class StructuresDisciplineIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete reject check");
 
@@ -955,7 +937,6 @@ class StructuresDisciplineIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize();
@@ -1032,9 +1013,6 @@ class StructuresDisciplineIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            StructureElementCommandCreate structureElementCommandCreate = null;
-//            StructureElementCommandConfirm structureElementCommandConfirm = null;
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize();
@@ -1111,7 +1089,6 @@ class StructuresDisciplineIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/DISCIPLINE", 1, -1).getListSize();
@@ -1193,7 +1170,7 @@ class StructuresDisciplineIT {
         //         include if latest not exists             (considered present + future)
 
         StructureElementCommandCreate structureElementCommandCreate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1201,32 +1178,32 @@ class StructuresDisciplineIT {
                 Type.DISCIPLINE, null,
                 "name", "P1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "C1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        uuid2 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "R1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        uuid3 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "A1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid4 = createdStructureElement.getUuid();
 
         try {
             // from first structure element
@@ -1295,7 +1272,7 @@ class StructuresDisciplineIT {
 
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1303,104 +1280,104 @@ class StructuresDisciplineIT {
                 Type.DISCIPLINE, null,
                 "name", "P9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "C9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid2 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "R9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid3 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "A9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid4 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         try {
             // from first structure element
@@ -1456,114 +1433,114 @@ class StructuresDisciplineIT {
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
         StructureElementCommandConfirm structureElementCommandConfirm = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid = null;
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AA1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AA2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AA3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AA4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AA5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AB1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AB2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AB3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AB4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AB5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AC1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AC2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AC3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AC4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AC5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AD1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AD2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AD3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AD4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AD5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
 
         String description2 = "some other description";
         String comment2 = "some other comment";
@@ -1574,161 +1551,161 @@ class StructuresDisciplineIT {
                 Type.DISCIPLINE, null,
                 "name", "AE1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AE2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AE3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AE4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AE5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AF1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AF2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AF3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AF4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AF5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AG1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AG2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AG3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AG4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.DISCIPLINE, null,
                 "name", "AG5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         // 60 discipline entries
 
diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
index 39e07b97e9733f0ebfbbe45c80053065c9024cc2..e973b42c0b90abc0efffc921962fb8c0d9b513a9 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
@@ -344,29 +344,29 @@ class StructuresSubsystemIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
 
-            ITUtilStructureElement.assertExists         (Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
+            ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Ca", Boolean.TRUE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Ca", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -400,38 +400,33 @@ class StructuresSubsystemIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cc", Boolean.TRUE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
-//            structureElement.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -465,38 +460,33 @@ class StructuresSubsystemIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cr", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cr", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys-Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SUBSYSTEM, "Sys-Cr", Boolean.TRUE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
-//            structureElement.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -542,7 +532,6 @@ class StructuresSubsystemIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate update
@@ -628,23 +617,22 @@ class StructuresSubsystemIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update approve check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -683,23 +671,22 @@ class StructuresSubsystemIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update cancel check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -738,23 +725,22 @@ class StructuresSubsystemIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update reject check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -796,7 +782,6 @@ class StructuresSubsystemIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate delete
@@ -853,7 +838,6 @@ class StructuresSubsystemIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete approve check");
 
@@ -906,7 +890,6 @@ class StructuresSubsystemIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment update delete check");
 
@@ -959,7 +942,6 @@ class StructuresSubsystemIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete reject check");
 
@@ -1008,7 +990,6 @@ class StructuresSubsystemIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/SUBSYSTEM", 1, -1).getListSize();
@@ -1109,7 +1090,6 @@ class StructuresSubsystemIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/SUBSYSTEM", 1, -1).getListSize();
@@ -1210,7 +1190,6 @@ class StructuresSubsystemIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/SUBSYSTEM", 1, -1).getListSize();
@@ -1316,7 +1295,7 @@ class StructuresSubsystemIT {
         //         include if latest not exists             (considered present + future)
 
         StructureElementCommandCreate structureElementCommandCreate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1324,32 +1303,32 @@ class StructuresSubsystemIT {
                 Type.SUBSYSTEM, systemUuid,
                 "name", "P1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "C1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        uuid2 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "R1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        uuid3 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "A1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid4 = createdStructureElement.getUuid();
 
         try {
             // from first structure element
@@ -1426,7 +1405,7 @@ class StructuresSubsystemIT {
 
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1434,104 +1413,104 @@ class StructuresSubsystemIT {
                 Type.SUBSYSTEM, systemUuid,
                 "name", "P9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "C9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid2 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "R9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid3 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "A9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid4 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         try {
             // from first structure element
@@ -1595,114 +1574,114 @@ class StructuresSubsystemIT {
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
         StructureElementCommandConfirm structureElementCommandConfirm = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid = null;
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AA1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AA2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AA3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AA4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AA5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AB1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AB2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AB3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AB4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AB5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AC1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AC2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AC3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AC4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AC5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AD1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AD2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AD3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AD4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AD5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
 
         String description2 = "some other description";
         String comment2 = "some other comment";
@@ -1713,161 +1692,161 @@ class StructuresSubsystemIT {
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AE1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AE2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AE3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AE4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AE5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AF1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AF2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AF3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AF4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AF5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AG1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AG2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AG3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AG4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SUBSYSTEM, systemUuid,
                 "name", "AG5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         // 60 subsystem entries
 
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
index e4e719f2a072e39b22a8c78da194f8574f7c8b83..ac7b78f079518dbaa407916e7bed8d7115e4937f 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
@@ -309,7 +309,6 @@ class StructuresSystemGroupIT {
             StructureElementCommandConfirm structureElementCommandConfirm = null;
             StructureElementCommand structureElementCommand = null;
             StructureElement createdStructureElement = null;
-            StructureElement approvedStructureElement = null;
             UUID uuid, uuid2, uuid3 = null;
 
             structureElementCommand = new StructureElementCommand(
@@ -319,10 +318,10 @@ class StructuresSystemGroupIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Ca", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // create
@@ -330,17 +329,16 @@ class StructuresSystemGroupIT {
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
             uuid = createdStructureElement.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Ca", Boolean.TRUE);
 
             ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
-            approvedStructureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
-            structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
+            ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEMGROUP, "Ca", Boolean.TRUE);
+            ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Ca", Boolean.TRUE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Ca", Boolean.FALSE);
 
             ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.FALSE);
@@ -397,52 +395,43 @@ class StructuresSystemGroupIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElementCreate.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
 
             ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
             structureElementCommandConfirm.setType(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
             structureElementCommandConfirm.setType(Type.SYSTEMGROUP);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
             structureElementCommandConfirm.setComment(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
             structureElementCommandConfirm.setComment("comment");
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cc", Boolean.TRUE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
-//            structureElementCommandCreate.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -479,13 +468,12 @@ class StructuresSystemGroupIT {
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cr", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElementCommandCreate.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cr", Boolean.FALSE);
@@ -494,7 +482,6 @@ class StructuresSystemGroupIT {
             ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
@@ -504,9 +491,6 @@ class StructuresSystemGroupIT {
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEMGROUP, "Cr", Boolean.TRUE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
-//            structureElementCommandCreate.setUuid(null);
             ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
@@ -552,7 +536,6 @@ class StructuresSystemGroupIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate update
@@ -632,24 +615,23 @@ class StructuresSystemGroupIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setDescription("description update approve check");
             structureElementCommandUpdate.setComment("comment update approve check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -688,24 +670,23 @@ class StructuresSystemGroupIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setDescription("description update cancel check");
             structureElementCommandUpdate.setComment("comment update cancel check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -744,24 +725,23 @@ class StructuresSystemGroupIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setDescription("description update reject check");
             structureElementCommandUpdate.setComment("comment update reject check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -803,7 +783,6 @@ class StructuresSystemGroupIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate delete
@@ -860,7 +839,6 @@ class StructuresSystemGroupIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete approve check");
 
@@ -913,7 +891,6 @@ class StructuresSystemGroupIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment update delete check");
 
@@ -966,7 +943,6 @@ class StructuresSystemGroupIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete reject check");
 
@@ -1015,7 +991,6 @@ class StructuresSystemGroupIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize();
@@ -1092,7 +1067,6 @@ class StructuresSystemGroupIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize();
@@ -1169,7 +1143,6 @@ class StructuresSystemGroupIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1, -1).getListSize();
@@ -1251,7 +1224,7 @@ class StructuresSystemGroupIT {
         //         include if latest not exists             (considered present + future)
 
         StructureElementCommandCreate structureElementCommandCreate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1259,32 +1232,32 @@ class StructuresSystemGroupIT {
                 Type.SYSTEMGROUP, null,
                 "name", "P1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "C1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        uuid2 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "R1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        uuid3 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "A1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid4 = createdStructureElement.getUuid();
 
         try {
             // from first structure element
@@ -1353,7 +1326,7 @@ class StructuresSystemGroupIT {
 
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1361,104 +1334,104 @@ class StructuresSystemGroupIT {
                 Type.SYSTEMGROUP, null,
                 "name", "P9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "C9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid2 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "R9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid3 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "A9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid4 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         try {
             // from first structure element
@@ -1514,114 +1487,114 @@ class StructuresSystemGroupIT {
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
         StructureElementCommandConfirm structureElementCommandConfirm = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid = null;
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AA1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AA2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AA3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AA4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AA5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AB1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AB2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AB3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AB4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AB5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AC1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AC2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AC3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AC4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AC5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AD1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AD2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AD3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AD4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AD5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
 
         String description2 = "some other description";
         String comment2 = "some other comment";
@@ -1632,161 +1605,161 @@ class StructuresSystemGroupIT {
                 Type.SYSTEMGROUP, null,
                 "name", "AE1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AE2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AE3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AE4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AE5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AF1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AF2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AF3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AF4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AF5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AG1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AG2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AG3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AG4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEMGROUP, null,
                 "name", "AG5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         // 60 system group entries
 
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
index 89608208864d2f7b57a31ee61f297f2671b39f3c..6ee4db77caaa31337c9c7e507c3dfbd787bff5c3 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
@@ -327,29 +327,29 @@ class StructuresSystemIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEM, "Ca", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEM, "Ca", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Ca", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEM, "Ca", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEM, "Ca", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Ca", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEM, "Ca", Boolean.TRUE);
+            ITUtilStructureElement.assertExists(Type.SYSTEM, "Ca", Boolean.TRUE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Ca", Boolean.FALSE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -383,38 +383,33 @@ class StructuresSystemIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEM, "Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEM, "Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEM, "Cc", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEM, "Cc", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cc", Boolean.TRUE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
-//            structureElement.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -448,38 +443,33 @@ class StructuresSystemIT {
             structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
             structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEM, "Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEM, "Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cr", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
             UUID uuid = structureElementCommandConfirm.getUuid();
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEM, "Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEM, "Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cr", Boolean.TRUE);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
             structureElementCommandConfirm.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
             structureElementCommandConfirm.setUuid(uuid);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertExists         (Type.SYSTEM, "Cr", Boolean.FALSE);
+            ITUtilStructureElement.assertExists(Type.SYSTEM, "Cr", Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.SYSTEM, "Cr", Boolean.TRUE);
 
-//            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
-//            structureElement.setUuid(null);
-            ITUtilStructureElement.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandCreate,  StructureCommand.CREATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -525,7 +515,6 @@ class StructuresSystemIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate update
@@ -611,23 +600,22 @@ class StructuresSystemIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update approve check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.TRUE);
 
             // approve
             ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE,  Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -666,23 +654,22 @@ class StructuresSystemIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update cancel check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
 
             // cancel
             ITUtilStructureElement.assertCancel(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -721,23 +708,22 @@ class StructuresSystemIT {
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandUpdate.setComment("comment update reject check");
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
 
             // update
             ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.TRUE);
 
             // reject
             ITUtilStructureElement.assertReject(structureElementCommandConfirm);
 
-            ITUtilStructureElement.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
+            ITUtilStructureElement.assertValidate(structureElementCommandUpdate,  StructureCommand.UPDATE, Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
         } catch (Exception e) {
             fail();
@@ -779,7 +765,6 @@ class StructuresSystemIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
             uuid = approvedStructureElement.getUuid();
 
             // validate delete
@@ -836,7 +821,6 @@ class StructuresSystemIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete approve check");
 
@@ -889,7 +873,6 @@ class StructuresSystemIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment update delete check");
 
@@ -942,7 +925,6 @@ class StructuresSystemIT {
                     "description", "comment");
             approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
-//            structureElement.setUuid(approvedStructureElement.getUuid());
 
             structureElementCommandConfirm.setComment("comment delete reject check");
 
@@ -991,7 +973,6 @@ class StructuresSystemIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize();
@@ -1078,7 +1059,6 @@ class StructuresSystemIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize();
@@ -1165,7 +1145,6 @@ class StructuresSystemIT {
             // create
             createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
             structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
-//            structureElement.setUuid(createdStructureElement.getUuid());
 
             // read (1)
             length = ITUtilStructureElement.assertRead("/SYSTEM", 1, -1).getListSize();
@@ -1257,7 +1236,7 @@ class StructuresSystemIT {
         //         include if latest not exists             (considered present + future)
 
         StructureElementCommandCreate structureElementCommandCreate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1265,32 +1244,32 @@ class StructuresSystemIT {
                 Type.SYSTEM, systemGroupUuid,
                 "name", "P1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "C1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        uuid2 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "R1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        uuid3 = createdStructureElement.getUuid();
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "A1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid4 = createdStructureElement.getUuid();
 
         try {
             // from first structure element
@@ -1363,7 +1342,7 @@ class StructuresSystemIT {
 
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid, uuid2, uuid3, uuid4 = null;
 
         // a number of entries for which the last entry has status PENDING
@@ -1371,104 +1350,104 @@ class StructuresSystemIT {
                 Type.SYSTEM, systemGroupUuid,
                 "name", "P9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdate(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status CANCELLED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "C9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid2 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid2 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status REJECTED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "R9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid3 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid3 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
 
         // a number of entries for which the last entry has status APPROVED
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "A9",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
-        uuid4 = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
+        uuid4 = createdStructureElement.getUuid();
 
         structureElementCommandUpdate.setComment("comment 2");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 3");
-        responseStructureElement = ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateCancel(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 4");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 5");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 6");
-        responseStructureElement = ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateReject(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 7");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 8");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
         structureElementCommandUpdate.setComment("comment 9");
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         try {
             // from first structure element
@@ -1528,114 +1507,114 @@ class StructuresSystemIT {
         StructureElementCommandCreate structureElementCommandCreate = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
         StructureElementCommandConfirm structureElementCommandConfirm = null;
-        StructureElement responseStructureElement = null;
+        StructureElement createdStructureElement = null;
         UUID uuid = null;
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AA1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        uuid = responseStructureElement.getUuid();
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        uuid = createdStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AA2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AA3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AA4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AA5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AB1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AB2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AB3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AB4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AB5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateCancel(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AC1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AC2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AC3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AC4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AC5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateReject(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AD1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AD2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AD3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AD4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AD5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreate(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreate(structureElementCommandCreate);
 
         String description2 = "some other description";
         String comment2 = "some other comment";
@@ -1646,161 +1625,161 @@ class StructuresSystemIT {
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AE1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AE2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AE3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AE4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AE5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description2);
         structureElementCommandUpdate.setComment(comment2);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
         structureElementCommandUpdate.setDescription(description3);
         structureElementCommandUpdate.setComment(comment3);
-        responseStructureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteReject(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AF1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AF2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AF3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AF4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AF5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AG1",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AG2",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AG3",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AG4",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         structureElementCommandCreate = new StructureElementCommandCreate(
                 Type.SYSTEM, systemGroupUuid,
                 "name", "AG5",
                 "description", "comment");
-        responseStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
-        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responseStructureElement);
-        responseStructureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+        createdStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElement);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         // 60 system entries
 
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java b/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
index d872bd1a43f42dc73ce540cc2b98d683d7b9c9c1..0c9a1cb1a1ac839dd0369153aea15bb13a099ad3 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
@@ -171,39 +171,39 @@ class NamesMultipleIT {
             ITUtilNameElement.assertExists("RFQ:Cryo-FS-011", Boolean.FALSE);
             ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-011", Boolean.FALSE);
             ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-011", Boolean.TRUE);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
-            ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
+            ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
             ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
 
             uuid = nameElementCommandsCreate[3].getParentSystemStructure();
             nameElementCommandsCreate[3].setParentSystemStructure(null);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
             nameElementCommandsCreate[3].setParentSystemStructure(uuid);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
 
             uuid = nameElementCommandsCreate[3].getParentDeviceStructure();
             nameElementCommandsCreate[3].setParentDeviceStructure(null);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
             nameElementCommandsCreate[3].setParentDeviceStructure(uuid);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
 
             value = nameElementCommandsCreate[3].getIndex();
             nameElementCommandsCreate[3].setIndex(null);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
             nameElementCommandsCreate[3].setIndex(value);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
 
             value = nameElementCommandsCreate[3].getDescription();
             nameElementCommandsCreate[3].setDescription(null);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
             nameElementCommandsCreate[3].setDescription(value);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
 
             value = nameElementCommandsCreate[3].getComment();
             nameElementCommandsCreate[3].setComment(null);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
             nameElementCommandsCreate[3].setComment(value);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
         } catch (Exception e) {
             fail();
         }
@@ -248,8 +248,8 @@ class NamesMultipleIT {
             nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
             nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
 
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
-            ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
+            ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
             ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
 
             nameElementCommandsCreate = new NameElementCommandCreate[] {
@@ -267,8 +267,8 @@ class NamesMultipleIT {
             ITUtilNameElement.assertExists("Acc:Cryo-FS-023", Boolean.FALSE);
             ITUtilNameElement.assertIsLegacy("Acc:Cryo-FS-023", Boolean.FALSE);
             ITUtilNameElement.assertIsValidToCreate("Acc:Cryo-FS-023", Boolean.TRUE);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
-            ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
+            ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
             ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
 
             nbrNames = ITUtilNameElement.assertRead("?deleted=false").getListSize();
@@ -279,15 +279,14 @@ class NamesMultipleIT {
 
             assertEquals(nbrNames + 9, ITUtilNameElement.assertRead("?deleted=false").getListSize());
 
-            nameElementCommandsCreate = NameElementUtil.convertElement2CommandCreate(createdNameElements);
             nameElementCommandsUpdate = NameElementUtil.convertElement2CommandUpdate(createdNameElements);
             nameElementCommandsConfirm = NameElementUtil.convertElement2CommandConfirm(createdNameElements);
 
             ITUtilNameElement.assertExists("Acc:Cryo-FS-023", Boolean.TRUE);
             ITUtilNameElement.assertIsLegacy("Acc:Cryo-FS-023", Boolean.FALSE);
             ITUtilNameElement.assertIsValidToCreate("Acc:Cryo-FS-023", Boolean.FALSE);
-            ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
-            ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+            ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
+            ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
             ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
         } catch (Exception e) {
             fail();
@@ -339,8 +338,8 @@ class NamesMultipleIT {
         ITUtilNameElement.assertExists("RFQ:Cryo-FS-031", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-031", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-031", Boolean.TRUE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
 
         nbrNames = ITUtilNameElement.assertRead("?deleted=false").getListSize();
@@ -351,52 +350,51 @@ class NamesMultipleIT {
 
         assertEquals(nbrNames + 9, ITUtilNameElement.assertRead("?deleted=false").getListSize());
 
-        nameElementCommandsCreate = NameElementUtil.convertElement2CommandCreate(createdNameElements);
         nameElementCommandsUpdate = NameElementUtil.convertElement2CommandUpdate(createdNameElements);
         nameElementCommandsConfirm = NameElementUtil.convertElement2CommandConfirm(createdNameElements);
 
         ITUtilNameElement.assertExists("RFQ:Cryo-FS-031", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-031", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-031", Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
 
         uuid = nameElementCommandsUpdate[3].getUuid();
         nameElementCommandsUpdate[3].setUuid(null);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         nameElementCommandsUpdate[3].setUuid(uuid);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
 
         uuid = nameElementCommandsUpdate[3].getParentSystemStructure();
         nameElementCommandsUpdate[3].setParentSystemStructure(null);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         nameElementCommandsUpdate[3].setParentSystemStructure(uuid);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
 
         uuid = nameElementCommandsUpdate[3].getParentDeviceStructure();
         nameElementCommandsUpdate[3].setParentDeviceStructure(null);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         nameElementCommandsUpdate[3].setParentDeviceStructure(uuid);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
 
         value = nameElementCommandsUpdate[3].getIndex();
         nameElementCommandsUpdate[3].setIndex(null);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         nameElementCommandsUpdate[3].setIndex(value);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
 
         value = nameElementCommandsUpdate[3].getDescription();
         nameElementCommandsUpdate[3].setDescription(null);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         nameElementCommandsUpdate[3].setDescription(value);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
 
         value = nameElementCommandsUpdate[3].getComment();
         nameElementCommandsUpdate[3].setComment(null);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         nameElementCommandsUpdate[3].setComment(value);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
     }
 
     @Test
@@ -440,49 +438,30 @@ class NamesMultipleIT {
         nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
         nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
 
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
 
-        nameElementCommandsCreate = new NameElementCommandCreate[] {
-                nameElementCommandsCreate[0],
-                nameElementCommandsCreate[1],
-                nameElementCommandsCreate[2],
-                nameElementCommandsCreate[4],
-                nameElementCommandsCreate[5],
-                nameElementCommandsCreate[6],
-                nameElementCommandsCreate[7],
-                nameElementCommandsCreate[8],
-                nameElementCommandsCreate[9]
-        };
-        nameElementCommandsUpdate = new NameElementCommandUpdate[] {
-                nameElementCommandsUpdate[0],
-                nameElementCommandsUpdate[1],
-                nameElementCommandsUpdate[2],
-                nameElementCommandsUpdate[4],
-                nameElementCommandsUpdate[5],
-                nameElementCommandsUpdate[6],
-                nameElementCommandsUpdate[7],
-                nameElementCommandsUpdate[8],
-                nameElementCommandsUpdate[9]
-        };
-        nameElementCommandsConfirm = new NameElementCommandConfirm[] {
-                nameElementCommandsConfirm[0],
-                nameElementCommandsConfirm[1],
-                nameElementCommandsConfirm[2],
-                nameElementCommandsConfirm[4],
-                nameElementCommandsConfirm[5],
-                nameElementCommandsConfirm[6],
-                nameElementCommandsConfirm[7],
-                nameElementCommandsConfirm[8],
-                nameElementCommandsConfirm[9]
+        nameElementCommands = new NameElementCommand[] {
+                nameElementCommands[0],
+                nameElementCommands[1],
+                nameElementCommands[2],
+                nameElementCommands[4],
+                nameElementCommands[5],
+                nameElementCommands[6],
+                nameElementCommands[7],
+                nameElementCommands[8],
+                nameElementCommands[9]
         };
+        nameElementCommandsCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommands);
+        nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
+        nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
 
         ITUtilNameElement.assertExists("RFQ", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ", Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
 
         nbrNames = ITUtilNameElement.assertRead("?deleted=false").getListSize();
@@ -493,15 +472,14 @@ class NamesMultipleIT {
 
         assertEquals(nbrNames + 9, ITUtilNameElement.assertRead("?deleted=false").getListSize());
 
-        nameElementCommandsCreate = NameElementUtil.convertElement2CommandCreate(createdNameElements);
         nameElementCommandsUpdate = NameElementUtil.convertElement2CommandUpdate(createdNameElements);
         nameElementCommandsConfirm = NameElementUtil.convertElement2CommandConfirm(createdNameElements);
 
         ITUtilNameElement.assertExists("RFQ", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ", Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
 
         nameElementCommandsUpdate[0].setDescription("0");
@@ -517,8 +495,8 @@ class NamesMultipleIT {
         ITUtilNameElement.assertExists("RFQ", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ", Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
 
         updatedNameElements = ITUtilNameElement.assertUpdate(nameElementCommandsUpdate);
@@ -527,15 +505,11 @@ class NamesMultipleIT {
 
         assertEquals(nbrNames + 9, ITUtilNameElement.assertRead("?deleted=false").getListSize());
 
-        nameElementCommandsCreate = NameElementUtil.convertElement2CommandCreate(updatedNameElements);
-        nameElementCommandsUpdate = NameElementUtil.convertElement2CommandUpdate(updatedNameElements);
-        nameElementCommandsConfirm = NameElementUtil.convertElement2CommandConfirm(updatedNameElements);
-
         ITUtilNameElement.assertExists("RFQ", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("RFQ", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ", Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
     }
 
@@ -586,8 +560,8 @@ class NamesMultipleIT {
         ITUtilNameElement.assertExists("RFQ:Cryo-FS-051", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-051", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-051", Boolean.TRUE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
 
         nbrNames = ITUtilNameElement.assertRead("?deleted=false").getListSize();
@@ -605,8 +579,8 @@ class NamesMultipleIT {
         ITUtilNameElement.assertExists("RFQ:Cryo-FS-051", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-051", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-051", Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
 
         uuid = nameElementCommandsConfirm[3].getUuid();
@@ -675,45 +649,26 @@ class NamesMultipleIT {
         ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
 
-        nameElementCommandsCreate = new NameElementCommandCreate[] {
-                nameElementCommandsCreate[0],
-                nameElementCommandsCreate[1],
-                nameElementCommandsCreate[2],
-                nameElementCommandsCreate[3],
-                nameElementCommandsCreate[4],
-                nameElementCommandsCreate[5],
-                nameElementCommandsCreate[7],
-                nameElementCommandsCreate[8],
-                nameElementCommandsCreate[9]
-        };
-        nameElementCommandsUpdate = new NameElementCommandUpdate[] {
-                nameElementCommandsUpdate[0],
-                nameElementCommandsUpdate[1],
-                nameElementCommandsUpdate[2],
-                nameElementCommandsUpdate[3],
-                nameElementCommandsUpdate[4],
-                nameElementCommandsUpdate[5],
-                nameElementCommandsUpdate[7],
-                nameElementCommandsUpdate[8],
-                nameElementCommandsUpdate[9]
-        };
-        nameElementCommandsConfirm = new NameElementCommandConfirm[] {
-                nameElementCommandsConfirm[0],
-                nameElementCommandsConfirm[1],
-                nameElementCommandsConfirm[2],
-                nameElementCommandsConfirm[3],
-                nameElementCommandsConfirm[4],
-                nameElementCommandsConfirm[5],
-                nameElementCommandsConfirm[7],
-                nameElementCommandsConfirm[8],
-                nameElementCommandsConfirm[9]
+        nameElementCommands = new NameElementCommand[] {
+                nameElementCommands[0],
+                nameElementCommands[1],
+                nameElementCommands[2],
+                nameElementCommands[3],
+                nameElementCommands[4],
+                nameElementCommands[5],
+                nameElementCommands[7],
+                nameElementCommands[8],
+                nameElementCommands[9]
         };
+        nameElementCommandsCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommands);
+        nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
+        nameElementCommandsConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommands);
 
         ITUtilNameElement.assertExists("RFQ:Cryo-FS-061", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-061", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-061", Boolean.TRUE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
 
         nbrNames = ITUtilNameElement.assertRead("?deleted=false").getListSize();
@@ -731,8 +686,8 @@ class NamesMultipleIT {
         ITUtilNameElement.assertExists("RFQ:Cryo-FS-061", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-061", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-061", Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.TRUE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
 
         deletedNameElements = ITUtilNameElement.assertDelete(nameElementCommandsConfirm);
@@ -741,15 +696,11 @@ class NamesMultipleIT {
 
         assertEquals(nbrNames, ITUtilNameElement.assertRead("?deleted=false").getListSize());
 
-        nameElementCommandsCreate = NameElementUtil.convertElement2CommandCreate(deletedNameElements);
-        nameElementCommandsUpdate = NameElementUtil.convertElement2CommandUpdate(deletedNameElements);
-        nameElementCommandsConfirm = NameElementUtil.convertElement2CommandConfirm(deletedNameElements);
-
         ITUtilNameElement.assertExists("RFQ:Cryo-FS-061", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("RFQ:Cryo-FS-061", Boolean.FALSE);
         ITUtilNameElement.assertIsValidToCreate("RFQ:Cryo-FS-061", Boolean.TRUE);
-        ITUtilNameElement.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
-        ITUtilNameElement.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
+        ITUtilNameElement.assertValidate(nameElementCommandsCreate,  NameCommand.CREATE, Boolean.TRUE);
+        ITUtilNameElement.assertValidate(nameElementCommandsUpdate,  NameCommand.UPDATE, Boolean.FALSE);
         ITUtilNameElement.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
     }
 
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
index e0d9be1677b68c42c4fb23dc53ca48bfe7ca358b..ecf7cc5f9639a18bafde3139765a06a9a5281785 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
@@ -29,7 +29,6 @@ import org.openepics.names.docker.ITUtilStructureElement;
 import org.openepics.names.rest.beans.Type;
 import org.openepics.names.rest.beans.element.NameElementCommandCreate;
 import org.openepics.names.rest.beans.element.StructureElement;
-import org.openepics.names.rest.beans.element.StructureElementCommand;
 import org.openepics.names.rest.beans.element.StructureElementCommandConfirm;
 import org.openepics.names.rest.beans.element.StructureElementCommandCreate;
 import org.openepics.names.rest.beans.response.ResponsePageStructureElements;
@@ -129,11 +128,11 @@ class StructuresCUDDeleteIT {
 
         // sg0
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, null, description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1);
-        ITUtilStructureElement.assertRead("/SYSTEM", 0);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 0);
+        ITUtilStructureElement.assertRead("/SYSTEM",      0);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   0);
         ITUtilNameElement.assertRead("", 0);
 
         // at this point
@@ -157,39 +156,38 @@ class StructuresCUDDeleteIT {
         sys13 = approvedStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub111", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub112", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub113", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub121", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub122", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub123", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub131", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub132", description, comment);
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         sub132 = approvedStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub133", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         ITUtilStructureElement.assertRead("/SYSTEMGROUP", 2);
-        ITUtilStructureElement.assertRead("/SYSTEM", 3);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 9);
+        ITUtilStructureElement.assertRead("/SYSTEM",      3);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   9);
         ITUtilNameElement.assertRead("", 13);
 
-
         // at this point
         //     above
         //     +
@@ -225,22 +223,22 @@ class StructuresCUDDeleteIT {
         sys23 = approvedStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub211", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub212", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub213", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub221", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub222", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub223", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub231", description, comment);
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
@@ -254,9 +252,9 @@ class StructuresCUDDeleteIT {
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         sub233 = approvedStructureElement.getUuid();
 
-        ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
-        ITUtilStructureElement.assertRead("/SYSTEM", 6);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
+        ITUtilStructureElement.assertRead("/SYSTEMGROUP",  3);
+        ITUtilStructureElement.assertRead("/SYSTEM",       6);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   18);
         ITUtilNameElement.assertRead("", 26);
 
         // at this point
@@ -329,12 +327,12 @@ class StructuresCUDDeleteIT {
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         dt233 = approvedStructureElement.getUuid();
 
-        ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
-        ITUtilStructureElement.assertRead("/SYSTEM", 6);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
-        ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
-        ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
-        ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
+        ITUtilStructureElement.assertRead("/SYSTEMGROUP",  3);
+        ITUtilStructureElement.assertRead("/SYSTEM",       6);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   18);
+        ITUtilStructureElement.assertRead("/DISCIPLINE",   1);
+        ITUtilStructureElement.assertRead("/DEVICEGROUP",  3);
+        ITUtilStructureElement.assertRead("/DEVICETYPE",   9);
         ITUtilNameElement.assertRead("", 26);
 
         // at this point
@@ -376,12 +374,12 @@ class StructuresCUDDeleteIT {
         nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description, comment);
         ITUtilNameElement.assertCreate(nameElementCommandCreate);
 
-        ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
-        ITUtilStructureElement.assertRead("/SYSTEM", 6);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
-        ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
-        ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
-        ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
+        ITUtilStructureElement.assertRead("/SYSTEMGROUP",  3);
+        ITUtilStructureElement.assertRead("/SYSTEM",       6);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   18);
+        ITUtilStructureElement.assertRead("/DISCIPLINE",   1);
+        ITUtilStructureElement.assertRead("/DEVICEGROUP",  3);
+        ITUtilStructureElement.assertRead("/DEVICETYPE",   9);
         ITUtilNameElement.assertRead("", 35);
 
         // at this point
@@ -398,7 +396,7 @@ class StructuresCUDDeleteIT {
         //         Sys23-Sub232:Di2-Dt232-232
         //         Sys23-Sub233:Di2-Dt233-233
 
-        ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
+        ITUtilNameElement.assertExists("Sg1",   Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys11", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys13", Boolean.TRUE);
@@ -412,7 +410,7 @@ class StructuresCUDDeleteIT {
         ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys13-Sub133", Boolean.TRUE);
 
-        ITUtilNameElement.assertExists("Sg2", Boolean.TRUE);
+        ITUtilNameElement.assertExists("Sg2",   Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys21", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys22", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys23", Boolean.TRUE);
@@ -444,82 +442,75 @@ class StructuresCUDDeleteIT {
 
         ResponsePageStructureElements responsePage = null;
         StructureElementCommandConfirm structureElementCommandConfirm = null;
-        StructureElement structureElement = null;
 
         ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
 
         responsePage = ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElement);
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.FALSE);
         ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
 
         // ----------------------------------------
 
-        ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys12", Boolean.TRUE);
+        ITUtilStructureElement.assertExists(Type.SYSTEM,    "Sys12",   Boolean.TRUE);
         ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.TRUE);
         ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.TRUE);
         ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.TRUE);
-        ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
+        ITUtilNameElement.assertExists("Sys12",        Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys12-Sub122", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys12-Sub123", Boolean.TRUE);
 
         responsePage = ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + sys12, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElement);
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
-        ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys12", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SYSTEM,    "Sys12",   Boolean.FALSE);
         ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.FALSE);
         ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.FALSE);
         ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.FALSE);
-        ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
+        ITUtilNameElement.assertExists("Sys12",        Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys12-Sub122", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys12-Sub123", Boolean.TRUE);
 
         // ----------------------------------------
 
-        ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Sg1", Boolean.TRUE);
-        ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys11", Boolean.TRUE);
-        ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys12", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys13", Boolean.TRUE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub111", Boolean.TRUE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub112", Boolean.TRUE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub113", Boolean.TRUE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub131", Boolean.TRUE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub133", Boolean.TRUE);
+        ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Sg1",   Boolean.TRUE);
+        ITUtilStructureElement.assertExists(Type.SYSTEM,      "Sys11", Boolean.TRUE);
+        ITUtilStructureElement.assertExists(Type.SYSTEM,      "Sys12", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SYSTEM,      "Sys13", Boolean.TRUE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys11-Sub111", Boolean.TRUE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys11-Sub112", Boolean.TRUE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys11-Sub113", Boolean.TRUE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys12-Sub121", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys12-Sub122", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys12-Sub123", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys13-Sub131", Boolean.TRUE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys13-Sub132", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys13-Sub133", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
 
         responsePage = ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElement);
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
-
-        ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Sg1", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys11", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys12", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SYSTEM, "Sys13", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub111", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub112", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys11-Sub113", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub121", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub122", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys12-Sub123", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub131", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.FALSE);
-        ITUtilStructureElement.assertExists(Type.SUBSYSTEM, "Sys13-Sub133", Boolean.FALSE);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+
+        ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "Sg1",   Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SYSTEM,      "Sys11", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SYSTEM,      "Sys12", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SYSTEM,      "Sys13", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys11-Sub111", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys11-Sub112", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys11-Sub113", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys12-Sub121", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys12-Sub122", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys12-Sub123", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys13-Sub131", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys13-Sub132", Boolean.FALSE);
+        ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys13-Sub133", Boolean.FALSE);
         ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
     }
 
@@ -530,16 +521,13 @@ class StructuresCUDDeleteIT {
 
         ResponsePageStructureElements responsePage = null;
         StructureElementCommandConfirm structureElementCommandConfirm = null;
-        StructureElementCommand structureElement = null;
 
         ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
 
         responsePage = ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElement);
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.FALSE);
         ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
@@ -554,10 +542,8 @@ class StructuresCUDDeleteIT {
         ITUtilNameElement.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
 
         responsePage = ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElement);
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt221", Boolean.FALSE);
         ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt222", Boolean.FALSE);
@@ -588,10 +574,8 @@ class StructuresCUDDeleteIT {
         ITUtilNameElement.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
 
         responsePage = ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + di2, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElement);
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
+        ITUtilStructureElement.assertDeleteApprove(structureElementCommandConfirm);
 
         ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt211", Boolean.FALSE);
         ITUtilStructureElement.assertExists(Type.DEVICETYPE, "Di2-Dt212", Boolean.FALSE);
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
index 07b58b6dcb6f0800413221f466b1910995c856b5..a27b27adcb2afe0cebaf1c4aa44acea920dd2862 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
@@ -29,7 +29,6 @@ import org.openepics.names.docker.ITUtilStructureElement;
 import org.openepics.names.rest.beans.Type;
 import org.openepics.names.rest.beans.element.NameElementCommandCreate;
 import org.openepics.names.rest.beans.element.StructureElement;
-import org.openepics.names.rest.beans.element.StructureElementCommand;
 import org.openepics.names.rest.beans.element.StructureElementCommandConfirm;
 import org.openepics.names.rest.beans.element.StructureElementCommandCreate;
 import org.openepics.names.rest.beans.response.ResponsePageStructureElements;
@@ -129,11 +128,11 @@ class StructuresCUDNamesLegacyIT {
 
         // sg0
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, null, description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1);
-        ITUtilStructureElement.assertRead("/SYSTEM", 0);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 0);
+        ITUtilStructureElement.assertRead("/SYSTEM",      0);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   0);
         ITUtilNameElement.assertRead("", 0);
 
         // at this point
@@ -157,36 +156,36 @@ class StructuresCUDNamesLegacyIT {
         sys13 = approvedStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub111", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub112", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub113", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub121", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub122", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub123", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub131", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub132", description, comment);
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         sub132 = approvedStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub133", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         ITUtilStructureElement.assertRead("/SYSTEMGROUP", 2);
-        ITUtilStructureElement.assertRead("/SYSTEM", 3);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 9);
+        ITUtilStructureElement.assertRead("/SYSTEM",      3);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   9);
         ITUtilNameElement.assertRead("", 13);
 
         // at this point
@@ -224,22 +223,22 @@ class StructuresCUDNamesLegacyIT {
         sys23 = approvedStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub211", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub212", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub213", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub221", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub222", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub223", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub231", description, comment);
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
@@ -253,9 +252,9 @@ class StructuresCUDNamesLegacyIT {
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         sub233 = approvedStructureElement.getUuid();
 
-        ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
-        ITUtilStructureElement.assertRead("/SYSTEM", 6);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
+        ITUtilStructureElement.assertRead("/SYSTEMGROUP",  3);
+        ITUtilStructureElement.assertRead("/SYSTEM",       6);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   18);
         ITUtilNameElement.assertRead("", 26);
 
         // at this point
@@ -328,12 +327,12 @@ class StructuresCUDNamesLegacyIT {
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         dt233 = approvedStructureElement.getUuid();
 
-        ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
-        ITUtilStructureElement.assertRead("/SYSTEM", 6);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
-        ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
-        ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
-        ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
+        ITUtilStructureElement.assertRead("/SYSTEMGROUP",  3);
+        ITUtilStructureElement.assertRead("/SYSTEM",       6);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   18);
+        ITUtilStructureElement.assertRead("/DISCIPLINE",   1);
+        ITUtilStructureElement.assertRead("/DEVICEGROUP",  3);
+        ITUtilStructureElement.assertRead("/DEVICETYPE",   9);
         ITUtilNameElement.assertRead("", 26);
 
         // at this point
@@ -375,12 +374,12 @@ class StructuresCUDNamesLegacyIT {
         nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description, comment);
         ITUtilNameElement.assertCreate(nameElementCommandCreate);
 
-        ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
-        ITUtilStructureElement.assertRead("/SYSTEM", 6);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
-        ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
-        ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
-        ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
+        ITUtilStructureElement.assertRead("/SYSTEMGROUP",  3);
+        ITUtilStructureElement.assertRead("/SYSTEM",       6);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   18);
+        ITUtilStructureElement.assertRead("/DISCIPLINE",   1);
+        ITUtilStructureElement.assertRead("/DEVICEGROUP",  3);
+        ITUtilStructureElement.assertRead("/DEVICETYPE",   9);
         ITUtilNameElement.assertRead("", 35);
 
         // at this point
@@ -418,9 +417,8 @@ class StructuresCUDNamesLegacyIT {
 
         ResponsePageStructureElements responsePage = null;
         StructureElementCommandConfirm structureElementCommandConfirm = null;
-        StructureElement structureElement = null;
 
-        ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
+        ITUtilNameElement.assertExists("Sg1",   Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys11", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys13", Boolean.TRUE);
@@ -434,7 +432,7 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys13-Sub133", Boolean.TRUE);
 
-        ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
+        ITUtilNameElement.assertIsLegacy("Sg1",   Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys12", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
@@ -449,14 +447,11 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
 
         responsePage = ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
-
-//        structureElement = responsePage.getList().get(0);
-//
-//        ITUtilStructureElement.assertApprove(ITUtilStructureElement.assertDelete(structureElement));
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
-        ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+
+        ITUtilNameElement.assertIsLegacy("Sg1",   Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys12", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
@@ -470,10 +465,9 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
 
-//        approve
-//        islegacy
-        structureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
-        ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
+        ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+
+        ITUtilNameElement.assertIsLegacy("Sg1",   Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys12", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
@@ -486,17 +480,13 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
-//        -----------------
 
         responsePage = ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + sys12, 1);
-
-//        structureElement = responsePage.getList().get(0);
-//
-//        ITUtilStructureElement.assertApprove(ITUtilStructureElement.assertDelete(structureElement));
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
-        ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+
+        ITUtilNameElement.assertIsLegacy("Sg1",   Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys12", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
@@ -510,10 +500,9 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
 
-//      approve
-//      islegacy
-        structureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
-        ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
+        ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+
+        ITUtilNameElement.assertIsLegacy("Sg1",   Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys12", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
@@ -526,17 +515,13 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys13-Sub131", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
-//		---------------------------
 
         responsePage = ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
-
-//        structureElement = responsePage.getList().get(0);
-//
-//        ITUtilStructureElement.assertApprove(ITUtilStructureElement.assertDelete(structureElement));
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
-        ITUtilNameElement.assertIsLegacy("Sg1", Boolean.FALSE);
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+
+        ITUtilNameElement.assertIsLegacy("Sg1",   Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys11", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys12", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys13", Boolean.FALSE);
@@ -550,10 +535,9 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.FALSE);
 
-//      approve
-//      islegacy
-        structureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
-        ITUtilNameElement.assertIsLegacy("Sg1", Boolean.TRUE);
+        ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+
+        ITUtilNameElement.assertIsLegacy("Sg1",   Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys11", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys12", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys13", Boolean.TRUE);
@@ -566,7 +550,6 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys13-Sub131", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys13-Sub132", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys13-Sub133", Boolean.TRUE);
-//		---------------
     }
 
     @Test
@@ -589,7 +572,6 @@ class StructuresCUDNamesLegacyIT {
 
         ResponsePageStructureElements responsePage = null;
         StructureElementCommandConfirm structureElementCommandConfirm = null;
-        StructureElementCommand structureElement = null;
 
         ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
@@ -612,12 +594,9 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
 
         responsePage = ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
-
-//        structureElement = responsePage.getList().get(0);
-//
-//        ITUtilStructureElement.assertApprove(ITUtilStructureElement.assertDelete(structureElement));
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
@@ -629,9 +608,8 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
 
-//      approve
-//      islegacy
-        structureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+        ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
@@ -641,15 +619,11 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
-//		---------------------------------
 
         responsePage = ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
-
-//        structureElement = responsePage.getList().get(0);
-//
-//        ITUtilStructureElement.assertApprove(ITUtilStructureElement.assertDelete(structureElement));
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
@@ -661,9 +635,8 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
 
-//      approve
-//      islegacy
-        structureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+        ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.FALSE);
@@ -673,15 +646,11 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
-//		---------------------------------
 
         responsePage = ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + di2, 1);
-
-//        structureElement = responsePage.getList().get(0);
-//
-//        ITUtilStructureElement.assertApprove(ITUtilStructureElement.assertDelete(structureElement));
         structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
-        structureElement = ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
+
+        ITUtilStructureElement.assertDelete(structureElementCommandConfirm);
 
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.FALSE);
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.FALSE);
@@ -693,9 +662,8 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.FALSE);
 
-//      approve
-//      islegacy
-        structureElement = ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+        ITUtilStructureElement.assertApprove(structureElementCommandConfirm);
+
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt211-211", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt212-212", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sg2:Di2-Dt213-213", Boolean.TRUE);
@@ -705,7 +673,6 @@ class StructuresCUDNamesLegacyIT {
         ITUtilNameElement.assertIsLegacy("Sys23-Sub231:Di2-Dt231-231", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
         ITUtilNameElement.assertIsLegacy("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
-//		---------------------------------
     }
 
 }
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
index 5850866d4abca6d3efa51bf039086a9d372d1203..35079ea061fb1e150111c0aed40f259c1120d034 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
@@ -128,11 +128,11 @@ class StructuresCUDUpdateIT {
 
         // sg0
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, name, null, description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         ITUtilStructureElement.assertRead("/SYSTEMGROUP", 1);
-        ITUtilStructureElement.assertRead("/SYSTEM", 0);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 0);
+        ITUtilStructureElement.assertRead("/SYSTEM",      0);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   0);
         ITUtilNameElement.assertRead("", 0);
 
         // at this point
@@ -156,36 +156,36 @@ class StructuresCUDUpdateIT {
         sys13 = approvedStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub111", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub112", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, name, "Sub113", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub121", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub122", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, name, "Sub123", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub131", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub132", description, comment);
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         sub132 = approvedStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, name, "Sub133", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         ITUtilStructureElement.assertRead("/SYSTEMGROUP", 2);
-        ITUtilStructureElement.assertRead("/SYSTEM", 3);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 9);
+        ITUtilStructureElement.assertRead("/SYSTEM",      3);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   9);
         ITUtilNameElement.assertRead("", 13);
 
 
@@ -224,22 +224,22 @@ class StructuresCUDUpdateIT {
         sys23 = approvedStructureElement.getUuid();
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub211", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub212", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, name, "Sub213", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub221", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub222", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, name, "Sub223", description, comment);
-        approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
+        ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
 
         structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, name, "Sub231", description, comment);
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
@@ -253,9 +253,9 @@ class StructuresCUDUpdateIT {
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         sub233 = approvedStructureElement.getUuid();
 
-        ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
-        ITUtilStructureElement.assertRead("/SYSTEM", 6);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
+        ITUtilStructureElement.assertRead("/SYSTEMGROUP",  3);
+        ITUtilStructureElement.assertRead("/SYSTEM",       6);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   18);
         ITUtilNameElement.assertRead("", 26);
 
         // at this point
@@ -328,12 +328,12 @@ class StructuresCUDUpdateIT {
         approvedStructureElement = ITUtilStructureElement.assertCreateApprove(structureElementCommandCreate);
         dt233 = approvedStructureElement.getUuid();
 
-        ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
-        ITUtilStructureElement.assertRead("/SYSTEM", 6);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
-        ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
-        ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
-        ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
+        ITUtilStructureElement.assertRead("/SYSTEMGROUP",  3);
+        ITUtilStructureElement.assertRead("/SYSTEM",       6);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   18);
+        ITUtilStructureElement.assertRead("/DISCIPLINE",   1);
+        ITUtilStructureElement.assertRead("/DEVICEGROUP",  3);
+        ITUtilStructureElement.assertRead("/DEVICETYPE",   9);
         ITUtilNameElement.assertRead("", 26);
 
         // at this point
@@ -375,12 +375,12 @@ class StructuresCUDUpdateIT {
         nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description, comment);
         ITUtilNameElement.assertCreate(nameElementCommandCreate);
 
-        ITUtilStructureElement.assertRead("/SYSTEMGROUP", 3);
-        ITUtilStructureElement.assertRead("/SYSTEM", 6);
-        ITUtilStructureElement.assertRead("/SUBSYSTEM", 18);
-        ITUtilStructureElement.assertRead("/DISCIPLINE", 1);
-        ITUtilStructureElement.assertRead("/DEVICEGROUP", 3);
-        ITUtilStructureElement.assertRead("/DEVICETYPE", 9);
+        ITUtilStructureElement.assertRead("/SYSTEMGROUP",  3);
+        ITUtilStructureElement.assertRead("/SYSTEM",       6);
+        ITUtilStructureElement.assertRead("/SUBSYSTEM",   18);
+        ITUtilStructureElement.assertRead("/DISCIPLINE",   1);
+        ITUtilStructureElement.assertRead("/DEVICEGROUP",  3);
+        ITUtilStructureElement.assertRead("/DEVICETYPE",   9);
         ITUtilNameElement.assertRead("", 35);
 
         // at this point
@@ -397,7 +397,7 @@ class StructuresCUDUpdateIT {
         //         Sys23-Sub232:Di2-Dt232-232
         //         Sys23-Sub233:Di2-Dt233-233
 
-        ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
+        ITUtilNameElement.assertExists("Sg1",   Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys11", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys13", Boolean.TRUE);
@@ -411,7 +411,7 @@ class StructuresCUDUpdateIT {
         ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys13-Sub133", Boolean.TRUE);
 
-        ITUtilNameElement.assertExists("Sg2", Boolean.TRUE);
+        ITUtilNameElement.assertExists("Sg2",   Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys21", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys22", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys23", Boolean.TRUE);
@@ -443,25 +443,17 @@ class StructuresCUDUpdateIT {
 
         ResponsePageStructureElements responsePage = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
-        StructureElement structureElement = null;
 
         responsePage = ITUtilStructureElement.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement.setDescription("asdf");
-//        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
         structureElementCommandUpdate.setDescription("asdf");
-        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys13-Su132",  Boolean.FALSE);
 
-//        structureElement.setMnemonic("Su132");
-//        ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate.setMnemonic("Su132");
         ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
 
         ITUtilNameElement.assertExists("Sys13-Sub132", Boolean.FALSE);
         ITUtilNameElement.assertExists("Sys13-Su132",  Boolean.TRUE);
@@ -469,13 +461,9 @@ class StructuresCUDUpdateIT {
         // ----------------------------------------
 
         responsePage = ITUtilStructureElement.assertRead("/SYSTEM?uuid=" + sys12, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement.setDescription("asdf");
-//        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
         structureElementCommandUpdate.setDescription("asdf");
-        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         ITUtilNameElement.assertExists("Sys12", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.TRUE);
@@ -486,11 +474,8 @@ class StructuresCUDUpdateIT {
         ITUtilNameElement.assertExists("Sy12-Sub122",  Boolean.FALSE);
         ITUtilNameElement.assertExists("Sy12-Sub123",  Boolean.FALSE);
 
-//        structureElement.setMnemonic("Sy12");
-//        ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate.setMnemonic("Sy12");
         ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
 
         ITUtilNameElement.assertExists("Sys12", Boolean.FALSE);
         ITUtilNameElement.assertExists("Sys12-Sub121", Boolean.FALSE);
@@ -504,22 +489,15 @@ class StructuresCUDUpdateIT {
         // ----------------------------------------
 
         responsePage = ITUtilStructureElement.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement.setDescription("asdf");
-//        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
         structureElementCommandUpdate.setDescription("asdf");
-        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         ITUtilNameElement.assertExists("Sg1", Boolean.TRUE);
         ITUtilNameElement.assertExists("S1",  Boolean.FALSE);
 
-//        structureElement.setMnemonic("S1");
-//        ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate.setMnemonic("S1");
         ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
 
         ITUtilNameElement.assertExists("Sg1", Boolean.FALSE);
         ITUtilNameElement.assertExists("S1",  Boolean.TRUE);
@@ -532,25 +510,17 @@ class StructuresCUDUpdateIT {
 
         ResponsePageStructureElements responsePage = null;
         StructureElementCommandUpdate structureElementCommandUpdate = null;
-        StructureElement structureElement = null;
 
         responsePage = ITUtilStructureElement.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement.setDescription("asdf");
-//        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
         structureElementCommandUpdate.setDescription("asdf");
-        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sys23-Sub232:Di2-D232-232",  Boolean.FALSE);
 
-//        structureElement.setMnemonic("D232");
-//        ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate.setMnemonic("D232");
         ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
 
         ITUtilNameElement.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.FALSE);
         ITUtilNameElement.assertExists("Sys23-Sub232:Di2-D232-232",  Boolean.TRUE);
@@ -558,13 +528,9 @@ class StructuresCUDUpdateIT {
         // ----------------------------------------
 
         responsePage = ITUtilStructureElement.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement.setDescription("asdf");
-//        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
         structureElementCommandUpdate.setDescription("asdf");
-        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
@@ -589,13 +555,9 @@ class StructuresCUDUpdateIT {
         // ----------------------------------------
 
         responsePage = ITUtilStructureElement.assertRead("/DISCIPLINE?uuid=" + di2, 1);
-//        structureElement = responsePage.getList().get(0);
-//        structureElement.setDescription("asdf");
-//        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
         structureElementCommandUpdate.setDescription("asdf");
-        structureElement = ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
+        ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
 
         ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.TRUE);
         ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.TRUE);
@@ -617,11 +579,8 @@ class StructuresCUDUpdateIT {
         ITUtilNameElement.assertExists("Sys23-Sub232:D2-D232-232",  Boolean.FALSE);
         ITUtilNameElement.assertExists("Sys23-Sub233:D2-Dt233-233", Boolean.FALSE);
 
-//        structureElement.setMnemonic("D2");
-//        ITUtilStructureElement.assertUpdateApprove(structureElement);
         structureElementCommandUpdate.setMnemonic("D2");
         ITUtilStructureElement.assertUpdateApprove(structureElementCommandUpdate);
-        structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(structureElement);
 
         ITUtilNameElement.assertExists("Sg2:Di2-Dt211-211", Boolean.FALSE);
         ITUtilNameElement.assertExists("Sg2:Di2-Dt212-212", Boolean.FALSE);
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
index 3c02785eb04eb1699ac05da715f3d45083c26253..e2e747fd946c7615611f346e498591e2f447d482 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
@@ -196,12 +196,6 @@ class StructuresMultipleIT {
             ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT,  Boolean.FALSE);
 
-//            uuid = subsystemUuid;
-//            structureElementCommandsCreate[1].setUuid(uuid);
-//            ITUtilStructureElement.assertValidate(structureElementCommands, StructureCommand.CREATE, Boolean.FALSE);
-//            structureElementCommandsCreate[1].setUuid(null);
-//            ITUtilStructureElement.assertValidate(structureElementCommands, StructureCommand.CREATE, Boolean.TRUE);
-
             structureElementCommandsCreate[1].setType(null);
             ITUtilStructureElement.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
             structureElementCommandsCreate[1].setType(Type.SYSTEMGROUP);
@@ -302,7 +296,6 @@ class StructuresMultipleIT {
             assertNotNull(createdStructureElements);
             assertEquals(6, createdStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(createdStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElements);
 
@@ -330,10 +323,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCa",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysCa",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubCa", Boolean.TRUE);
@@ -418,7 +407,6 @@ class StructuresMultipleIT {
             assertNotNull(createdStructureElements);
             assertEquals(6, createdStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(createdStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElements);
 
@@ -446,10 +434,6 @@ class StructuresMultipleIT {
             assertNotNull(cancelledStructureElements);
             assertEquals(6, cancelledStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(cancelledStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(cancelledStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(cancelledStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCc",      Boolean.FALSE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysCc",     Boolean.FALSE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubCc", Boolean.FALSE);
@@ -462,13 +446,7 @@ class StructuresMultipleIT {
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE,  "DiCc",      Boolean.TRUE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCc",     Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE,  "Di-DtCc",   Boolean.TRUE);
-/////
-//            ITUtilStructureElement.assertValidate(structureElementCommandsCreate,  StructureCommand.CREATE,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT,  Boolean.FALSE);
+
             ITUtilStructureElement.assertValidate(structureElementCommandsCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandsUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE,  Boolean.FALSE);
@@ -538,7 +516,6 @@ class StructuresMultipleIT {
             assertNotNull(createdStructureElements);
             assertEquals(6, createdStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(createdStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(createdStructureElements);
 
@@ -566,10 +543,6 @@ class StructuresMultipleIT {
             assertNotNull(rejectedStructureElements);
             assertEquals(6, rejectedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(rejectedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(rejectedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(rejectedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgCr",      Boolean.FALSE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysCr",     Boolean.FALSE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubCr", Boolean.FALSE);
@@ -582,13 +555,7 @@ class StructuresMultipleIT {
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE,  "DiCr",      Boolean.TRUE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpCr",     Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE,  "Di-DtCr",   Boolean.TRUE);
-/////
-//            ITUtilStructureElement.assertValidate(structureElementCommandsCreate,  StructureCommand.CREATE,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT,  Boolean.FALSE);
+
             ITUtilStructureElement.assertValidate(structureElementCommandsCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandsUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE,  Boolean.FALSE);
@@ -672,7 +639,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
 
@@ -804,7 +770,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
 
@@ -859,10 +824,6 @@ class StructuresMultipleIT {
             assertNotNull(updatedStructureElements);
             assertEquals(6, updatedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(updatedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(updatedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(updatedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUa",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysUa",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubUa", Boolean.TRUE);
@@ -887,10 +848,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUa",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysUa",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubUa", Boolean.TRUE);
@@ -980,7 +937,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
 
@@ -1035,10 +991,6 @@ class StructuresMultipleIT {
             assertNotNull(updatedStructureElements);
             assertEquals(6, updatedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(updatedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(updatedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(updatedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUc",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysUc",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubUc", Boolean.TRUE);
@@ -1063,10 +1015,6 @@ class StructuresMultipleIT {
             assertNotNull(cancelledStructureElements);
             assertEquals(6, cancelledStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(cancelledStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(cancelledStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(cancelledStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUc",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysUc",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubUc", Boolean.TRUE);
@@ -1156,7 +1104,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
 
@@ -1211,10 +1158,6 @@ class StructuresMultipleIT {
             assertNotNull(updatedStructureElements);
             assertEquals(6, updatedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(updatedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(updatedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(updatedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUr",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysUr",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubUr", Boolean.TRUE);
@@ -1239,10 +1182,6 @@ class StructuresMultipleIT {
             assertNotNull(rejectedStructureElements);
             assertEquals(6, rejectedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(rejectedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(rejectedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(rejectedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgUr",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysUr",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubUr", Boolean.TRUE);
@@ -1333,7 +1272,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
 
@@ -1435,7 +1373,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
 
@@ -1463,10 +1400,6 @@ class StructuresMultipleIT {
             assertNotNull(deletedStructureElements);
             assertEquals(6, deletedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(deletedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(deletedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(deletedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDa",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysDa",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubDa", Boolean.TRUE);
@@ -1491,10 +1424,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDa",      Boolean.FALSE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysDa",     Boolean.FALSE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubDa", Boolean.FALSE);
@@ -1507,13 +1436,7 @@ class StructuresMultipleIT {
             ITUtilStructureElement.assertIsValidToCreate(Type.DISCIPLINE,  "DiDa",      Boolean.TRUE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICEGROUP, "GrpDa",     Boolean.FALSE);
             ITUtilStructureElement.assertIsValidToCreate(Type.DEVICETYPE,  "Di-DtDa",   Boolean.TRUE);
-/////
-//            ITUtilStructureElement.assertValidate(structureElementCommandsCreate,  StructureCommand.CREATE,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.APPROVE, Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.CANCEL,  Boolean.FALSE);
-//            ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.REJECT,  Boolean.FALSE);
+
             ITUtilStructureElement.assertValidate(structureElementCommandsCreate,  StructureCommand.CREATE,  Boolean.TRUE);
             ITUtilStructureElement.assertValidate(structureElementCommandsUpdate,  StructureCommand.UPDATE,  Boolean.FALSE);
             ITUtilStructureElement.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE,  Boolean.FALSE);
@@ -1590,7 +1513,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
 
@@ -1618,10 +1540,6 @@ class StructuresMultipleIT {
             assertNotNull(deletedStructureElements);
             assertEquals(6, deletedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(deletedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(deletedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(deletedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDc",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysDc",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubDc", Boolean.TRUE);
@@ -1646,10 +1564,6 @@ class StructuresMultipleIT {
             assertNotNull(cancelledStructureElements);
             assertEquals(6, cancelledStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(cancelledStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(cancelledStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(cancelledStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDc",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysDc",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubDc", Boolean.TRUE);
@@ -1739,7 +1653,6 @@ class StructuresMultipleIT {
             assertNotNull(approvedStructureElements);
             assertEquals(6, approvedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(approvedStructureElements);
             structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
             structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
 
@@ -1767,10 +1680,6 @@ class StructuresMultipleIT {
             assertNotNull(deletedStructureElements);
             assertEquals(6, deletedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(deletedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(deletedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(deletedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDr",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysDr",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubDr", Boolean.TRUE);
@@ -1795,10 +1704,6 @@ class StructuresMultipleIT {
             assertNotNull(rejectedStructureElements);
             assertEquals(6, rejectedStructureElements.length);
 
-            structureElementCommandsCreate = StructureElementUtil.convertElement2CommandCreate(rejectedStructureElements);
-            structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(rejectedStructureElements);
-            structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(rejectedStructureElements);
-
             ITUtilStructureElement.assertExists(Type.SYSTEMGROUP, "SgDr",      Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SYSTEM,      "SysDr",     Boolean.TRUE);
             ITUtilStructureElement.assertExists(Type.SUBSYSTEM,   "Sys-SubDr", Boolean.TRUE);