Added logic and tests checking current date vs expiration date