Add histogram rollup merge tests; Fix method names
Merge pull request #210 from lakshmi-kannan/bf_histogram_rollup_fixes

Add histogram rollup merge tests; Fix method names