diff --git a/test/dbus-sim-only.cpp b/test/dbus-sim-only.cpp
new file mode 100644
index 0000000..09c0e65
--- /dev/null
+++ b/test/dbus-sim-only.cpp
@@ -0,0 +1,19 @@
+#include <util/dbus.hpp>
+
+namespace util
+{
+
+namespace dbus
+{
+
+MachineType getMachineType()
+{
+    // default to Rainier 2S4U
+    MachineType machineType = MachineType::Rainier_2S4U;
+
+    return machineType;
+}
+
+} // namespace dbus
+
+} // namespace util
diff --git a/test/meson.build b/test/meson.build
index 911b709..2f04365 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -94,6 +94,7 @@
     '../analyzer/plugins/p10-plugins.cpp',
     '../analyzer/service_data.cpp',
     '../util/pdbg.cpp',
+    'dbus-sim-only.cpp',
     'pdbg-sim-only.cpp',
   ),
   pdbg_test_dtb,
@@ -116,6 +117,7 @@
   files(
     tc + '.cpp',
     '../util/pdbg.cpp',
+    'dbus-sim-only.cpp',
     'pdbg-sim-only.cpp',
   ),
   pdbg_test_dtb,
@@ -143,6 +145,7 @@
     '../analyzer/service_data.cpp',
     '../util/data_file.cpp',
     '../util/pdbg.cpp',
+    'dbus-sim-only.cpp',
     'pdbg-sim-only.cpp',
   ),
   pdbg_test_dtb,
@@ -167,6 +170,7 @@
     '../analyzer/resolution.cpp',
     '../analyzer/service_data.cpp',
     '../util/pdbg.cpp',
+    'dbus-sim-only.cpp',
     'pdbg-sim-only.cpp',
   ),
   pdbg_test_dtb,
@@ -191,6 +195,7 @@
     '../analyzer/plugins/p10-tod-plugins.cpp',
     '../analyzer/service_data.cpp',
     '../util/pdbg.cpp',
+    'dbus-sim-only.cpp',
     'pdbg-sim-only.cpp',
   ),
   pdbg_test_dtb,
diff --git a/test/test-resolution.cpp b/test/test-resolution.cpp
index 2de693d..99f317c 100644
--- a/test/test-resolution.cpp
+++ b/test/test-resolution.cpp
@@ -14,7 +14,7 @@
 
 // Unit paths
 constexpr auto proc_str   = "";
-constexpr auto iolink_str = "pib/perv24/pauc0/iohs0/smpgroup0";
+constexpr auto iolink_str = "pib/perv26/pauc1/iohs0/smpgroup0";
 constexpr auto omi_str    = "pib/perv12/mc0/mi0/mcc0/omi0";
 constexpr auto ocmb_str   = "pib/perv12/mc0/mi0/mcc0/omi0/ocmb0";
 constexpr auto core_str   = "pib/perv39/eq7/fc1/core1";
@@ -227,7 +227,7 @@
         "EntityPath": [],
         "GuardType": "GARD_Unrecoverable",
         "Guarded": true,
-        "LocationCode": "/proc0/pib/perv24/pauc0/iohs0/smpgroup0",
+        "LocationCode": "/proc1/pib/perv25/pauc0/iohs1/smpgroup0",
         "Priority": "A"
     },
     {
@@ -257,8 +257,8 @@
         "Callout Type": "Connected Callout",
         "Guard": true,
         "Priority": "medium_group_A",
-        "RX Target": "/proc0/pib/perv24/pauc0/iohs0/smpgroup0",
-        "TX Target": "/proc0/pib/perv24/pauc0/iohs0/smpgroup0"
+        "RX Target": "/proc0/pib/perv26/pauc1/iohs0/smpgroup0",
+        "TX Target": "/proc1/pib/perv25/pauc0/iohs1/smpgroup0"
     },
     {
         "Bus Type": "OMI_BUS",