Fixed code coverage because of duplicate messages.
Updated test naming to match required pattern and make naming easier to support