FORUM-939 | Rss and add more UT