Extract UnsubscribeTester to top level
Beef up UnsubscribeTester
Beef up UnsubscribeTester some more