Store hours - refactor and more tests added