diff --git a/test/corpus/container.txt b/test/corpus/container.txt
index dbfa5ea..e95d05c 100644
--- a/test/corpus/container.txt
+++ b/test/corpus/container.txt
@@ -21,7 +21,7 @@ foo.bar.biz
 )
 
 ================================================================================
-Use quoted string as a shape key
+Use quoted string as keys
 ================================================================================
 'foo'.'baz'
 
@@ -67,39 +67,6 @@ foo: {
   )
 )
 
-================================================================================
-Declare a container with complex keys
-================================================================================
-
-Foo biz bar: {
-  bar biz baz: {
-    -biz-baz-Baz-: {
-      Helo world
-    }
-  }
-}
-
---------------------------------------------------------------------------------
-
-(source_file
-  (container
-    (container_key)
-    (block
-      (container
-        (container_key)
-        (block
-          (container
-            (container_key)
-            (block
-              (shape (shape_key))
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
 ================================================================================
 Declare labeled container inside a labeled container using block
 ================================================================================
@@ -159,3 +126,74 @@ foo: {
   )
 )
 
+
+================================================================================
+Declare a container with complex keys
+================================================================================
+
+Foo biz bar: {
+  bar biz baz: {
+    -biz-baz-Baz-: {
+      Helo world
+    }
+  }
+}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (container
+    (container_key)
+    (block
+      (container
+        (container_key)
+        (block
+          (container
+            (container_key)
+            (block
+              (shape (shape_key))
+            )
+          )
+        )
+      )
+    )
+  )
+)
+
+================================================================================
+Declare a container with complex keys and labels
+================================================================================
+
+Foo biz bar: Biz biz Bar {
+  bar biz baz: baz baz biz {
+    -biz-baz-Baz-: Biz buz Baz {
+      Helo world
+    }
+  }
+}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (container
+    (container_key)
+    (label)
+    (block
+      (container
+        (container_key)
+        (label)
+        (block
+          (container
+            (container_key)
+            (label)
+            (block
+              (shape (shape_key))
+            )
+          )
+        )
+      )
+    )
+  )
+)
+
+
diff --git a/test/corpus/shape.txt b/test/corpus/shape.txt
index 9db5732..16a0489 100644
--- a/test/corpus/shape.txt
+++ b/test/corpus/shape.txt
@@ -104,3 +104,14 @@ foo: Foo {}
   (shape (shape_key) (label) (block))
 )
 
+================================================================================
+Use quoted string as shape key and label
+================================================================================
+'foo': "Label"
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (shape (shape_key (string)) (label (string)))
+)
+