Improve histogram tests