Fixing n+1 issue, writing more tests, Changing form and type of holiday