Add histogram rollup merge tests; Fix method names