FORUM-798: Add more unit test cases