Issue #537 refactoring: remove copy-paste of messages from UTests