Merge pull request #5168 from tiennou/clar/fix-data-suite-count clar: correctly account for "data" suites when counting