Fixes bug in test for extended years
merge with upstream
Merge pull request #491 from hoegaarden/extended_years

Extended years