Correction to handle multiple test types.