Refactored date checks. 1 test still failing.