[V3 PATCH 0/4] Minor improvements to the selftest setup logic