Hangup refactoring

This refactoring the hangup scenario.
I was not able to run the full scenario with 2 different profiles (because of a Linux thing).

Thus I request @Standard8 to review this and test on his setup before validating this PR.

@Standard8 the code is on a branch in mozilla's repository so feel free to push fixies if needed.