Refactor HolidayForm and HolidayController. Added tests