diff --git a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
index 9208588..d1fc6be 100644
--- a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
+++ b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
@@ -56,7 +56,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper
   end
 
   def self.scope_options
-    [["Class", "CLASS"]]
+    [["Software", "SOFTWARE"], ["Package", "PACKAGE"], ["Class", "CLASS"], ["Method", "METHOD"]]
   end
 
   private
diff --git a/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb b/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb
index 3fa7ea0..8e5c55e 100644
--- a/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb
+++ b/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb
@@ -30,9 +30,7 @@ class ContentViewerHelperTest < ActiveSupport::TestCase
   should 'create the license options array' do
    options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yml")
    options = options.split(";")
-   formated_options = []
-   options.each { |option| formated_options << [option, option] }
-   assert_equal formated_options, @helper.license_options
+   assert_equal options, @helper.license_options
   end
   
   should 'generate chart from metric result history' do
@@ -61,7 +59,7 @@ class ContentViewerHelperTest < ActiveSupport::TestCase
   end
 
   should 'create scope options' do
-    assert_equal [["Class", "CLASS"]], @helper.scope_options
+    assert_equal [["Software", "SOFTWARE"], ["Package", "PACKAGE"], ["Class", "CLASS"], ["Method", "METHOD"]], @helper.scope_options
   end
 
 end
--
libgit2 0.21.2