Added extra test case, cleaned up int histogram code