fix failing tests
Merge pull request #123 from ChrisBr/fix_tests

fix failing tests
Refactoring alert message for conference controller