diff --git a/.travis.yml b/.travis.yml
index 238d46a68..3446c3f4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,67 +13,72 @@ before_script:
   - RUBY_VERSION=/bin/bash rvm current
   - sed -i -E 's/system\((.*?)\)/""/g' /home/travis/.rvm/gems/$RUBY_VERSION/gems/browserstack-local-1.3.0/lib/browserstack/local.rb
 env:
-  - CONFIG_FILE=osx/catalina/catalina_chrome_39.config.yml
-  - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml
-  - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml
-  - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml
-  - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml
-  - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml
+#   - CONFIG_FILE=osx/catalina/catalina_chrome_41.config.yml
+#   - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml
+#   - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml
+#   - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml
+#   - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml
+#   - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml
   - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml
-  - CONFIG_FILE=osx/el_capitan/elcapitan_chrome_14.config.yml
-  - CONFIG_FILE=osx/el_capitan/elcapitan_chrome_81.config.yml
-  - CONFIG_FILE=osx/el_capitan/elcapitan_firefox_5.config.yml
-  - CONFIG_FILE=osx/el_capitan/elcapitan_firefox_75.config.yml
-  - CONFIG_FILE=osx/el_capitan/elcapitan_safari_9-1.config.yml
-  - CONFIG_FILE=osx/snow_leopard/snowleopard_chrome_14.config.yml
-  - CONFIG_FILE=osx/snow_leopard/snowleopard_chrome_35.config.yml
-  - CONFIG_FILE=osx/snow_leopard/snowleopard_chrome_49.config.yml
-  - CONFIG_FILE=osx/snow_leopard/snowleopard_firefox_5.config.yml
-  - CONFIG_FILE=osx/snow_leopard/snowleopard_firefox_38esr.config.yml
-  - CONFIG_FILE=osx/snow_leopard/snowleopard_firefox_42.config.yml
-  - CONFIG_FILE=osx/snow_leopard/snowleopard_safari_5-1.config.yml
-  - CONFIG_FILE=windows/win_10/win10_chrome_37.config.yml
-  - CONFIG_FILE=windows/win_10/win10_chrome_59.config.yml
-  - CONFIG_FILE=windows/win_10/win10_firefox_32.config.yml
-  - CONFIG_FILE=windows/win_10/win10_firefox_68esr.config.yml
-  - CONFIG_FILE=windows/win_10/win10_firefox_75.config.yml
-  - CONFIG_FILE=windows/win_10/win10_edge_81.config.yml
-  - CONFIG_FILE=windows/win_10/win10_ie_11.config.yml
-  - CONFIG_FILE=windows/win_8/win8_chrome_22.config.yml
-  - CONFIG_FILE=windows/win_8/win8_chrome_81.config.yml
-  - CONFIG_FILE=windows/win_8/win8_firefox_32.config.yml
-  - CONFIG_FILE=windows/win_8/win8_firefox_75.config.yml
-  - CONFIG_FILE=windows/win_8/win8_edge_81.config.yml
-  - CONFIG_FILE=windows/win_8/win8_ie_10.config.yml
-  - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml
-  - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml
-  - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml
-  - CONFIG_FILE=windows/xp/xp_firefox_5.config.yml
-  - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml
-  - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml
-  - CONFIG_FILE=windows/xp/xp_ie_7.config.yml
-jobs:
-  include:
-    - name: "Full Test Suite 2.5.3"
-      rvm: 2.5.3
-      env: CONFIG_FILE=windows/win_10/win10_chrome_81.config.yml
-      script: bundle exec rake
-    - name: "Full Test Suite 2.6.0"
-      rvm: 2.6.0
-      env: CONFIG_FILE=windows/win_10/win10_chrome_81.config.yml
-      script: bundle exec rake
-    - name: "Full Test Suite 2.6.3"
-      rvm: 2.6.3
-      env: CONFIG_FILE=windows/win_10/win10_chrome_81.config.yml
-      script: bundle exec rake
-    - name: "Full Test Suite 2.6.5"
-      rvm: 2.6.5
-      env: CONFIG_FILE=windows/win_10/win10_chrome_81.config.yml
-      script: bundle exec rake
-    - name: "Full Test Suite 2.7.0"
-      rvm: 2.7.0
-      env: CONFIG_FILE=windows/win_10/win10_chrome_81.config.yml
-      script: bundle exec rake
+#   - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_14.config.yml
+#   - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_81.config.yml
+#   - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_6.config.yml
+#   - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_75.config.yml
+#   - CONFIG_FILE=osx/elcapitan/elcapitan_safari_9-1.config.yml
+#   - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_14.config.yml
+#   - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_35.config.yml
+#   - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_49.config.yml
+#   - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_7.config.yml
+#   - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_38esr.config.yml
+#   - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_42.config.yml
+#   - CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml
+#   - CONFIG_FILE=windows/win10/win10_chrome_37.config.yml
+#   - CONFIG_FILE=windows/win10/win10_chrome_59.config.yml
+#   - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml
+#   - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml
+#   - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml
+  # - CONFIG_FILE=windows/win10/win10_edge_81.config.yml
+#   - CONFIG_FILE=windows/win10/win10_ie_11.config.yml
+#   - CONFIG_FILE=windows/win8/win8_chrome_22.config.yml
+#   - CONFIG_FILE=windows/win8/win8_chrome_81.config.yml
+#   - CONFIG_FILE=windows/win8/win8_firefox_32.config.yml
+#   - CONFIG_FILE=windows/win8/win8_firefox_75.config.yml
+#   - CONFIG_FILE=windows/win8/win8_edge_81.config.yml
+#   - CONFIG_FILE=windows/win8/win8_ie_10.config.yml
+#   - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml
+#   - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml
+#   - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml
+  - CONFIG_FILE=windows/xp/xp_firefox_10.config.yml
+  - CONFIG_FILE=windows/xp/xp_firefox_25.config.yml
+#   - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml
+#   - CONFIG_FILE=windows/xp/xp_ie_7.config.yml
+# jobs:
+#   include:
+#     - name: "Full Test Suite 2.5.3"
+#       rvm: 2.5.3
+#       env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
+#       script: bundle exec rake
+#       fast_finish: true
+#     - name: "Full Test Suite 2.6.0"
+#       rvm: 2.6.0
+#       env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
+#       script: bundle exec rake
+#       fast_finish: true
+#     - name: "Full Test Suite 2.6.3"
+#       rvm: 2.6.3
+#       env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
+#       script: bundle exec rake
+#       fast_finish: true
+#     - name: "Full Test Suite 2.6.5"
+#       rvm: 2.6.5
+#       env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
+#       script: bundle exec rake
+#       fast_finish: true
+#     - name: "Full Test Suite 2.7.0"
+#       rvm: 2.7.0
+#       env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
+#       script: bundle exec rake
+#       fast_finish: true
 script:
   - bundle exec rspec --tag run_on_browserstack
 addons:
diff --git a/Rakefile b/Rakefile
index a376b9b57..147aea6a2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -18,7 +18,9 @@ end
 
 ## RSPEC
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) 
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.rspec_opts = ['--tag ~run_on_browserstack']
+end
 
 ################################
 # SSL/TLS certificate
diff --git a/core/main/client/browser.js b/core/main/client/browser.js
index fe5920efc..d3ba2f48c 100644
--- a/core/main/client/browser.js
+++ b/core/main/client/browser.js
@@ -127,7 +127,7 @@ beef.browser = {
      * @example: beef.browser.isEdge()
      */
     isEdge: function () {
-        return !beef.browser.isIE() && !!window.StyleMedia;
+        return !beef.browser.isIE() && !!window.StyleMedia && (window.navigator.userAgent.match(/Edg\/\d+\.\d/) || window.navigator.userAgent.match(/Edge\/\d+\.\d/));
     },
 
     /**
@@ -2495,6 +2495,7 @@ beef.browser = {
     type: function () {
 
         return {
+            E: this.isEdge(), // Edge any version
             C5: this.isC5(), // Chrome 5
             C6: this.isC6(), // Chrome 6
             C7: this.isC7(), // Chrome 7
diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb
index 7f5a6e399..7ebf96b68 100644
--- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb
+++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb
@@ -113,6 +113,6 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do
 		response = RestClient.get "#{RESTAPI_HOOKS}/#{@session}?token=#{@token}"
 		details = JSON.parse(response.body)
 
-		expect(@driver.browser.to_s.downcase).to eql (details['browser.name.friendly'].downcase)
+		expect(@driver.browser.to_s.downcase).to eq(details['browser.name.friendly'].downcase).or eq('internet_explorer').or eq('msedge')
 	end
 end
diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb
index 91bc15ab1..13ce28360 100644
--- a/spec/beef/modules/debug/test_beef_debugs_spec.rb
+++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb
@@ -99,7 +99,7 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do
         @debug_mod_names_ids = {}
         @debug_mods = @debug_mod_ids.to_a.select { |cmd_mod| cmd_mod[1]['category'] == 'Debug' }
                                     .map do |debug_mod|
-                                        @debug_mod_names_ids[debug_mod[1]['class']] = debug_mod[0]
+                                        @debug_mod_names_ids[debug_mod[1]['class']] = debug_mod[1]['id']
                                     end
     end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a91316d39..243883ce7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -38,7 +38,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 end
 
 TASK_ID = (ENV['TASK_ID'] || 0).to_i
-CONFIG_FILE = ENV['CONFIG_FILE'] || 'windows/win_10/win10_chrome_81.config.yml'
+CONFIG_FILE = ENV['CONFIG_FILE'] || 'windows/win10/win10_chrome_81.config.yml'
 CONFIG = YAML.safe_load(File.read("./spec/support/browserstack/#{CONFIG_FILE}"))
 CONFIG['user'] = ENV['BROWSERSTACK_USERNAME'] || ''
 CONFIG['key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || ''
diff --git a/spec/support/browserstack/osx/catalina/catalina_chrome_39.config.yml b/spec/support/browserstack/osx/catalina/catalina_chrome_41.config.yml
similarity index 76%
rename from spec/support/browserstack/osx/catalina/catalina_chrome_39.config.yml
rename to spec/support/browserstack/osx/catalina/catalina_chrome_41.config.yml
index ad00f4dab..7f791ac95 100644
--- a/spec/support/browserstack/osx/catalina/catalina_chrome_39.config.yml
+++ b/spec/support/browserstack/osx/catalina/catalina_chrome_41.config.yml
@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "OSX Catalina Chrome 39"
+  "build": "OSX Catalina Chrome 41"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -9,6 +9,6 @@ common_caps:
 browser_caps:
   -
     "browser": "chrome"
-    "browser_version": "39.0"
+    "browser_version": "41.0"
     "os": "osx"
     "os_version": "catalina"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_14.config.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_chrome_14.config.yml
similarity index 100%
rename from spec/support/browserstack/osx/el_capitan/elcapitan_chrome_14.config.yml
rename to spec/support/browserstack/osx/elcapitan/elcapitan_chrome_14.config.yml
diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_81.config.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_chrome_81.config.yml
similarity index 100%
rename from spec/support/browserstack/osx/el_capitan/elcapitan_chrome_81.config.yml
rename to spec/support/browserstack/osx/elcapitan/elcapitan_chrome_81.config.yml
diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_5.config.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_firefox_6.config.yml
similarity index 76%
rename from spec/support/browserstack/osx/el_capitan/elcapitan_firefox_5.config.yml
rename to spec/support/browserstack/osx/elcapitan/elcapitan_firefox_6.config.yml
index 9a5bbfaf4..48a8e808a 100644
--- a/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_5.config.yml
+++ b/spec/support/browserstack/osx/elcapitan/elcapitan_firefox_6.config.yml
@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "OSX El Capitan Firefox 5"
+  "build": "OSX El Capitan Firefox 6"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -9,6 +9,6 @@ common_caps:
 browser_caps:
   -
     "browser": "firefox"
-    "browser_version": "5.0"
+    "browser_version": "6.0"
     "os": "osx"
     "os_version": "el capitan"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_75.config.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_firefox_75.config.yml
similarity index 100%
rename from spec/support/browserstack/osx/el_capitan/elcapitan_firefox_75.config.yml
rename to spec/support/browserstack/osx/elcapitan/elcapitan_firefox_75.config.yml
diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_safari_9-1.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_safari_9-1.config.yml
similarity index 100%
rename from spec/support/browserstack/osx/el_capitan/elcapitan_safari_9-1.yml
rename to spec/support/browserstack/osx/elcapitan/elcapitan_safari_9-1.config.yml
diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_14.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_chrome_14.config.yml
similarity index 100%
rename from spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_14.config.yml
rename to spec/support/browserstack/osx/snowleopard/snowleopard_chrome_14.config.yml
diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_35.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_chrome_35.config.yml
similarity index 100%
rename from spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_35.config.yml
rename to spec/support/browserstack/osx/snowleopard/snowleopard_chrome_35.config.yml
diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_49.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_chrome_49.config.yml
similarity index 100%
rename from spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_49.config.yml
rename to spec/support/browserstack/osx/snowleopard/snowleopard_chrome_49.config.yml
diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_38esr.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_38esr.config.yml
similarity index 100%
rename from spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_38esr.config.yml
rename to spec/support/browserstack/osx/snowleopard/snowleopard_firefox_38esr.config.yml
diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_42.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_42.config.yml
similarity index 100%
rename from spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_42.config.yml
rename to spec/support/browserstack/osx/snowleopard/snowleopard_firefox_42.config.yml
diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_5.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_7.config.yml
similarity index 76%
rename from spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_5.config.yml
rename to spec/support/browserstack/osx/snowleopard/snowleopard_firefox_7.config.yml
index 8c588921d..87b6b400e 100644
--- a/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_5.config.yml
+++ b/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_7.config.yml
@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "OSX Snow Leopard Firefox 5"
+  "build": "OSX Snow Leopard Firefox 7"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -9,6 +9,6 @@ common_caps:
 browser_caps:
   -
     "browser": "firefox"
-    "browser_version": "5.0"
+    "browser_version": "7.0"
     "os": "osx"
     "os_version": "snow leopard"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_safari_5-1.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_safari_5-1.config.yml
similarity index 100%
rename from spec/support/browserstack/osx/snow_leopard/snowleopard_safari_5-1.config.yml
rename to spec/support/browserstack/osx/snowleopard/snowleopard_safari_5-1.config.yml
diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_37.config.yml b/spec/support/browserstack/windows/win10/win10_chrome_37.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_10/win10_chrome_37.config.yml
rename to spec/support/browserstack/windows/win10/win10_chrome_37.config.yml
diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_59.config.yml b/spec/support/browserstack/windows/win10/win10_chrome_59.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_10/win10_chrome_59.config.yml
rename to spec/support/browserstack/windows/win10/win10_chrome_59.config.yml
diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_81.config.yml b/spec/support/browserstack/windows/win10/win10_chrome_81.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_10/win10_chrome_81.config.yml
rename to spec/support/browserstack/windows/win10/win10_chrome_81.config.yml
diff --git a/spec/support/browserstack/windows/win_10/win10_edge_81.config.yml b/spec/support/browserstack/windows/win10/win10_edge_81.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_10/win10_edge_81.config.yml
rename to spec/support/browserstack/windows/win10/win10_edge_81.config.yml
diff --git a/spec/support/browserstack/windows/win_10/win10_firefox_32.config.yml b/spec/support/browserstack/windows/win10/win10_firefox_32.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_10/win10_firefox_32.config.yml
rename to spec/support/browserstack/windows/win10/win10_firefox_32.config.yml
diff --git a/spec/support/browserstack/windows/win_10/win10_firefox_68esr.config.yml b/spec/support/browserstack/windows/win10/win10_firefox_68esr.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_10/win10_firefox_68esr.config.yml
rename to spec/support/browserstack/windows/win10/win10_firefox_68esr.config.yml
diff --git a/spec/support/browserstack/windows/win_10/win10_firefox_75.config.yml b/spec/support/browserstack/windows/win10/win10_firefox_75.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_10/win10_firefox_75.config.yml
rename to spec/support/browserstack/windows/win10/win10_firefox_75.config.yml
diff --git a/spec/support/browserstack/windows/win_10/win10_ie_11.config.yml b/spec/support/browserstack/windows/win10/win10_ie_11.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_10/win10_ie_11.config.yml
rename to spec/support/browserstack/windows/win10/win10_ie_11.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_22.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_22.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_chrome_22.config.yml
rename to spec/support/browserstack/windows/win8/win8_chrome_22.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_28.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_28.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_chrome_28.config.yml
rename to spec/support/browserstack/windows/win8/win8_chrome_28.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_36.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_36.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_chrome_36.config.yml
rename to spec/support/browserstack/windows/win8/win8_chrome_36.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_43.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_43.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_chrome_43.config.yml
rename to spec/support/browserstack/windows/win8/win8_chrome_43.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_51.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_51.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_chrome_51.config.yml
rename to spec/support/browserstack/windows/win8/win8_chrome_51.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_59.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_59.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_chrome_59.config.yml
rename to spec/support/browserstack/windows/win8/win8_chrome_59.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_67.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_67.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_chrome_67.config.yml
rename to spec/support/browserstack/windows/win8/win8_chrome_67.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_75.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_75.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_chrome_75.config.yml
rename to spec/support/browserstack/windows/win8/win8_chrome_75.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_81.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_81.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_chrome_81.config.yml
rename to spec/support/browserstack/windows/win8/win8_chrome_81.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_edge_81.config.yml b/spec/support/browserstack/windows/win8/win8_edge_81.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_edge_81.config.yml
rename to spec/support/browserstack/windows/win8/win8_edge_81.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_firefox_32.config.yml b/spec/support/browserstack/windows/win8/win8_firefox_32.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_firefox_32.config.yml
rename to spec/support/browserstack/windows/win8/win8_firefox_32.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_firefox_75.config.yml b/spec/support/browserstack/windows/win8/win8_firefox_75.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_firefox_75.config.yml
rename to spec/support/browserstack/windows/win8/win8_firefox_75.config.yml
diff --git a/spec/support/browserstack/windows/win_8/win8_ie_10.config.yml b/spec/support/browserstack/windows/win8/win8_ie_10.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_8/win8_ie_10.config.yml
rename to spec/support/browserstack/windows/win8/win8_ie_10.config.yml
diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_43.config.yml b/spec/support/browserstack/windows/win_10/win10_chrome_43.config.yml
deleted file mode 100644
index 9983cd664..000000000
--- a/spec/support/browserstack/windows/win_10/win10_chrome_43.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 10 Chrome 43"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "43.0"
-    "os": "windows"
-    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_51.config.yml b/spec/support/browserstack/windows/win_10/win10_chrome_51.config.yml
deleted file mode 100644
index 0e923f6b5..000000000
--- a/spec/support/browserstack/windows/win_10/win10_chrome_51.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 10 Chrome 51"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "51.0"
-    "os": "windows"
-    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_67.config.yml b/spec/support/browserstack/windows/win_10/win10_chrome_67.config.yml
deleted file mode 100644
index 386171879..000000000
--- a/spec/support/browserstack/windows/win_10/win10_chrome_67.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 10 Chrome 67"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-  
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "67.0"
-    "os": "windows"
-    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_75.config.yml b/spec/support/browserstack/windows/win_10/win10_chrome_75.config.yml
deleted file mode 100644
index 1b920faf6..000000000
--- a/spec/support/browserstack/windows/win_10/win10_chrome_75.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 10 Chrome 75"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "75.0"
-    "os": "windows"
-    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win7_ie_10.config.yml b/spec/support/browserstack/windows/win_7/win7_ie_10.config.yml
deleted file mode 100644
index 7554752cf..000000000
--- a/spec/support/browserstack/windows/win_7/win7_ie_10.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 IE 10"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "internet explorer"
-    "browser_version": "10.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win7_ie_11.config.yml b/spec/support/browserstack/windows/win_7/win7_ie_11.config.yml
deleted file mode 100644
index 49fb40d8b..000000000
--- a/spec/support/browserstack/windows/win_7/win7_ie_11.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 IE 11"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "internet explorer"
-    "browser_version": "11.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win7_ie_8.config.yml b/spec/support/browserstack/windows/win_7/win7_ie_8.config.yml
deleted file mode 100644
index f26fa781b..000000000
--- a/spec/support/browserstack/windows/win_7/win7_ie_8.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 IE 8"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "internet explorer"
-    "browser_version": "8.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win7_ie_9.config.yml b/spec/support/browserstack/windows/win_7/win7_ie_9.config.yml
deleted file mode 100644
index a68e1c266..000000000
--- a/spec/support/browserstack/windows/win_7/win7_ie_9.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 IE 9"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "internet explorer"
-    "browser_version": "9.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_14.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_14.config.yml
deleted file mode 100644
index 18eb0264e..000000000
--- a/spec/support/browserstack/windows/win_7/win8_chrome_14.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 Chrome 14"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "14.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_20.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_20.config.yml
deleted file mode 100644
index 74954b857..000000000
--- a/spec/support/browserstack/windows/win_7/win8_chrome_20.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 Chrome 20"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "20.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_28.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_28.config.yml
deleted file mode 100644
index 25195d1ba..000000000
--- a/spec/support/browserstack/windows/win_7/win8_chrome_28.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 Chrome 28"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "28.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_36.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_36.config.yml
deleted file mode 100644
index 6dfe12d75..000000000
--- a/spec/support/browserstack/windows/win_7/win8_chrome_36.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 Chrome 36"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "36.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_43.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_43.config.yml
deleted file mode 100644
index 6e3640a23..000000000
--- a/spec/support/browserstack/windows/win_7/win8_chrome_43.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 Chrome 43"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "43.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_51.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_51.config.yml
deleted file mode 100644
index 93b1133e1..000000000
--- a/spec/support/browserstack/windows/win_7/win8_chrome_51.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 Chrome 51"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "51.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_59.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_59.config.yml
deleted file mode 100644
index 8a5dab622..000000000
--- a/spec/support/browserstack/windows/win_7/win8_chrome_59.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 Chrome 59"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "59.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_67.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_67.config.yml
deleted file mode 100644
index 48d2d7bd3..000000000
--- a/spec/support/browserstack/windows/win_7/win8_chrome_67.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 Chrome 67"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "67.0"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_75.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_75.config.yml
deleted file mode 100644
index ed4563572..000000000
--- a/spec/support/browserstack/windows/win_7/win8_chrome_75.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 Chrome 75"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "75.0"
-    "os": "windows"
-    "os_version": "8"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_latest.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_latest.config.yml
deleted file mode 100644
index c1e25e6ac..000000000
--- a/spec/support/browserstack/windows/win_7/win8_chrome_latest.config.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 7 Chrome Latest"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "os": "windows"
-    "os_version": "7"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_22.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_22.config.yml
deleted file mode 100644
index d6e4360fd..000000000
--- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_22.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 8.1 Chrome 22"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "22.0"
-    "os": "windows"
-    "os_version": "8.1"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_28.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_28.config.yml
deleted file mode 100644
index 6793f1aa8..000000000
--- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_28.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 8.1 Chrome 28"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "28.0"
-    "os": "windows"
-    "os_version": "8.1"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_36.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_36.config.yml
deleted file mode 100644
index c2a8ab333..000000000
--- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_36.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 8.1 Chrome 36"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "36.0"
-    "os": "windows"
-    "os_version": "8.1"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_43.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_43.config.yml
deleted file mode 100644
index bc3e60dc9..000000000
--- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_43.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 8.1 Chrome 43"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "43.0"
-    "os": "windows"
-    "os_version": "8.1"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_51.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_51.config.yml
deleted file mode 100644
index 72b788fb7..000000000
--- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_51.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 8.1 Chrome 51"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "51.0"
-    "os": "windows"
-    "os_version": "8.1"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_59.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_59.config.yml
deleted file mode 100644
index d29e1b8a5..000000000
--- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_59.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 8.1 Chrome 59"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "59.0"
-    "os": "windows"
-    "os_version": "8.1"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_67.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_67.config.yml
deleted file mode 100644
index 389f68ab4..000000000
--- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_67.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 8.1 Chrome 67"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "67.0"
-    "os": "windows"
-    "os_version": "8.1"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_75.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_75.config.yml
deleted file mode 100644
index 6cbd27efc..000000000
--- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_75.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 8.1 Chrome 75"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "75.0"
-    "os": "windows"
-    "os_version": "8.1"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_latest.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_latest.config.yml
deleted file mode 100644
index 4d98e04f1..000000000
--- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_latest.config.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 8.1 Chrome Latest"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "os": "windows"
-    "os_version": "8.1"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_ie_11.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_ie_11.config.yml
deleted file mode 100644
index 05e0f3030..000000000
--- a/spec/support/browserstack/windows/win_8-1/win8-1_ie_11.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows 8.1 IE 11"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "internet explorer"
-    "browser_version": "11.0"
-    "os": "windows"
-    "os_version": "8.1"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/xp/xp_chrome_20.config.yml b/spec/support/browserstack/windows/xp/xp_chrome_20.config.yml
deleted file mode 100644
index 4b01ca54c..000000000
--- a/spec/support/browserstack/windows/xp/xp_chrome_20.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows XP Chrome 20"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "20.0"
-    "os": "windows"
-    "os_version": "xp"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/xp/xp_chrome_36.config.yml b/spec/support/browserstack/windows/xp/xp_chrome_36.config.yml
deleted file mode 100644
index c510eba64..000000000
--- a/spec/support/browserstack/windows/xp/xp_chrome_36.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows XP Chrome 36"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "36.0"
-    "os": "windows"
-    "os_version": "xp"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/xp/xp_chrome_latest.config.yml b/spec/support/browserstack/windows/xp/xp_chrome_latest.config.yml
deleted file mode 100644
index d1c6ddb8e..000000000
--- a/spec/support/browserstack/windows/xp/xp_chrome_latest.config.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows XP Chrome Latest"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "os": "windows"
-    "os_version": "xp"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/xp/xp_firefox_5.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_10.config.yml
similarity index 76%
rename from spec/support/browserstack/windows/xp/xp_firefox_5.config.yml
rename to spec/support/browserstack/windows/xp/xp_firefox_10.config.yml
index 5ed6fc233..dbc1acdbd 100644
--- a/spec/support/browserstack/windows/xp/xp_firefox_5.config.yml
+++ b/spec/support/browserstack/windows/xp/xp_firefox_10.config.yml
@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "Windows XP Firefox 5"
+  "build": "Windows XP Firefox 10"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -9,6 +9,6 @@ common_caps:
 browser_caps:
   -
     "browser": "firefox"
-    "browser_version": "5.0"
+    "browser_version": "10.0"
     "os": "windows"
     "os_version": "xp"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/xp/xp_firefox_45esr.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_25.config.yml
similarity index 75%
rename from spec/support/browserstack/windows/xp/xp_firefox_45esr.config.yml
rename to spec/support/browserstack/windows/xp/xp_firefox_25.config.yml
index f769036a8..8c0f9b881 100644
--- a/spec/support/browserstack/windows/xp/xp_firefox_45esr.config.yml
+++ b/spec/support/browserstack/windows/xp/xp_firefox_25.config.yml
@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "Windows XP Firefox 45 ESR"
+  "build": "Windows XP Firefox 25"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -9,6 +9,6 @@ common_caps:
 browser_caps:
   -
     "browser": "firefox"
-    "browser_version": "45.0"
+    "browser_version": "25.0"
     "os": "windows"
     "os_version": "xp"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/xp/xp_ie_6.config.yml b/spec/support/browserstack/windows/xp/xp_ie_6.config.yml
deleted file mode 100644
index 1f9d0338d..000000000
--- a/spec/support/browserstack/windows/xp/xp_ie_6.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows XP IE 6"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "internet explorer"
-    "browser_version": "6.0"
-    "os": "windows"
-    "os_version": "xp"
\ No newline at end of file