Refactored date constants and update tests.