Updated tests to better handle crossing year boundaries.