diff --git a/src/test/java/de/ozgcloud/formcycle/formdata/FormStructureParserITCase.java b/src/test/java/de/ozgcloud/formcycle/formdata/FormStructureParserITCase.java
index 68004af775c1a2c9ca0091a1c65ee31dd1c407dd..8a70b4b50bcecddffb7ca85a6a6f49d941a60d6d 100644
--- a/src/test/java/de/ozgcloud/formcycle/formdata/FormStructureParserITCase.java
+++ b/src/test/java/de/ozgcloud/formcycle/formdata/FormStructureParserITCase.java
@@ -36,9 +36,11 @@ import de.xima.fc.form.common.items.XItem;
 class FormStructureParserITCase {
 
 	private static final String FS_CONTAINER_ID = "xi-fs-n";
-	private static final String NESTED_ITEM_ID1 = "nested1";
 	private static final String NEXT_ITEM_ID = "new-item";
 
+	private static final FormNode EXPECTED_FIELD_SET_NODE = FormNodeTestFactory.createBuilder().values(null).itemId(FS_CONTAINER_ID).build();
+	private static final FormNode EXPECTED_TEXT_FIELD_NODE = FormNodeTestFactory.createBuilder().values(null).itemId(NEXT_ITEM_ID).build();
+
 	@Test
 	void shouldParseInputItem() {
 		var expected = FormNodeTestFactory.createBuilder().values(null).build();
@@ -69,18 +71,11 @@ class FormStructureParserITCase {
 		var formNodes = new FormStructureParser(initNestedMap()).parse();
 
 		assertThat(formNodes).hasSize(2);
-		assertHasContainerNodes(formNodes.get(0));
-		assertThat(formNodes.get(1).getItemId()).isEqualTo(ITEM_ID);
-	}
-
-	private void assertHasContainerNodes(FormNode containerNode) {
-		var expectedFieldSetNode = FormNodeTestFactory.createBuilder().values(null).itemId(FS_CONTAINER_ID).build();
-		var expectedTextFieldNode = FormNodeTestFactory.createBuilder().values(null).itemId(NEXT_ITEM_ID).build();
-
-		var containerNodes = containerNode.getNestedElements();
+		var containerNodes = formNodes.get(0).getNestedElements();
 		assertThat(containerNodes).hasSize(2);
-		assertThat(containerNodes.get(0)).usingRecursiveComparison().isEqualTo(expectedFieldSetNode);
-		assertThat(containerNodes.get(1)).usingRecursiveComparison().isEqualTo(expectedTextFieldNode);
+		assertThat(containerNodes.get(0)).usingRecursiveComparison().isEqualTo(EXPECTED_FIELD_SET_NODE);
+		assertThat(containerNodes.get(1)).usingRecursiveComparison().isEqualTo(EXPECTED_TEXT_FIELD_NODE);
+		assertThat(formNodes.get(1).getItemId()).isEqualTo(ITEM_ID);
 	}
 
 	private Map<String, XItem> initNestedMap() {
diff --git a/src/test/java/de/ozgcloud/formcycle/formdata/FormStructureParserTest.java b/src/test/java/de/ozgcloud/formcycle/formdata/FormStructureParserTest.java
index 049f1bc247f8a2c9eec1c1f67e83b3fe53d86d4a..5eef45b500c8e7d3e193a0eba90230b5de570961 100644
--- a/src/test/java/de/ozgcloud/formcycle/formdata/FormStructureParserTest.java
+++ b/src/test/java/de/ozgcloud/formcycle/formdata/FormStructureParserTest.java
@@ -40,36 +40,64 @@ class FormStructureParserTest {
 		}
 
 		@Test
-		void shouldCallHandleInputNode() {
-			var items = createItem(TEXT_FIELD);
-			structureParser = spy(createParser(items));
+		void shouldReturnResultNodes() {
+			structureParser = new FormStructureParser(Collections.emptyMap());
+			var expectedResultNode = new ArrayList<>(List.of(FormNodeTestFactory.create()));
+			injectResultNodes(expectedResultNode);
 
-			structureParser.parse();
+			var result = structureParser.parse();
 
-			verify(structureParser).handleInputNode(items.get(ITEM_ID));
-			verify(structureParser, never()).handleContainerNode(any());
+			assertThat(result).isSameAs(expectedResultNode);
 		}
 
-		@Test
-		void shouldCallHandleContainerNode() {
-			var items = createItem(FIELD_SET);
-			structureParser = spy(createParser(items));
+		@Nested
+		class TestHandleInputNode {
 
-			structureParser.parse();
+			@Test
+			void shouldCallHandleInputNode() {
+				var items = createItem(TEXT_FIELD);
+				structureParser = spy(createParser(items));
+
+				structureParser.parse();
+
+				verify(structureParser).handleInputNode(items.get(ITEM_ID));
+			}
+
+			@Test
+			void shouldNotCallHandleContainerNode() {
+				var items = createItem(TEXT_FIELD);
+				structureParser = spy(createParser(items));
+
+				structureParser.parse();
+
+				verify(structureParser, never()).handleContainerNode(any());
+			}
 
-			verify(structureParser).handleContainerNode(items.get(ITEM_ID));
-			verify(structureParser, never()).handleInputNode(any());
 		}
 
-		@Test
-		void shouldReturnResultNodes() {
-			structureParser = new FormStructureParser(Collections.emptyMap());
-			var expectedResultNode = new ArrayList<>(List.of(FormNodeTestFactory.create()));
-			injectResultNodes(expectedResultNode);
+		@Nested
+		class TestHandleContainerNode {
 
-			var result = structureParser.parse();
+			@Test
+			void shouldHandleContainerNode() {
+				var items = createItem(FIELD_SET);
+				structureParser = spy(createParser(items));
+
+				structureParser.parse();
+
+				verify(structureParser).handleContainerNode(items.get(ITEM_ID));
+			}
+
+			@Test
+			void shouldNotCallHandleInputNode() {
+				var items = createItem(FIELD_SET);
+				structureParser = spy(createParser(items));
+
+				structureParser.parse();
+
+				verify(structureParser, never()).handleInputNode(any());
+			}
 
-			assertThat(result).isSameAs(expectedResultNode);
 		}
 
 		private FormStructureParser createParser(Map<String, XItem> items) {