diff --git a/tests/create_test.py b/tests/create_test.py
index 6d2e343..c667d45 100755
--- a/tests/create_test.py
+++ b/tests/create_test.py
@@ -31,8 +31,8 @@ def readResultFile():
 			continue
 		numeric = ["family", "model", "stepping", "ext_family", "ext_model",
 				"num_cores", "num_logical", "L1 D cache", "L1 I cache",
-				"L2 cache", "L3 cache", "L4 cache", "L1D assoc.",
-				"L2 assoc.", "L3 assoc.", "L4 assoc.", "L1D line sz",
+				"L2 cache", "L3 cache", "L4 cache", "L1D assoc.", "L1I assoc.",
+				"L2 assoc.", "L3 assoc.", "L4 assoc.", "L1D line sz", "L1I line sz",
 				"L2 line sz", "L3 line sz", "L4 line sz"]
 		field = s[:s.find(":")].strip()
 		if field in numeric:
diff --git a/tests/intel/nehalem/arrandale-i5.test b/tests/intel/nehalem/arrandale-i5.test
index 08ec017..d81cc59 100644
--- a/tests/intel/nehalem/arrandale-i5.test
+++ b/tests/intel/nehalem/arrandale-i5.test
@@ -1,11 +1,11 @@
 basic_cpuid[0]=0000000b 756e6547 6c65746e 49656e69
-basic_cpuid[1]=00020655 00100800 009ae3bd bfebfbff
+basic_cpuid[1]=00020655 00100800 029ae3ff bfebfbff
 basic_cpuid[2]=55035a01 00f0b2dd 00000000 09ca212c
 basic_cpuid[3]=00000000 00000000 00000000 00000000
 basic_cpuid[4]=1c004121 01c0003f 0000003f 00000000
 basic_cpuid[5]=00000040 00000040 00000003 00001120
 basic_cpuid[6]=00000007 00000002 00000001 00000000
-basic_cpuid[7]=00000000 00000000 00000000 00000000
+basic_cpuid[7]=00000000 00000000 00000000 9c000000
 basic_cpuid[8]=00000000 00000000 00000000 00000000
 basic_cpuid[9]=00000000 00000000 00000000 00000000
 basic_cpuid[10]=07300403 00000004 00000000 00000603
@@ -31,10 +31,10 @@ basic_cpuid[29]=00000001 00000002 00000100 00000000
 basic_cpuid[30]=00000001 00000002 00000100 00000000
 basic_cpuid[31]=00000001 00000002 00000100 00000000
 ext_cpuid[0]=80000008 00000000 00000000 00000000
-ext_cpuid[1]=00000000 00000000 00000001 28000000
+ext_cpuid[1]=00000000 00000000 00000001 28100800
 ext_cpuid[2]=65746e49 2952286c 726f4320 4d542865
 ext_cpuid[3]=35692029 55504320 20202020 4d202020
-ext_cpuid[4]=30353420 20402020 30342e32 007a4847
+ext_cpuid[4]=30323520 20402020 30342e32 007a4847
 ext_cpuid[5]=00000000 00000000 00000000 00000000
 ext_cpuid[6]=00000000 00000000 01006040 00000000
 ext_cpuid[7]=00000000 00000000 00000000 00000100
@@ -66,6 +66,10 @@ intel_fn4[0]=1c004121 01c0003f 0000003f 00000000
 intel_fn4[1]=1c004122 00c0003f 0000007f 00000000
 intel_fn4[2]=1c004143 01c0003f 000001ff 00000000
 intel_fn4[3]=1c03c163 02c0003f 00000fff 00000002
+intel_fn4[4]=00000000 00000000 00000000 00000000
+intel_fn4[5]=00000000 00000000 00000000 00000000
+intel_fn4[6]=00000000 00000000 00000000 00000000
+intel_fn4[7]=00000000 00000000 00000000 00000000
 intel_fn11[0]=00000001 00000002 00000100 00000000
 intel_fn11[1]=00000004 00000004 00000201 00000000
 intel_fn11[2]=00000000 00000000 00000002 00000000
@@ -84,13 +88,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 3072
 -1
 8
+4
 8
 12
 -1
 64
 64
 64
+64
 -1
 128 (non-authoritative)
 Arrandale (Core i5)
-fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 popcnt rdtscp lm lahf_lm constant_tsc
+fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd popcnt aes rdtscp lm lahf_lm constant_tsc
diff --git a/tests/run_tests.py b/tests/run_tests.py
index 5a9523c..9978b43 100755
--- a/tests/run_tests.py
+++ b/tests/run_tests.py
@@ -7,8 +7,8 @@ import os, sys, re, random
 ### Constants:
 fields = [ "family", "model", "stepping", "extfamily", "extmodel", "cores",
 	   "logical", "l1d-cache", "l1i-cache", "l2-cache", "l3-cache", "l4-cache",
-	   "l1d-assoc", "l2-assoc", "l3-assoc", "l4-assoc", "l1d-cacheline",
-	   "l2-cacheline", "l3-cacheline", "l4-cacheline", "sse-size",
+	   "l1d-assoc", "l1i-assoc", "l2-assoc", "l3-assoc", "l4-assoc", "l1d-cacheline",
+	   "l1i-cacheline", "l2-cacheline", "l3-cacheline", "l4-cacheline", "sse-size",
 	   "codename", "flags" ]
 
 args = sys.argv