Merge "CommentsTest: @Inject members instead of using getInstance"