Add a more versatile test chooser