Fix tidy auxiliary and payload modules

spec/file_fixtures/modules/auxiliary/auxiliary_tidy.rb

@@ -5,15 +5,11 @@
 
 class MetasploitModule < Msf::Auxiliary
   def initialize(info = {})
-    super(
+    super(update_info(info,
-      update_info(
+      'Name'        => 'Tidy Auxiliary Module for RSpec'
-        info,
+      'Description' => 'Test!'
-        'Name'            => 'Tidy Auxiliary Module for RSpec'
+      'Author'      => 'Unknown',
-        'Description'     => 'Test!'
+      'License'     => MSF_LICENSE
-        },
+    ))
-        'Author'         => %w(Unknown),
-        'License'        => MSF_LICENSE,
-      )
-    )
   end
 end

spec/file_fixtures/modules/payloads/payload_tidy.rb

@@ -4,14 +4,13 @@
 ##
 
 
-module Metasploit
+module MetasploitModule
   def initialize(info = {})
-    super(
+    super(merge_info(info,
-      merge_info(
+      'Name'        => 'Tidy Payload for RSpec',
-        info,
+      'Description' => 'Test!',
-        'Name'          => 'Tidy Payload for RSpec',
+      'Author'      => 'Unknown',
-        'Description'   => 'Test!'
+      'License'     => MSF_LICENSE
-      )
+    ))
-    )
   end
 end