nd_selftest v2 hotfix

label: DEMO UAT

hydrated: not yet