Eng 5959 Everything is awesome when histograms are part of the team

Last set of tests still need to run so don't merge