Merge "Fix unit-test test_user_messages file name"