Fix and add tests for Columbus Day