Minor work in Analysis.Mode.Selftest.Contexts