Refactor
Tests fixed so that they don't spit Unexpected failures
Descriptions updated
Fixing test in order to adapt them to others refactors
Fix bug
Conflicts resolved from last merge
Merge pull request #361 from owdqa/feature/OWD-32505-Refactor_Messages

Feature/owd 32505 refactor messages