Merge "Fix Not executed test count" into nyc-dev