Misc selftest adjustements
3 files changed