diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb
index 55a3a8f3..aa8423fc 100644
--- a/app/controllers/admin/comments_controller.rb
+++ b/app/controllers/admin/comments_controller.rb
@@ -12,8 +12,8 @@ module Admin
       Comment.accessible_by(current_ability).joins('INNER JOIN events ON commentable_id = events.id').order('events.title', 'comments.created_at DESC')
     end
 
-    def grouped_comments(comments)
-      comments.group_by{ |comment| comment.commentable.conference }.map {|conference, comments| [conference, comments.group_by{|comment| comment.commentable}]}.to_h
+    def grouped_comments(remarks)
+      remarks.group_by{ |comment| comment.commentable.conference }.map {|conference, comments| [conference, comments.group_by{|comment| comment.commentable}]}.to_h
     end
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 417100fd..86f4c418 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -280,6 +280,6 @@ module ApplicationHelper
   end
 
   def unread_notifications(user)
-    Comment.accessible_by(current_ability).find_since_last_login(current_user).limit(5)
+    Comment.accessible_by(current_ability).find_since_last_login(user).limit(5)
   end
 end
diff --git a/spec/controllers/admin/comments_controller_spec.rb b/spec/controllers/admin/comments_controller_spec.rb
new file mode 100644
index 00000000..f202c423
--- /dev/null
+++ b/spec/controllers/admin/comments_controller_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Admin::CommentsController do
+
+# some settings to be done before like creating objects used by tests
+  describe 'GET #index' do
+    context 'all comments' do
+      it 'populates a hash with conference, event, and comment objects'
+      it 'renders the :index template'
+    end
+
+    context 'unread_comments' do
+      it 'populates a hash with conference, event, and comment objects created since last login of current_user'
+      it 'renders the :index template'
+    end
+
+    context 'posted_comments' do
+      it 'populates a hash with conference, event, and comments posted by current_user'
+      it 'renders the :index template'
+    end
+  end
+
+  describe 'accessible_ordered_comments' do
+    it 'returns comments'
+    it 'sorts comments by created_at and event title'
+  end
+
+  describe 'grouped_comments(remarks)' do
+    it 'groups comments by conference and by event'
+    it 'returns a hash'
+  end
+end