ensure Volatile lock gets deleted
Making suspension reminders delivery resilient

also had to move to contexts in tests to have
setups per context block.