Fixing timings test failures introduced by previous commit.
Merge pull request #68 from apmichaud/histograms

Fixing timings test failures introduced by previous commit.