Add another test case
Add histogram test case
Initial refactoring for supporting directories