Fixed selftest for no-discovery case