Added Rollup to base with tests