Improved the counter rollup test