Fixed tests for the new graphs and histograms.
Merge remote-tracking branch 'origin/redo-43-fixes' into 43-histograms