TRUNK-4443 Fixed failing integration tests

(cherry picked from commit ee12c7cd1881efdcef737d27740123f32af5a901)
TRUNK-4443 Corrected messages

(cherry picked from commit d8ea99e1c7544a346d525f025f293214713f04ea)