Changes to fix some tests
Merge pull request #400 from owdqa/feature/OWD-396-Messages_times

Changes to fix some tests