diff --git a/lib/grouped_scope/self_grouping.rb b/lib/grouped_scope/self_grouping.rb
index 2db924a..33a9b9c 100644
--- a/lib/grouped_scope/self_grouping.rb
+++ b/lib/grouped_scope/self_grouping.rb
@@ -41,6 +41,7 @@ def all_grouped?
     end
     
     def no_group?
+      # TODO [group_id] Abstractraction point.
       proxy_owner.group_id.blank?
     end
     
diff --git a/test/grouped_scope/group_test.rb b/test/grouped_scope/self_grouping_test.rb
similarity index 75%
rename from test/grouped_scope/group_test.rb
rename to test/grouped_scope/self_grouping_test.rb
index 5e94f3b..5c713ab 100644
--- a/test/grouped_scope/group_test.rb
+++ b/test/grouped_scope/self_grouping_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../helper'
 
-class GroupTest < GroupedScope::TestCase
+class SelfGrouppingTest < GroupedScope::TestCase
   
   def setup
     setup_environment