Merge "Fix Security2Test counting"