Refactoring tests to account for changes to Date