Refactoring WorkingDay module, dependencies and test