Fix tests to account for year + tests