Further implement self-testing infrastructure