Use rollup, add comments to test