Fix tests again (people, don't break marionette!!)
Handle the case of deleting a ringtone set as both the default ringer and alert