diff --git a/test/corpus/values.txt b/test/corpus/values.txt
index 1e9f22d..2ebe081 100644
--- a/test/corpus/values.txt
+++ b/test/corpus/values.txt
@@ -1,18 +1,10 @@
 ================================================================================
-values
+Number - Integer
 ================================================================================
 
 INTEGER_VALUE = 1234
 NEGATIVE_INTEGER_VALUE = -1234
 
-FLOAT =  1234.23
-FLOAT =   -1234.23
-
-HEX = 0xff00ff
-
-BOOL_VALUE = true
-BOOL_VALUE = false
-
 --------------------------------------------------------------------------------
 
 (document
@@ -23,7 +15,19 @@ BOOL_VALUE = false
  (assignment
   key: (identifier)
   value: (number 
-      (integer)))
+      (integer))))
+
+
+================================================================================
+Number - Float
+================================================================================
+
+FLOAT =  1234.23
+FLOAT =   -1234.23
+
+--------------------------------------------------------------------------------
+
+(document
  (assignment
   key: (identifier)
   value: (number 
@@ -31,11 +35,32 @@ BOOL_VALUE = false
  (assignment
   key: (identifier)
   value: (number 
-      (float)))
+      (float))))
+
+================================================================================
+Number - Hex
+================================================================================
+
+HEX = 0xff00ff
+
+--------------------------------------------------------------------------------
+
+(document
  (assignment
   key: (identifier)
   value: (number 
-      (hexadecimal)))
+      (hexadecimal))))
+
+================================================================================
+Boolean
+================================================================================
+
+BOOL_VALUE = true
+BOOL_VALUE = false
+
+--------------------------------------------------------------------------------
+
+(document
  (assignment
   key: (identifier)
   value: (boolean))