diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
index d41d18ba00..8b0fab869c 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
@@ -1 +1 @@
-0,4
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map
index b4de394767..75016ea362 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map
@@ -1 +1 @@
-11
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list
index d41d18ba00..8b0fab869c 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list
@@ -1 +1 @@
-0,4
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map
index b4de394767..75016ea362 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map
@@ -1 +1 @@
-11
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list
index d41d18ba00..8b0fab869c 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list
@@ -1 +1 @@
-0,4
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map
index b4de394767..75016ea362 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map
@@ -1 +1 @@
-11
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list
index cf141eb999..8b0fab869c 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list
@@ -1 +1 @@
-1,5
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map
index 2bd5a0a98a..75016ea362 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map
@@ -1 +1 @@
-22
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list
index cf141eb999..8b0fab869c 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list
@@ -1 +1 @@
-1,5
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map
index 2bd5a0a98a..75016ea362 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map
@@ -1 +1 @@
-22
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list
index cf141eb999..8b0fab869c 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list
@@ -1 +1 @@
-1,5
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map
index 2bd5a0a98a..75016ea362 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map
@@ -1 +1 @@
-22
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list
index 62188ed84f..7a9857542a 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list
@@ -1 +1 @@
-2,6
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map
index c739b42c4d..8ac4b4ca54 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map
@@ -1 +1 @@
-44
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list
index 62188ed84f..7a9857542a 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list
@@ -1 +1 @@
-2,6
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map
index c739b42c4d..8ac4b4ca54 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map
@@ -1 +1 @@
-44
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list
index 62188ed84f..7a9857542a 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list
@@ -1 +1 @@
-2,6
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map
index c739b42c4d..8ac4b4ca54 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map
@@ -1 +1 @@
-44
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list
index 62dcd59765..7a9857542a 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list
@@ -1 +1 @@
-3,7
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map
index d22307c427..8ac4b4ca54 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map
@@ -1 +1 @@
-88
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list
index 62dcd59765..7a9857542a 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list
@@ -1 +1 @@
-3,7
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map
index d22307c427..8ac4b4ca54 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map
@@ -1 +1 @@
-88
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list
index 62dcd59765..7a9857542a 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list
@@ -1 +1 @@
-3,7
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map
index d22307c427..8ac4b4ca54 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map
@@ -1 +1 @@
-88
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list
index d41d18ba00..e66d883ade 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list
@@ -1 +1 @@
-0,4
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map
index b4de394767..64bb6b746d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map
@@ -1 +1 @@
-11
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list
index d41d18ba00..e66d883ade 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list
@@ -1 +1 @@
-0,4
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map
index b4de394767..64bb6b746d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map
@@ -1 +1 @@
-11
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list
index d41d18ba00..e66d883ade 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list
@@ -1 +1 @@
-0,4
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map
index b4de394767..64bb6b746d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map
@@ -1 +1 @@
-11
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list
index cf141eb999..e66d883ade 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list
@@ -1 +1 @@
-1,5
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map
index 2bd5a0a98a..64bb6b746d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map
@@ -1 +1 @@
-22
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list
index cf141eb999..e66d883ade 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list
@@ -1 +1 @@
-1,5
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map
index 2bd5a0a98a..64bb6b746d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map
@@ -1 +1 @@
-22
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list
index cf141eb999..e66d883ade 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list
@@ -1 +1 @@
-1,5
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map
index 2bd5a0a98a..64bb6b746d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map
@@ -1 +1 @@
-22
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list
index 62188ed84f..fdd9f37517 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list
@@ -1 +1 @@
-2,6
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map
index c739b42c4d..caecf05cdb 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map
@@ -1 +1 @@
-44
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list
index 62188ed84f..fdd9f37517 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list
@@ -1 +1 @@
-2,6
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map
index c739b42c4d..caecf05cdb 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map
@@ -1 +1 @@
-44
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list
index 62188ed84f..fdd9f37517 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list
@@ -1 +1 @@
-2,6
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map
index c739b42c4d..caecf05cdb 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map
@@ -1 +1 @@
-44
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list
index 62dcd59765..fdd9f37517 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list
@@ -1 +1 @@
-3,7
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map
index d22307c427..caecf05cdb 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map
@@ -1 +1 @@
-88
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list
index 62dcd59765..fdd9f37517 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list
@@ -1 +1 @@
-3,7
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map
index d22307c427..caecf05cdb 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map
@@ -1 +1 @@
-88
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list
index 62dcd59765..fdd9f37517 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list
@@ -1 +1 @@
-3,7
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map
index d22307c427..caecf05cdb 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map
@@ -1 +1 @@
-88
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id
@@ -0,0 +1 @@
+0