set expiry always when unsubscribing from messageList
rename some test exports for clarity