Fix handling of subscribed presence if a user is removed from the roster

You could Expect the "subscribe" presence here, before sending "subscribed". The would test our message persistence rules a bit too.