Add the test for RollupTool
Fix some nits