diff --git a/src/main.c b/src/main.c
index 51e39d9..961d850 100644
--- a/src/main.c
+++ b/src/main.c
@@ -677,6 +677,7 @@ void print_target(struct pdbg_target *target, int level)
 	int i;
 	struct pdbg_target *next;
 	enum pdbg_target_status status;
+	char *classname;
 
 	/* Does this target actually exist? */
 	status = pdbg_target_status(target);
@@ -686,24 +687,14 @@ void print_target(struct pdbg_target *target, int level)
 	for (i = 0; i < level; i++)
 		printf("    ");
 
-	if (target) {
-		char c = 0;
-
-		if (!pdbg_target_class_name(target))
-			return;
-
-		if (!strcmp(pdbg_target_class_name(target), "pib"))
-			c = 'p';
-		else if (!strcmp(pdbg_target_class_name(target), "core"))
-			c = 'c';
-		else if (!strcmp(pdbg_target_class_name(target), "thread"))
-			c = 't';
+	classname = pdbg_target_class_name(target);
+	if (!classname)
+		return;
 
-		if (c)
-			printf("%c%d: %s\n", c, pdbg_target_index(target), pdbg_target_name(target));
-		else
-			printf("%s\n", pdbg_target_name(target));
-	}
+	printf("%s%d: %s", classname, pdbg_target_index(target), pdbg_target_name(target));
+	if (target_selected(target))
+		printf(" (*)");
+	printf("\n");
 
 	pdbg_for_each_child_target(target, next) {
 		print_target(next, level + 1);
@@ -714,7 +705,7 @@ static int probe(void)
 {
 	struct pdbg_target *target;
 
-	pdbg_for_each_class_target("pib", target) {
+	pdbg_for_each_child_target(pdbg_target_root(), target) {
 		print_target(target, 0);
 	}
 
diff --git a/tests/test_selection.sh b/tests/test_selection.sh
index 8909796..50db9e4 100755
--- a/tests/test_selection.sh
+++ b/tests/test_selection.sh
@@ -23,110 +23,111 @@ test_run pdbg -b fake probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p1: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p2: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p3: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p4: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p5: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p6: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p7: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
+fsi0: Fake FSI (*)
+    pib0: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib1: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib2: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib3: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib4: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib5: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib6: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib7: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
@@ -134,19 +135,20 @@ test_run pdbg -b fake -a probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
+fsi0: Fake FSI (*)
+    pib0: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
@@ -154,38 +156,39 @@ test_run pdbg -b fake -p0 -a probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p1: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p2: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p3: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p4: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p5: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p6: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p7: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
+fsi0: Fake FSI (*)
+    pib0: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib1: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib2: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib3: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib4: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib5: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib6: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib7: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
@@ -193,78 +196,79 @@ test_run pdbg -b fake -c0 -a probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p1: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p2: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p3: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p4: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p5: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p6: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p7: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
+fsi0: Fake FSI (*)
+    pib0: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib1: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib2: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib3: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib4: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib5: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib6: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib7: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -272,10 +276,11 @@ test_run pdbg -b fake -t0 -a probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
+fsi0: Fake FSI (*)
+    pib0: Fake PIB (*)
+        core2: Fake Core (*)
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
@@ -283,9 +288,10 @@ test_run pdbg -b fake -p0 -c2 -a probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c2: Fake Core
-        t1: Fake Thread
+fsi0: Fake FSI (*)
+    pib0: Fake PIB (*)
+        core2: Fake Core (*)
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
@@ -293,22 +299,22 @@ test_run pdbg -b fake -p0 -c2 -t1 -a probe
 
 
 test_result 0 <<EOF
-p1: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p2: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p3: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p5: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p6: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-
+fsi0: Fake FSI
+    pib1: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib2: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib3: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib5: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib6: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -316,7 +322,8 @@ test_run pdbg -b fake -p1-3,5,5-6 -c0 -t0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
+fsi0: Fake FSI (*)
+    pib0: Fake PIB (*)
 EOF
 
 do_skip
@@ -364,8 +371,9 @@ test_run pdbg -b fake -t0 -p0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
+fsi0: Fake FSI (*)
+    pib0: Fake PIB (*)
+        core0: Fake Core (*)
 EOF
 
 do_skip
@@ -373,9 +381,10 @@ test_run pdbg -b fake -c0 -p0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
+fsi0: Fake FSI (*)
+    pib0: Fake PIB (*)
+        core0: Fake Core (*)
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -383,26 +392,27 @@ test_run pdbg -b fake -t0 -c0 -p0 probe
 
 
 test_result 0 <<EOF
-p1: Fake PIB
-    c1: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p3: Fake PIB
-    c1: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p5: Fake PIB
-    c1: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p7: Fake PIB
-    c1: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
+fsi0: Fake FSI
+    pib1: Fake PIB (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib3: Fake PIB (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib5: Fake PIB (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
+    pib7: Fake PIB (*)
+        core1: Fake Core (*)
+            thread0: Fake Thread (*)
+        core3: Fake Core (*)
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -410,26 +420,27 @@ test_run pdbg -b fake -p1,3,5,7,9 -c1,3,5 -t0,2 probe
 
 
 test_result 0 <<EOF
-p1: Fake PIB
-    c1: Fake Core
-        t1: Fake Thread
-    c3: Fake Core
-        t1: Fake Thread
-p3: Fake PIB
-    c1: Fake Core
-        t1: Fake Thread
-    c3: Fake Core
-        t1: Fake Thread
-p5: Fake PIB
-    c1: Fake Core
-        t1: Fake Thread
-    c3: Fake Core
-        t1: Fake Thread
-p7: Fake PIB
-    c1: Fake Core
-        t1: Fake Thread
-    c3: Fake Core
-        t1: Fake Thread
+fsi0: Fake FSI
+    pib1: Fake PIB (*)
+        core1: Fake Core (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread1: Fake Thread (*)
+    pib3: Fake PIB (*)
+        core1: Fake Core (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread1: Fake Thread (*)
+    pib5: Fake PIB (*)
+        core1: Fake Core (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread1: Fake Thread (*)
+    pib7: Fake PIB (*)
+        core1: Fake Core (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core (*)
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
diff --git a/tests/test_selection2.sh b/tests/test_selection2.sh
index 4e7921d..a811445 100755
--- a/tests/test_selection2.sh
+++ b/tests/test_selection2.sh
@@ -14,110 +14,111 @@ do_skip ()
 }
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p1: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p2: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p3: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p4: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p5: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p6: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p7: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib1: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib2: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib3: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib4: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib5: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib6: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib7: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
@@ -125,20 +126,20 @@ test_run pdbg -b fake -P thread probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
@@ -146,38 +147,39 @@ test_run pdbg -b fake -P pib0/thread probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p1: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p2: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p3: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p4: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p5: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p6: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
-p7: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib1: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib2: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib3: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib4: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib5: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib6: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
+    pib7: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
@@ -185,78 +187,79 @@ test_run pdbg -b fake -P core0/thread probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p1: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p2: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p3: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p4: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p5: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p6: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p7: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib1: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib2: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib3: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib4: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib5: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib6: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib7: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -264,10 +267,11 @@ test_run pdbg -b fake -P thread0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c2: Fake Core
-        t0: Fake Thread
-        t1: Fake Thread
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core2: Fake Core
+            thread0: Fake Thread (*)
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
@@ -275,9 +279,10 @@ test_run pdbg -b fake -P pib0/core2/thread probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c2: Fake Core
-        t1: Fake Thread
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core2: Fake Core
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
@@ -285,22 +290,22 @@ test_run pdbg -b fake -P pib0/core2/thread1 probe
 
 
 test_result 0 <<EOF
-p1: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p2: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p3: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p5: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p6: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-
+fsi0: Fake FSI
+    pib1: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib2: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib3: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib5: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib6: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -308,7 +313,8 @@ test_run pdbg -b fake -P pib[1-3,5,5-6]/core0/thread0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
+fsi0: Fake FSI
+    pib0: Fake PIB (*)
 EOF
 
 do_skip
@@ -316,22 +322,23 @@ test_run pdbg -b fake -P pib0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-p1: Fake PIB
-    c0: Fake Core
-p2: Fake PIB
-    c0: Fake Core
-p3: Fake PIB
-    c0: Fake Core
-p4: Fake PIB
-    c0: Fake Core
-p5: Fake PIB
-    c0: Fake Core
-p6: Fake PIB
-    c0: Fake Core
-p7: Fake PIB
-    c0: Fake Core
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core0: Fake Core (*)
+    pib1: Fake PIB
+        core0: Fake Core (*)
+    pib2: Fake PIB
+        core0: Fake Core (*)
+    pib3: Fake PIB
+        core0: Fake Core (*)
+    pib4: Fake PIB
+        core0: Fake Core (*)
+    pib5: Fake PIB
+        core0: Fake Core (*)
+    pib6: Fake PIB
+        core0: Fake Core (*)
+    pib7: Fake PIB
+        core0: Fake Core (*)
 EOF
 
 do_skip
@@ -339,78 +346,79 @@ test_run pdbg -b fake -P core0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p1: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p2: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p3: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p4: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p5: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p6: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p7: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib1: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib2: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib3: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib4: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib5: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib6: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib7: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -418,30 +426,31 @@ test_run pdbg -b fake -P thread0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p1: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p2: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p3: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p4: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p5: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p6: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-p7: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib1: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib2: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib3: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib4: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib5: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib6: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+    pib7: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -449,15 +458,16 @@ test_run pdbg -b fake -P core0/thread0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
-    c1: Fake Core
-        t0: Fake Thread
-    c2: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core2: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -465,8 +475,9 @@ test_run pdbg -b fake -P pib0/thread0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core0: Fake Core (*)
 EOF
 
 do_skip
@@ -474,9 +485,10 @@ test_run pdbg -b fake -P pib0/core0 probe
 
 
 test_result 0 <<EOF
-p0: Fake PIB
-    c0: Fake Core
-        t0: Fake Thread
+fsi0: Fake FSI
+    pib0: Fake PIB
+        core0: Fake Core
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -484,26 +496,27 @@ test_run pdbg -b fake -P pib0/core0/thread0 probe
 
 
 test_result 0 <<EOF
-p1: Fake PIB
-    c1: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p3: Fake PIB
-    c1: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p5: Fake PIB
-    c1: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
-p7: Fake PIB
-    c1: Fake Core
-        t0: Fake Thread
-    c3: Fake Core
-        t0: Fake Thread
+fsi0: Fake FSI
+    pib1: Fake PIB
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib3: Fake PIB
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib5: Fake PIB
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
+    pib7: Fake PIB
+        core1: Fake Core
+            thread0: Fake Thread (*)
+        core3: Fake Core
+            thread0: Fake Thread (*)
 EOF
 
 do_skip
@@ -511,26 +524,27 @@ test_run pdbg -b fake -P pib[1,3,5,7,9]/core[1,3,5]/thread[0,2] probe
 
 
 test_result 0 <<EOF
-p1: Fake PIB
-    c1: Fake Core
-        t1: Fake Thread
-    c3: Fake Core
-        t1: Fake Thread
-p3: Fake PIB
-    c1: Fake Core
-        t1: Fake Thread
-    c3: Fake Core
-        t1: Fake Thread
-p5: Fake PIB
-    c1: Fake Core
-        t1: Fake Thread
-    c3: Fake Core
-        t1: Fake Thread
-p7: Fake PIB
-    c1: Fake Core
-        t1: Fake Thread
-    c3: Fake Core
-        t1: Fake Thread
+fsi0: Fake FSI
+    pib1: Fake PIB
+        core1: Fake Core
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread1: Fake Thread (*)
+    pib3: Fake PIB
+        core1: Fake Core
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread1: Fake Thread (*)
+    pib5: Fake PIB
+        core1: Fake Core
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread1: Fake Thread (*)
+    pib7: Fake PIB
+        core1: Fake Core
+            thread1: Fake Thread (*)
+        core3: Fake Core
+            thread1: Fake Thread (*)
 EOF
 
 do_skip
