diff --git a/bin/hirb.rb b/bin/hirb.rb
index 94b5cdba1ca..d0295d638d4 100644
--- a/bin/hirb.rb
+++ b/bin/hirb.rb
@@ -115,7 +115,7 @@ org.apache.log4j.Logger.getLogger("org.apache.zookeeper").setLevel(log_level)
 org.apache.log4j.Logger.getLogger("org.apache.hadoop.hbase").setLevel(log_level)
 
 # Require HBase now after setting log levels
-require 'hbase'
+require 'hbase_constants'
 
 # Load hbase shell
 require 'shell'
@@ -123,15 +123,11 @@ require 'shell'
 # Require formatter
 require 'shell/formatter'
 
-# Presume console format.
-# Formatter takes an :output_stream parameter, if you don't want STDOUT.
-@formatter = Shell::Formatter::Console.new
-
 # Setup the HBase module.  Create a configuration.
 @hbase = Hbase::Hbase.new
 
 # Setup console
-@shell = Shell::Shell.new(@hbase, @formatter, interactive)
+@shell = Shell::Shell.new(@hbase, interactive)
 @shell.debug = @shell_debug
 
 # Add commands to this namespace
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb
index 35039af3178..f32376db46c 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -31,10 +31,10 @@ module Hbase
   class Admin
     include HBaseConstants
 
-    def initialize(admin, formatter)
-      @admin = admin
-      @connection = @admin.getConnection()
-      @formatter = formatter
+    def initialize(connection)
+      @connection = connection
+      # Java Admin instance
+      @admin = @connection.getAdmin
     end
 
     def close
@@ -308,12 +308,6 @@ module Hbase
       org.apache.hadoop.hbase.zookeeper.ZKUtil::dump(@zk_wrapper)
     end
 
-    #----------------------------------------------------------------------------------------------
-    # Parse arguments and update HTableDescriptor accordingly
-    def parse_htd_args(htd, arg)
-      htd.setNormalizationEnabled(JBoolean.valueOf(arg.delete(NORMALIZATION_ENABLED))) if arg[NORMALIZATION_ENABLED]
-    end
-
     #----------------------------------------------------------------------------------------------
     # Creates a table
     def create(table_name, *args)
@@ -392,24 +386,7 @@ module Hbase
         end
 
         # Done with splits; apply formerly-table_att parameters.
-        htd.setOwnerString(arg.delete(OWNER)) if arg[OWNER]
-        htd.setMaxFileSize(JLong.valueOf(arg.delete(MAX_FILESIZE))) if arg[MAX_FILESIZE]
-        htd.setReadOnly(JBoolean.valueOf(arg.delete(READONLY))) if arg[READONLY]
-        htd.setCompactionEnabled(JBoolean.valueOf(arg[COMPACTION_ENABLED])) if arg[COMPACTION_ENABLED]
-        htd.setMemStoreFlushSize(JLong.valueOf(arg.delete(MEMSTORE_FLUSHSIZE))) if arg[MEMSTORE_FLUSHSIZE]
-        # DEFERRED_LOG_FLUSH is deprecated and was replaced by DURABILITY.  To keep backward compatible, it still exists.
-        # However, it has to be set before DURABILITY so that DURABILITY could overwrite if both args are set
-        if arg.include?(DEFERRED_LOG_FLUSH)
-          if arg.delete(DEFERRED_LOG_FLUSH).to_s.upcase == "TRUE"
-            htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf("ASYNC_WAL"))
-          else
-            htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf("SYNC_WAL"))
-          end
-        end
-        htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf(arg.delete(DURABILITY))) if arg[DURABILITY]
-        parse_htd_args(htd, arg)
-        set_user_metadata(htd, arg.delete(METADATA)) if arg[METADATA]
-        set_descriptor_config(htd, arg.delete(CONFIGURATION)) if arg[CONFIGURATION]
+        update_htd_from_arg(htd, arg)
 
         arg.each_key do |ignored_key|
           puts("An argument ignored (unknown or overridden): %s" % [ ignored_key ])
@@ -653,26 +630,7 @@ module Hbase
         end
 
         # 3) Some args for the table, optionally with METHOD => table_att (deprecated)
-        raise(ArgumentError, "NAME argument in an unexpected place") if name
-        htd.setOwnerString(arg.delete(OWNER)) if arg[OWNER]
-        htd.setMaxFileSize(JLong.valueOf(arg.delete(MAX_FILESIZE))) if arg[MAX_FILESIZE]
-        htd.setReadOnly(JBoolean.valueOf(arg.delete(READONLY))) if arg[READONLY]
-        htd.setCompactionEnabled(JBoolean.valueOf(arg[COMPACTION_ENABLED])) if arg[COMPACTION_ENABLED]
-        parse_htd_args(htd, arg)
-        htd.setMemStoreFlushSize(JLong.valueOf(arg.delete(MEMSTORE_FLUSHSIZE))) if arg[MEMSTORE_FLUSHSIZE]
-        # DEFERRED_LOG_FLUSH is deprecated and was replaced by DURABILITY.  To keep backward compatible, it still exists.
-        # However, it has to be set before DURABILITY so that DURABILITY could overwrite if both args are set
-        if arg.include?(DEFERRED_LOG_FLUSH)
-          if arg.delete(DEFERRED_LOG_FLUSH).to_s.upcase == "TRUE"
-            htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf("ASYNC_WAL"))
-          else
-            htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf("SYNC_WAL"))
-          end
-        end
-        htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf(arg.delete(DURABILITY))) if arg[DURABILITY]
-        htd.setRegionReplication(JInteger.valueOf(arg.delete(REGION_REPLICATION))) if arg[REGION_REPLICATION]
-        set_user_metadata(htd, arg.delete(METADATA)) if arg[METADATA]
-        set_descriptor_config(htd, arg.delete(CONFIGURATION)) if arg[CONFIGURATION]
+        update_htd_from_arg(htd, arg)
 
         # set a coprocessor attribute
         valid_coproc_keys = []
@@ -764,7 +722,7 @@ module Hbase
             rLoadSink = sl.getReplicationLoadSink()
             rSinkString << " AgeOfLastAppliedOp=" + rLoadSink.getAgeOfLastAppliedOp().to_s
             rSinkString << ", TimeStampsOfLastAppliedOp=" +
-			    (java.util.Date.new(rLoadSink.getTimeStampsOfLastAppliedOp())).toString()
+                (java.util.Date.new(rLoadSink.getTimeStampsOfLastAppliedOp())).toString()
             rLoadSourceList = sl.getReplicationLoadSourceList()
             index = 0
             while index < rLoadSourceList.size()
@@ -773,7 +731,7 @@ module Hbase
               rSourceString << ", AgeOfLastShippedOp=" + rLoadSource.getAgeOfLastShippedOp().to_s
               rSourceString << ", SizeOfLogQueue=" + rLoadSource.getSizeOfLogQueue().to_s
               rSourceString << ", TimeStampsOfLastShippedOp=" +
-			      (java.util.Date.new(rLoadSource.getTimeStampOfLastShippedOp())).toString()
+                  (java.util.Date.new(rLoadSource.getTimeStampOfLastShippedOp())).toString()
               rSourceString << ", Replication Lag=" + rLoadSource.getReplicationLag().to_s
               index = index + 1
             end
@@ -1186,5 +1144,29 @@ module Hbase
     def list_procedures()
       @admin.listProcedures()
     end
+
+    # Parse arguments and update HTableDescriptor accordingly
+    def update_htd_from_arg(htd, arg)
+      htd.setOwnerString(arg.delete(OWNER)) if arg[OWNER]
+      htd.setMaxFileSize(JLong.valueOf(arg.delete(MAX_FILESIZE))) if arg[MAX_FILESIZE]
+      htd.setReadOnly(JBoolean.valueOf(arg.delete(READONLY))) if arg[READONLY]
+      htd.setCompactionEnabled(JBoolean.valueOf(arg[COMPACTION_ENABLED])) if arg[COMPACTION_ENABLED]
+      htd.setNormalizationEnabled(
+        JBoolean.valueOf(arg[NORMALIZATION_ENABLED])) if arg[NORMALIZATION_ENABLED]
+      htd.setMemStoreFlushSize(JLong.valueOf(arg.delete(MEMSTORE_FLUSHSIZE))) if arg[MEMSTORE_FLUSHSIZE]
+      # DEFERRED_LOG_FLUSH is deprecated and was replaced by DURABILITY.  To keep backward compatible, it still exists.
+      # However, it has to be set before DURABILITY so that DURABILITY could overwrite if both args are set
+      if arg.include?(DEFERRED_LOG_FLUSH)
+        if arg.delete(DEFERRED_LOG_FLUSH).to_s.upcase == "TRUE"
+          htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf("ASYNC_WAL"))
+        else
+          htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf("SYNC_WAL"))
+        end
+      end
+      htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf(arg.delete(DURABILITY))) if arg[DURABILITY]
+      htd.setRegionReplication(JInteger.valueOf(arg.delete(REGION_REPLICATION))) if arg[REGION_REPLICATION]
+      set_user_metadata(htd, arg.delete(METADATA)) if arg[METADATA]
+      set_descriptor_config(htd, arg.delete(CONFIGURATION)) if arg[CONFIGURATION]
+    end
   end
 end
diff --git a/hbase-shell/src/main/ruby/hbase/hbase.rb b/hbase-shell/src/main/ruby/hbase/hbase.rb
index 852f34953c7..bc5a31dc571 100644
--- a/hbase-shell/src/main/ruby/hbase/hbase.rb
+++ b/hbase-shell/src/main/ruby/hbase/hbase.rb
@@ -18,6 +18,8 @@
 #
 
 include Java
+java_import org.apache.hadoop.hbase.client.ConnectionFactory
+java_import org.apache.hadoop.hbase.HBaseConfiguration
 
 require 'hbase/admin'
 require 'hbase/table'
@@ -35,25 +37,25 @@ module Hbase
       if config
         self.configuration = config
       else
-        self.configuration = org.apache.hadoop.hbase.HBaseConfiguration.create
+        self.configuration = HBaseConfiguration.create
         # Turn off retries in hbase and ipc.  Human doesn't want to wait on N retries.
         configuration.setInt("hbase.client.retries.number", 7)
         configuration.setInt("hbase.ipc.client.connect.max.retries", 3)
       end
-      @connection = org.apache.hadoop.hbase.client.ConnectionFactory.createConnection(
-          self.configuration)
+      @connection = ConnectionFactory.createConnection(self.configuration)
     end
 
-    def admin(formatter)
-      ::Hbase::Admin.new(@connection.getAdmin, formatter)
+    # Returns ruby's Admin class from admin.rb
+    def admin()
+      ::Hbase::Admin.new(@connection)
     end
 
-    def rsgroup_admin(formatter)
-      ::Hbase::RSGroupAdmin.new(@connection, formatter)
+    def rsgroup_admin()
+      ::Hbase::RSGroupAdmin.new(@connection)
     end
 
-    def taskmonitor(formatter)
-      ::Hbase::TaskMonitor.new(configuration, formatter)
+    def taskmonitor()
+      ::Hbase::TaskMonitor.new(configuration)
     end
 
     # Create new one each time
@@ -61,20 +63,20 @@ module Hbase
       ::Hbase::Table.new(@connection.getTable(TableName.valueOf(table)), shell)
     end
 
-    def replication_admin(formatter)
-      ::Hbase::RepAdmin.new(configuration, formatter)
+    def replication_admin()
+      ::Hbase::RepAdmin.new(configuration)
     end
 
-    def security_admin(formatter)
-      ::Hbase::SecurityAdmin.new(@connection.getAdmin, formatter)
+    def security_admin()
+      ::Hbase::SecurityAdmin.new(@connection.getAdmin)
     end
 
-    def visibility_labels_admin(formatter)
-      ::Hbase::VisibilityLabelsAdmin.new(@connection.getAdmin, formatter)
+    def visibility_labels_admin()
+      ::Hbase::VisibilityLabelsAdmin.new(@connection.getAdmin)
     end
 
-    def quotas_admin(formatter)
-      ::Hbase::QuotasAdmin.new(@connection.getAdmin, formatter)
+    def quotas_admin()
+      ::Hbase::QuotasAdmin.new(@connection.getAdmin)
     end
 
     def shutdown
diff --git a/hbase-shell/src/main/ruby/hbase/quotas.rb b/hbase-shell/src/main/ruby/hbase/quotas.rb
index 0be428de8d7..bf2dc63d96a 100644
--- a/hbase-shell/src/main/ruby/hbase/quotas.rb
+++ b/hbase-shell/src/main/ruby/hbase/quotas.rb
@@ -36,9 +36,8 @@ end
 
 module Hbase
   class QuotasAdmin
-    def initialize(admin, formatter)
+    def initialize(admin)
       @admin = admin
-      @formatter = formatter
     end
 
     def close
diff --git a/hbase-shell/src/main/ruby/hbase/replication_admin.rb b/hbase-shell/src/main/ruby/hbase/replication_admin.rb
index e91a4f77d84..7eae7afe704 100644
--- a/hbase-shell/src/main/ruby/hbase/replication_admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/replication_admin.rb
@@ -31,10 +31,9 @@ module Hbase
   class RepAdmin
     include HBaseConstants
 
-    def initialize(configuration, formatter)
+    def initialize(configuration)
       @replication_admin = ReplicationAdmin.new(configuration)
       @configuration = configuration
-      @formatter = formatter
     end
 
     #----------------------------------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/rsgroup_admin.rb b/hbase-shell/src/main/ruby/hbase/rsgroup_admin.rb
index 51a4efb6e8b..c654f23cb08 100644
--- a/hbase-shell/src/main/ruby/hbase/rsgroup_admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/rsgroup_admin.rb
@@ -28,9 +28,8 @@ module Hbase
   class RSGroupAdmin
     include HBaseConstants
 
-    def initialize(connection, formatter)
+    def initialize(connection)
       @admin = org.apache.hadoop.hbase.rsgroup.RSGroupAdmin.newClient(connection)
-      @formatter = formatter
     end
 
     def close
diff --git a/hbase-shell/src/main/ruby/hbase/security.rb b/hbase-shell/src/main/ruby/hbase/security.rb
index 7a31851c7da..55519ed0886 100644
--- a/hbase-shell/src/main/ruby/hbase/security.rb
+++ b/hbase-shell/src/main/ruby/hbase/security.rb
@@ -24,10 +24,9 @@ module Hbase
   class SecurityAdmin
     include HBaseConstants
 
-    def initialize(admin, formatter)
+    def initialize(admin)
       @admin = admin
       @connection = @admin.getConnection()
-      @formatter = formatter
     end
 
     def close
diff --git a/hbase-shell/src/main/ruby/hbase/table.rb b/hbase-shell/src/main/ruby/hbase/table.rb
index 6cb5dcb336f..e64b4ee7ddc 100644
--- a/hbase-shell/src/main/ruby/hbase/table.rb
+++ b/hbase-shell/src/main/ruby/hbase/table.rb
@@ -296,7 +296,7 @@ EOF
       # Parse arguments
       #
       unless args.kind_of?(Hash)
-        raise ArgumentError, "Failed parse of of #{args.inspect}, #{args.class}"
+        raise ArgumentError, "Failed parse of #{args.inspect}, #{args.class}"
       end
 
       # Get maxlength parameter if passed
diff --git a/hbase-shell/src/main/ruby/hbase/taskmonitor.rb b/hbase-shell/src/main/ruby/hbase/taskmonitor.rb
index df938488f40..d312558a35d 100644
--- a/hbase-shell/src/main/ruby/hbase/taskmonitor.rb
+++ b/hbase-shell/src/main/ruby/hbase/taskmonitor.rb
@@ -71,9 +71,8 @@ module Hbase
     end
 
 
-    def initialize(configuration, formatter)
+    def initialize(configuration)
       @conf = configuration
-      @formatter = formatter
       @conn = org.apache.hadoop.hbase.client.ConnectionFactory.createConnection(@conf)
       @admin = @conn.getAdmin()
     end
diff --git a/hbase-shell/src/main/ruby/hbase/visibility_labels.rb b/hbase-shell/src/main/ruby/hbase/visibility_labels.rb
index 98bfb2cc323..8e6c93c2a00 100644
--- a/hbase-shell/src/main/ruby/hbase/visibility_labels.rb
+++ b/hbase-shell/src/main/ruby/hbase/visibility_labels.rb
@@ -24,9 +24,8 @@ java_import org.apache.hadoop.hbase.util.Bytes
 module Hbase
   class VisibilityLabelsAdmin
 
-    def initialize(admin, formatter)
+    def initialize(admin)
       @admin = admin
-      @formatter = formatter
       @connection = @admin.getConnection()
     end
 
@@ -41,7 +40,7 @@ module Hbase
         labels = [ args ].flatten.compact
       end
       if labels.size() == 0
-      	raise(ArgumentError, "Arguments cannot be null")
+        raise(ArgumentError, "Arguments cannot be null")
       end
 
       begin
diff --git a/hbase-shell/src/main/ruby/hbase.rb b/hbase-shell/src/main/ruby/hbase_constants.rb
similarity index 100%
rename from hbase-shell/src/main/ruby/hbase.rb
rename to hbase-shell/src/main/ruby/hbase_constants.rb
diff --git a/hbase-shell/src/main/ruby/shell.rb b/hbase-shell/src/main/ruby/shell.rb
index 19273331bde..fa1f8b86e83 100644
--- a/hbase-shell/src/main/ruby/shell.rb
+++ b/hbase-shell/src/main/ruby/shell.rb
@@ -70,25 +70,23 @@ module Shell
   #----------------------------------------------------------------------
   class Shell
     attr_accessor :hbase
-    attr_accessor :formatter
     attr_accessor :interactive
     alias interactive? interactive
 
     @debug = false
     attr_accessor :debug
 
-    def initialize(hbase, formatter, interactive=true)
+    def initialize(hbase, interactive=true)
       self.hbase = hbase
-      self.formatter = formatter
       self.interactive = interactive
     end
 
     def hbase_admin
-      @hbase_admin ||= hbase.admin(formatter)
+      @hbase_admin ||= hbase.admin()
     end
 
     def hbase_taskmonitor
-      @hbase_taskmonitor ||= hbase.taskmonitor(formatter)
+      @hbase_taskmonitor ||= hbase.taskmonitor()
     end
 
     def hbase_table(name)
@@ -96,23 +94,23 @@ module Shell
     end
 
     def hbase_replication_admin
-      @hbase_replication_admin ||= hbase.replication_admin(formatter)
+      @hbase_replication_admin ||= hbase.replication_admin()
     end
 
     def hbase_security_admin
-      @hbase_security_admin ||= hbase.security_admin(formatter)
+      @hbase_security_admin ||= hbase.security_admin()
     end
 
     def hbase_visibility_labels_admin
-      @hbase_visibility_labels_admin ||= hbase.visibility_labels_admin(formatter)
+      @hbase_visibility_labels_admin ||= hbase.visibility_labels_admin()
     end
 
     def hbase_quotas_admin
-      @hbase_quotas_admin ||= hbase.quotas_admin(formatter)
+      @hbase_quotas_admin ||= hbase.quotas_admin()
     end
 
     def hbase_rsgroup_admin
-      @rsgroup_admin ||= hbase.rsgroup_admin(formatter)
+      @rsgroup_admin ||= hbase.rsgroup_admin()
     end
 
     def export_commands(where)
@@ -140,7 +138,7 @@ module Shell
       internal_command(command, :command, *args)
     end
 
-    #call a specific internal method in the command instance
+    # call a specific internal method in the command instance
     # command  - name of the command to call
     # method_name - name of the method on the command to call. Defaults to just 'command'
     # args - to be passed to the named method
@@ -149,8 +147,9 @@ module Shell
     end
 
     def print_banner
-      puts "HBase Shell; enter 'help<RETURN>' for list of supported commands."
-      puts 'Type "exit<RETURN>" to leave the HBase Shell'
+      puts 'HBase Shell'
+      puts 'Use "help" to get list of supported commands.'
+      puts 'Use "exit" to quit this interactive shell.'
       print 'Version '
       command('version')
       puts
diff --git a/hbase-shell/src/main/ruby/shell/commands.rb b/hbase-shell/src/main/ruby/shell/commands.rb
index b7b17058b3b..b9446ddd820 100644
--- a/hbase-shell/src/main/ruby/shell/commands.rb
+++ b/hbase-shell/src/main/ruby/shell/commands.rb
@@ -26,7 +26,7 @@ module Shell
       end
 
       #wrap an execution of cmd to catch hbase exceptions
-      # cmd - command name to execture
+      # cmd - command name to execute
       # args - arguments to pass to the command
       def command_safe(debug, cmd = :command, *args)
         # send is internal ruby method to call 'cmd' with *args
@@ -50,6 +50,9 @@ module Shell
         end
       end
 
+      # Convenience functions to get different admins
+
+      # Returns HBase::Admin ruby class.
       def admin
         @shell.hbase_admin
       end
@@ -83,9 +86,9 @@ module Shell
       end
 
       #----------------------------------------------------------------------
-
+      # Creates formatter instance first time and then reuses it.
       def formatter
-        @shell.formatter
+        @formatter ||= ::Shell::Formatter::Console.new
       end
 
       def format_simple_command
diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb b/hbase-shell/src/test/ruby/hbase/admin_test.rb
index 50a65d01249..e2c3bc04cb7 100644
--- a/hbase-shell/src/test/ruby/hbase/admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb
@@ -18,9 +18,8 @@
 #
 
 require 'shell'
-require 'shell/formatter'
 require 'stringio'
-require 'hbase'
+require 'hbase_constants'
 require 'hbase/hbase'
 require 'hbase/table'
 
diff --git a/hbase-shell/src/test/ruby/hbase/hbase_test.rb b/hbase-shell/src/test/ruby/hbase/hbase_test.rb
index 185ec3e3332..0f192344a39 100644
--- a/hbase-shell/src/test/ruby/hbase/hbase_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/hbase_test.rb
@@ -17,12 +17,11 @@
 # limitations under the License.
 #
 
-require 'hbase'
+require 'hbase_constants'
 
 module Hbase
   class HbaseTest < Test::Unit::TestCase
     def setup
-      @formatter = Shell::Formatter::Console.new()
       @hbase = ::Hbase::Hbase.new($TEST_CLUSTER.getConfiguration)
     end
 
@@ -31,19 +30,19 @@ module Hbase
     end
 
     define_test "Hbase::Hbase#admin should create a new admin object when called the first time" do
-      assert_kind_of(::Hbase::Admin, @hbase.admin(@formatter))
+      assert_kind_of(::Hbase::Admin, @hbase.admin())
     end
 
     define_test "Hbase::Hbase#admin should create a new admin object every call" do
-      assert_not_same(@hbase.admin(@formatter), @hbase.admin(@formatter))
+      assert_not_same(@hbase.admin(), @hbase.admin())
     end
 
     define_test "Hbase::Hbase#table should create a new table object when called the first time" do
-      assert_kind_of(::Hbase::Table, @hbase.table('hbase:meta', @formatter))
+      assert_kind_of(::Hbase::Table, @hbase.table('hbase:meta', @shell))
     end
 
     define_test "Hbase::Hbase#table should create a new table object every call" do
-      assert_not_same(@hbase.table('hbase:meta', @formatter), @hbase.table('hbase:meta', @formatter))
+      assert_not_same(@hbase.table('hbase:meta', @shell), @hbase.table('hbase:meta', @shell))
     end
   end
 end
diff --git a/hbase-shell/src/test/ruby/hbase/replication_admin_test.rb b/hbase-shell/src/test/ruby/hbase/replication_admin_test.rb
index 0c026d6ca13..d00dbc5c70e 100644
--- a/hbase-shell/src/test/ruby/hbase/replication_admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/replication_admin_test.rb
@@ -18,8 +18,7 @@
 #
 
 require 'shell'
-require 'shell/formatter'
-require 'hbase'
+require 'hbase_constants'
 require 'hbase/hbase'
 require 'hbase/table'
 
diff --git a/hbase-shell/src/test/ruby/hbase/security_admin_test.rb b/hbase-shell/src/test/ruby/hbase/security_admin_test.rb
index 6ecfb98f3aa..be5bbaecc5f 100644
--- a/hbase-shell/src/test/ruby/hbase/security_admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/security_admin_test.rb
@@ -18,8 +18,7 @@
 #
 
 require 'shell'
-require 'shell/formatter'
-require 'hbase'
+require 'hbase_constants'
 require 'hbase/hbase'
 require 'hbase/table'
 
diff --git a/hbase-shell/src/test/ruby/hbase/table_test.rb b/hbase-shell/src/test/ruby/hbase/table_test.rb
index a617bc5c585..faf982758c3 100644
--- a/hbase-shell/src/test/ruby/hbase/table_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/table_test.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'hbase'
+require 'hbase_constants'
 
 include HBaseConstants
 
diff --git a/hbase-shell/src/test/ruby/hbase/taskmonitor_test.rb b/hbase-shell/src/test/ruby/hbase/taskmonitor_test.rb
index 78776d84349..cdb91c71797 100644
--- a/hbase-shell/src/test/ruby/hbase/taskmonitor_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/taskmonitor_test.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'hbase'
+require 'hbase_constants'
 
 module Hbase
   class TaskMonitorTest < Test::Unit::TestCase
diff --git a/hbase-shell/src/test/ruby/hbase/visibility_labels_admin_test.rb b/hbase-shell/src/test/ruby/hbase/visibility_labels_admin_test.rb
index 47ac292d148..0046909ecc9 100644
--- a/hbase-shell/src/test/ruby/hbase/visibility_labels_admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/visibility_labels_admin_test.rb
@@ -18,8 +18,7 @@
 #
 
 require 'shell'
-require 'shell/formatter'
-require 'hbase'
+require 'hbase_constants'
 require 'hbase/hbase'
 require 'hbase/table'
 
diff --git a/hbase-shell/src/test/ruby/shell/commands_test.rb b/hbase-shell/src/test/ruby/shell/commands_test.rb
index 3f6a802169e..9fa291ae1e9 100644
--- a/hbase-shell/src/test/ruby/shell/commands_test.rb
+++ b/hbase-shell/src/test/ruby/shell/commands_test.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'hbase'
+require 'hbase_constants'
 require 'hbase/table'
 require 'shell'
 
diff --git a/hbase-shell/src/test/ruby/shell/noninteractive_test.rb b/hbase-shell/src/test/ruby/shell/noninteractive_test.rb
index 14bdbc79336..0fae4cbb79a 100644
--- a/hbase-shell/src/test/ruby/shell/noninteractive_test.rb
+++ b/hbase-shell/src/test/ruby/shell/noninteractive_test.rb
@@ -14,15 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'hbase'
+require 'hbase_constants'
 require 'shell'
-require 'shell/formatter'
 
 class NonInteractiveTest < Test::Unit::TestCase
   def setup
-    @formatter = ::Shell::Formatter::Console.new()
     @hbase = ::Hbase::Hbase.new($TEST_CLUSTER.getConfiguration)
-    @shell = Shell::Shell.new(@hbase, @formatter, false)
+    @shell = Shell::Shell.new(@hbase, false)
   end
 
   define_test "Shell::Shell noninteractive mode should throw" do
diff --git a/hbase-shell/src/test/ruby/shell/rsgroup_shell_test.rb b/hbase-shell/src/test/ruby/shell/rsgroup_shell_test.rb
index 1040ed89f93..cb76c1fd7a9 100644
--- a/hbase-shell/src/test/ruby/shell/rsgroup_shell_test.rb
+++ b/hbase-shell/src/test/ruby/shell/rsgroup_shell_test.rb
@@ -17,16 +17,14 @@
 # limitations under the License.
 #
 
-require 'hbase'
+require 'hbase_constants'
 require 'shell'
-require 'shell/formatter'
 
 module Hbase
   class RSGroupShellTest < Test::Unit::TestCase
     def setup
-      @formatter = ::Shell::Formatter::Console.new
       @hbase = ::Hbase::Hbase.new($TEST_CLUSTER.getConfiguration)
-      @shell = Shell::Shell.new(@hbase, @formatter)
+      @shell = Shell::Shell.new(@hbase)
       connection = $TEST_CLUSTER.getConnection
       @rsgroup_admin =
           org.apache.hadoop.hbase.rsgroup.RSGroupAdmin.newClient(connection)
@@ -65,7 +63,7 @@ module Hbase
       assert_equal(1, @rsgroup_admin.getRSGroupInfo(group_name).getTables.count)
 
       count = 0
-      @hbase.rsgroup_admin(@formatter).get_rsgroup(group_name) do |line|
+      @hbase.rsgroup_admin().get_rsgroup(group_name) do |line|
         case count
         when 1
           assert_equal(hostPortStr, line)
@@ -77,22 +75,22 @@ module Hbase
       assert_equal(4, count)
 
       assert_equal(2,
-                   @hbase.rsgroup_admin(@formatter).list_rs_groups.count)
+                   @hbase.rsgroup_admin().list_rs_groups.count)
 
       # just run it to verify jruby->java api binding
-      @hbase.rsgroup_admin(@formatter).balance_rs_group(group_name)
+      @hbase.rsgroup_admin().balance_rs_group(group_name)
     end
 
     # we test exceptions that could be thrown by the ruby wrappers
     define_test 'Test bogus arguments' do
       assert_raise(ArgumentError) do
-        @hbase.rsgroup_admin(@formatter).get_rsgroup('foobar')
+        @hbase.rsgroup_admin().get_rsgroup('foobar')
       end
       assert_raise(ArgumentError) do
-        @hbase.rsgroup_admin(@formatter).get_rsgroup_of_server('foobar:123')
+        @hbase.rsgroup_admin().get_rsgroup_of_server('foobar:123')
       end
       assert_raise(ArgumentError) do
-        @hbase.rsgroup_admin(@formatter).get_rsgroup_of_table('foobar')
+        @hbase.rsgroup_admin().get_rsgroup_of_table('foobar')
       end
     end
   end
diff --git a/hbase-shell/src/test/ruby/shell/shell_test.rb b/hbase-shell/src/test/ruby/shell/shell_test.rb
index 56b7dc81286..f37f60c0d4b 100644
--- a/hbase-shell/src/test/ruby/shell/shell_test.rb
+++ b/hbase-shell/src/test/ruby/shell/shell_test.rb
@@ -17,15 +17,13 @@
 # limitations under the License.
 #
 
-require 'hbase'
+require 'hbase_constants'
 require 'shell'
-require 'shell/formatter'
 
 class ShellTest < Test::Unit::TestCase
   def setup
-    @formatter = ::Shell::Formatter::Console.new()
     @hbase = ::Hbase::Hbase.new($TEST_CLUSTER.getConfiguration)
-    @shell = Shell::Shell.new(@hbase, @formatter)
+    @shell = Shell::Shell.new(@hbase)
   end
 
   define_test "Shell::Shell#hbase_admin should return an admin instance" do
diff --git a/hbase-shell/src/test/ruby/test_helper.rb b/hbase-shell/src/test/ruby/test_helper.rb
index 3a5193aefa2..11645d56794 100644
--- a/hbase-shell/src/test/ruby/test_helper.rb
+++ b/hbase-shell/src/test/ruby/test_helper.rb
@@ -37,15 +37,13 @@ end
 
 module Hbase
   module TestHelpers
-    require 'hbase'
+    require 'hbase_constants'
     require 'hbase/hbase'
     require 'shell'
-    require 'shell/formatter'
 
     def setup_hbase
-      formatter = ::Shell::Formatter::Console.new
       hbase = ::Hbase::Hbase.new($TEST_CLUSTER.getConfiguration)
-      @shell = ::Shell::Shell.new(hbase, formatter)
+      @shell = ::Shell::Shell.new(hbase)
     end
     
     def shutdown
@@ -72,6 +70,10 @@ module Hbase
       @shell.hbase_visibility_labels_admin
     end
 
+    def quotas_admin
+      @shell.hbase_quotas_admin
+    end
+
     def replication_admin
       @shell.hbase_replication_admin
     end