Refactored part of Histogram model

* And replaced fixture test image