diff --git a/Rakefile b/Rakefile
index 4370002128788afa28272b12a6aa15bd9681ac00..530db84dda1c9b7811026da4fb6534ccb6ceaa64 100644
--- a/Rakefile
+++ b/Rakefile
@@ -112,20 +112,20 @@ namespace :test do
               [k, v] if keys.include? k.to_sym
             end.compact.to_h
             
-            sbd_exchange_rate = witness[:sbd_exchange_rate]
-            base = sbd_exchange_rate[:base].to_f
+            hbd_exchange_rate = witness[:hbd_exchange_rate] || witness[:sbd_exchange_rate]
+            base = hbd_exchange_rate[:base].to_f
             
-            if (quote = sbd_exchange_rate[:quote].to_f) > 0
+            if (quote = hbd_exchange_rate[:quote].to_f) > 0
               rate = (base / quote).round(3)
-              witnesses[witness.owner][:sbd_exchange_rate] = rate
+              witnesses[witness.owner][:hbd_exchange_rate] = rate
             else
-              witnesses[witness.owner][:sbd_exchange_rate] = nil
+              witnesses[witness.owner][:hbd_exchange_rate] = nil
             end
             
-            last_sbd_exchange_update = witness[:last_sbd_exchange_update]
-            last_sbd_exchange_update = Time.parse(last_sbd_exchange_update + 'Z')
-            last_sbd_exchange_elapsed = '%.2f hours ago' % ((Time.now.utc - last_sbd_exchange_update) / 60)
-            witnesses[witness.owner][:last_sbd_exchange_elapsed] = last_sbd_exchange_elapsed
+            last_hbd_exchange_update = witness[:last_hbd_exchange_update] || witness[:last_sbd_exchange_update]
+            last_hbd_exchange_update = Time.parse(last_hbd_exchange_update + 'Z')
+            last_hbd_exchange_elapsed = '%.2f hours ago' % ((Time.now.utc - last_hbd_exchange_update) / 60)
+            witnesses[witness.owner][:last_hbd_exchange_elapsed] = last_hbd_exchange_elapsed
           end
         end
       end
diff --git a/test/hive/api_test.rb b/test/hive/api_test.rb
index 67caeda4f97a2e17b4e4e966189ba6da2fcc58f1..27574fe0da4bb68368d49af0cc68d3b067f0cbc2 100644
--- a/test/hive/api_test.rb
+++ b/test/hive/api_test.rb
@@ -148,7 +148,11 @@ module Hive
           when *METHOD_NAMES_2_ARGS
           then
             assert_raises Hive::ArgumentError, "expect 2 arguments to raise ArgumentError for: #{key}" do
-              assert @api.send key, [nil, nil]
+              begin
+                assert @api.send key, [nil, nil]
+              rescue MethodNotEnabledError => e
+                skip e.inspect
+              end
             end
           when *METHOD_NAMES_3_ARGS
           then
@@ -182,7 +186,11 @@ module Hive
     def test_get_content_wrong_arguments
       vcr_cassette('condenser_api_get_content_wrong_arguments') do
         assert_raises Hive::ArgumentError, 'expect argument error' do
-          @api.get_content
+          begin
+            @api.get_content
+          rescue MethodNotEnabledError => e
+            skip e.inspect
+          end
         end
         
         assert_raises Hive::ArgumentError, 'expect argument error' do
diff --git a/test/hive/bridge_test.rb b/test/hive/bridge_test.rb
index d0d1f2036cb54514209d426d0413a2cbb2641021..e5819631cb847d7d42d0cc86f173e547002f43d5 100644
--- a/test/hive/bridge_test.rb
+++ b/test/hive/bridge_test.rb
@@ -192,7 +192,11 @@ module Hive
         }
         
         assert_raises Hive::ArgumentError do
-          @api.get_trending_topics(options)
+          begin
+            @api.get_trending_topics(options)
+          rescue Hive::PluginNotEnabledError => e
+            skip e.inspect
+          end
         end
       end
     end
@@ -209,7 +213,11 @@ module Hive
         }
         
         assert_raises Hive::ArgumentError do
-          @api.post_notifications(options)
+          begin
+            @api.post_notifications(options)
+          rescue Hive::PluginNotEnabledError => e
+            skip e.inspect
+          end
         end
       end
     end
@@ -276,7 +284,11 @@ module Hive
         }
         
         assert_raises Hive::ArgumentError do
-          @api.list_communities(options)
+          begin
+            @api.list_communities(options)
+          rescue Hive::PluginNotEnabledError => e
+            skip e.inspect
+          end
         end
       end
     end
diff --git a/test/hive/broadcast_test.rb b/test/hive/broadcast_test.rb
index de0b59ab957f92185e3933bddb7b19b1f0828caf..f3523daa4590b74357c26c07aa4046b6e42553e4 100644
--- a/test/hive/broadcast_test.rb
+++ b/test/hive/broadcast_test.rb
@@ -44,7 +44,11 @@ module Hive
       }
       
       @core_symbol, @debt_symbol, @vest_symbol = @database_api.get_dynamic_global_properties do |dgpo|
-        [dgpo.current_supply.split(' ').last, dgpo.current_sbd_supply.split(' ').last, dgpo.total_vesting_shares.split(' ').last]
+        current_supply = dgpo.current_supply
+        current_hbd_supply = dgpo.current_hbd_supply || dgpo.current_sbd_supply
+        total_vesting_shares = dgpo.total_vesting_shares
+        
+        [current_supply.split(' ').last, current_hbd_supply.split(' ').last, total_vesting_shares.split(' ').last]
       end
       
       @force_serialize = true