BLACKTIE-435 Updated to allow single tests to be ran