diff --git a/testcases.xml b/testcases.xml
index 79d1ef3..c8e2cf2 100644
--- a/testcases.xml
+++ b/testcases.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="SHIFT_JIS"?>
+<!-- ^ multibyte encoding flag -->
 <test>
     <!-- Correct formatting + arrays -->
     <entry __type="ip4" __count="2">127.0.0.1 192.168.0.1</entry>
@@ -12,6 +13,12 @@
     <entry __type="binary">DEADBEEF</entry>
     <!-- Lowercase, too -->
     <entry __type="bin">deadbe7a</entry>
+    <!-- Array of array -->
+    <entry __type="3u8" __count="2">1 2 3 1 2 3</entry>
+    <!-- Tag with no text element -->
+    <no_friends/>
+    <!-- Tag with no text element and some attrs -->
+    <food_for_thought bread="tasty"/>
     
     <!-- Simple cases for the rest of the formats -->
     <entry __type="s8">123</entry>
@@ -32,7 +39,7 @@
     <entry __type="d">123.100</entry>
     <entry __type="double">123.100</entry>
     <entry __type="2s8">127 -23</entry>
-    <entry __type="2u8">232 12</entry>
+    <entry __type="2u8" __count="2">232 12 13 14</entry>
     <entry __type="2s16">1232 -5433</entry>
     <entry __type="2u16">345 3455</entry>
     <entry __type="2s32">123123 -12672</entry>
diff --git a/testcases_out.kbin b/testcases_out.kbin
index d2124da..e3ec604 100644
Binary files a/testcases_out.kbin and b/testcases_out.kbin differ
diff --git a/testcases_out.xml b/testcases_out.xml
index b6a353c..ce99fc8 100644
--- a/testcases_out.xml
+++ b/testcases_out.xml
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF_8"?>
 <test>
-    <entry __type="ip4" __count="2">127.0.0.1 192.168.0.1</entry>
+    <entry __count="2" __type="ip4">127.0.0.1 192.168.0.1</entry>
     <entry __type="str" attr="test" attr2="best">Hello, world!</entry>
     <xXx_T4GG3R_xXx __type="3u8">8 9 10</xXx_T4GG3R_xXx>
     <aligned __type="u8">12</aligned>
-    <entry __type="bin" __size="4">deadbeef</entry>
-    <entry __type="bin" __size="4">deadbe7a</entry>
+    <entry __size="4" __type="bin">deadbeef</entry>
+    <entry __size="4" __type="bin">deadbe7a</entry>
+    <entry __count="2" __type="3u8">1 2 3 1 2 3</entry>
+    <no_friends/>
+    <food_for_thought bread="tasty"/>
     <entry __type="s8">123</entry>
     <entry __type="u8">123</entry>
     <entry __type="s16">123</entry>
@@ -14,8 +17,8 @@
     <entry __type="u32">123</entry>
     <entry __type="s64">123</entry>
     <entry __type="u64">123</entry>
-    <entry __type="bin" __size="4">f00d1337</entry>
-    <entry __type="bin" __size="4">deadbeef</entry>
+    <entry __size="4" __type="bin">f00d1337</entry>
+    <entry __size="4" __type="bin">deadbeef</entry>
     <entry __type="str">TEST STRING 2</entry>
     <entry __type="str">TEST STRING</entry>
     <entry __type="ip4">192.168.0.1</entry>
@@ -24,7 +27,7 @@
     <entry __type="double">123.100000</entry>
     <entry __type="double">123.100000</entry>
     <entry __type="2s8">127 -23</entry>
-    <entry __type="2u8">232 12</entry>
+    <entry __count="2" __type="2u8">232 12 13 14</entry>
     <entry __type="2s16">1232 -5433</entry>
     <entry __type="2u16">345 3455</entry>
     <entry __type="2s32">123123 -12672</entry>