WSHCMS-38 Slight upgrade for the tests.