WSHCMS-32 fixed tests