Fix histogram() and avg() tests.