Refactoring of Discussion.java and add DiscussionTest #59 #60