Wire up expiry events and add test