add more tests for rollup - some are broken pending code changes