Enhance expiry test.