I could move the code upthere and change the test, but this means that the voicemail/emergency case get splitted at two different places. Are you okay with that ?