diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 07edad990..df8be802f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -71,7 +71,7 @@ RSpec.configure do |config|
   # BrowserStack
   config.around(:run_on_browserstack => true) do |test|
     @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID])
-    @caps["name"] = ENV['name'] || example.metadata[:name] || example.metadata[:file_path].split('/').last.split('.').first
+    @caps["name"] = ENV['name'] || test.metadata[:name] || test.metadata[:file_path].split('/').last.split('.').first
     enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true"
 
     # Code to start browserstack local before start of test
diff --git a/spec/support/browserstack/osx/catalina/win10_chrome_37.config.yml b/spec/support/browserstack/osx/catalina/win10_chrome_37.config.yml
new file mode 100644
index 000000000..1b9e99ca8
--- /dev/null
+++ b/spec/support/browserstack/osx/catalina/win10_chrome_37.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Chrome 37"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "chrome"
+    "browser_version": "37.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/catalina/win10_chrome_59.config.yml b/spec/support/browserstack/osx/catalina/win10_chrome_59.config.yml
new file mode 100644
index 000000000..5af6a3eb9
--- /dev/null
+++ b/spec/support/browserstack/osx/catalina/win10_chrome_59.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Chrome 59"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "chrome"
+    "browser_version": "59.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/catalina/win10_chrome_75.config.yml b/spec/support/browserstack/osx/catalina/win10_chrome_75.config.yml
new file mode 100644
index 000000000..1b920faf6
--- /dev/null
+++ b/spec/support/browserstack/osx/catalina/win10_chrome_75.config.yml
@@ -0,0 +1,14 @@
+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/windows_edge_latest.config.yml b/spec/support/browserstack/osx/catalina/win10_edge_81.config.yml
similarity index 54%
rename from spec/support/browserstack/windows/windows_edge_latest.config.yml
rename to spec/support/browserstack/osx/catalina/win10_edge_81.config.yml
index bb448573d..c46172728 100644
--- a/spec/support/browserstack/windows/windows_edge_latest.config.yml
+++ b/spec/support/browserstack/osx/catalina/win10_edge_81.config.yml
@@ -1,13 +1,14 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "Windows Edge"
-  "name": "BStack Test Run"
-  "project": "My Project"
+  "build": "Windows 10 Edge 81"
+  "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
 
 browser_caps:
   -
     "browser": "edge"
-    "os": "Windows"
\ No newline at end of file
+    "browser_version": "81.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_10/win10_firefox_75.config copy.yml b/spec/support/browserstack/osx/catalina/win10_firefox_32.config.yml
similarity index 100%
rename from spec/support/browserstack/windows/win_10/win10_firefox_75.config copy.yml
rename to spec/support/browserstack/osx/catalina/win10_firefox_32.config.yml
diff --git a/spec/support/browserstack/osx/catalina/win10_firefox_68esr.config.yml b/spec/support/browserstack/osx/catalina/win10_firefox_68esr.config.yml
new file mode 100644
index 000000000..119749d18
--- /dev/null
+++ b/spec/support/browserstack/osx/catalina/win10_firefox_68esr.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Firefox 68 ESR"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "68.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/catalina/win10_firefox_75.config.yml b/spec/support/browserstack/osx/catalina/win10_firefox_75.config.yml
new file mode 100644
index 000000000..512ad89ad
--- /dev/null
+++ b/spec/support/browserstack/osx/catalina/win10_firefox_75.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Firefox 75"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "75.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/el_capitan/win10_chrome_37.config.yml b/spec/support/browserstack/osx/el_capitan/win10_chrome_37.config.yml
new file mode 100644
index 000000000..1b9e99ca8
--- /dev/null
+++ b/spec/support/browserstack/osx/el_capitan/win10_chrome_37.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Chrome 37"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "chrome"
+    "browser_version": "37.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/el_capitan/win10_chrome_59.config.yml b/spec/support/browserstack/osx/el_capitan/win10_chrome_59.config.yml
new file mode 100644
index 000000000..5af6a3eb9
--- /dev/null
+++ b/spec/support/browserstack/osx/el_capitan/win10_chrome_59.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Chrome 59"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "chrome"
+    "browser_version": "59.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/el_capitan/win10_chrome_75.config.yml b/spec/support/browserstack/osx/el_capitan/win10_chrome_75.config.yml
new file mode 100644
index 000000000..1b920faf6
--- /dev/null
+++ b/spec/support/browserstack/osx/el_capitan/win10_chrome_75.config.yml
@@ -0,0 +1,14 @@
+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/osx/osx_safari_latest.config.yml b/spec/support/browserstack/osx/el_capitan/win10_edge_81.config.yml
similarity index 54%
rename from spec/support/browserstack/osx/osx_safari_latest.config.yml
rename to spec/support/browserstack/osx/el_capitan/win10_edge_81.config.yml
index cd8ec0bfd..c46172728 100644
--- a/spec/support/browserstack/osx/osx_safari_latest.config.yml
+++ b/spec/support/browserstack/osx/el_capitan/win10_edge_81.config.yml
@@ -1,12 +1,14 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "OSX Safari Latest"
+  "build": "Windows 10 Edge 81"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
 
 browser_caps:
   -
-    "browser": "safari"
-    "os": "OS X"
\ No newline at end of file
+    "browser": "edge"
+    "browser_version": "81.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/el_capitan/win10_firefox_32.config.yml b/spec/support/browserstack/osx/el_capitan/win10_firefox_32.config.yml
new file mode 100644
index 000000000..66dd72db3
--- /dev/null
+++ b/spec/support/browserstack/osx/el_capitan/win10_firefox_32.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Firefox 32"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "32.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/el_capitan/win10_firefox_68esr.config.yml b/spec/support/browserstack/osx/el_capitan/win10_firefox_68esr.config.yml
new file mode 100644
index 000000000..119749d18
--- /dev/null
+++ b/spec/support/browserstack/osx/el_capitan/win10_firefox_68esr.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Firefox 68 ESR"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "68.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/el_capitan/win10_firefox_75.config.yml b/spec/support/browserstack/osx/el_capitan/win10_firefox_75.config.yml
new file mode 100644
index 000000000..512ad89ad
--- /dev/null
+++ b/spec/support/browserstack/osx/el_capitan/win10_firefox_75.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Firefox 75"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "75.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/osx_chrome_latest.config.yml b/spec/support/browserstack/osx/osx_chrome_latest.config.yml
deleted file mode 100644
index 867ea597c..000000000
--- a/spec/support/browserstack/osx/osx_chrome_latest.config.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "OSX Chrome"
-  "name": "BStack Test Run"
-  "project": "My Project"
-  "browserstack.local": true
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "os": "OS X"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/osx_firefox_latest.config.yml b/spec/support/browserstack/osx/osx_firefox_latest.config.yml
deleted file mode 100644
index 2d8a72f15..000000000
--- a/spec/support/browserstack/osx/osx_firefox_latest.config.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "OSX Firefox"
-  "name": "BStack Test Run"
-  "project": "My Project"
-  "browserstack.local": true
-
-browser_caps:
-  -
-    "browser": "firefox"
-    "os": "OS X"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/snow_leopard/win10_chrome_37.config.yml b/spec/support/browserstack/osx/snow_leopard/win10_chrome_37.config.yml
new file mode 100644
index 000000000..1b9e99ca8
--- /dev/null
+++ b/spec/support/browserstack/osx/snow_leopard/win10_chrome_37.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Chrome 37"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "chrome"
+    "browser_version": "37.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/snow_leopard/win10_chrome_59.config.yml b/spec/support/browserstack/osx/snow_leopard/win10_chrome_59.config.yml
new file mode 100644
index 000000000..5af6a3eb9
--- /dev/null
+++ b/spec/support/browserstack/osx/snow_leopard/win10_chrome_59.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Chrome 59"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "chrome"
+    "browser_version": "59.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/snow_leopard/win10_chrome_75.config.yml b/spec/support/browserstack/osx/snow_leopard/win10_chrome_75.config.yml
new file mode 100644
index 000000000..1b920faf6
--- /dev/null
+++ b/spec/support/browserstack/osx/snow_leopard/win10_chrome_75.config.yml
@@ -0,0 +1,14 @@
+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/osx/snow_leopard/win10_edge_81.config.yml b/spec/support/browserstack/osx/snow_leopard/win10_edge_81.config.yml
new file mode 100644
index 000000000..c46172728
--- /dev/null
+++ b/spec/support/browserstack/osx/snow_leopard/win10_edge_81.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Edge 81"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "edge"
+    "browser_version": "81.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/snow_leopard/win10_firefox_32.config.yml b/spec/support/browserstack/osx/snow_leopard/win10_firefox_32.config.yml
new file mode 100644
index 000000000..66dd72db3
--- /dev/null
+++ b/spec/support/browserstack/osx/snow_leopard/win10_firefox_32.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Firefox 32"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "32.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/snow_leopard/win10_firefox_68esr.config.yml b/spec/support/browserstack/osx/snow_leopard/win10_firefox_68esr.config.yml
new file mode 100644
index 000000000..119749d18
--- /dev/null
+++ b/spec/support/browserstack/osx/snow_leopard/win10_firefox_68esr.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Firefox 68 ESR"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "68.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/snow_leopard/win10_firefox_75.config.yml b/spec/support/browserstack/osx/snow_leopard/win10_firefox_75.config.yml
new file mode 100644
index 000000000..512ad89ad
--- /dev/null
+++ b/spec/support/browserstack/osx/snow_leopard/win10_firefox_75.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Firefox 75"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "75.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_10/win10_firefox_32.config.yml b/spec/support/browserstack/windows/win_10/win10_firefox_32.config.yml
new file mode 100644
index 000000000..66dd72db3
--- /dev/null
+++ b/spec/support/browserstack/windows/win_10/win10_firefox_32.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Firefox 32"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "32.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_10/win10_firefox_68esr.config.yml b/spec/support/browserstack/windows/win_10/win10_firefox_68esr.config.yml
new file mode 100644
index 000000000..119749d18
--- /dev/null
+++ b/spec/support/browserstack/windows/win_10/win10_firefox_68esr.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 10 Firefox 68 ESR"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "68.0"
+    "os": "windows"
+    "os_version": "10"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/windows_firefox_latest.config.yml b/spec/support/browserstack/windows/win_8/win8_firefox_32.config.yml
similarity index 55%
rename from spec/support/browserstack/windows/windows_firefox_latest.config.yml
rename to spec/support/browserstack/windows/win_8/win8_firefox_32.config.yml
index f96a51ace..185b0394f 100644
--- a/spec/support/browserstack/windows/windows_firefox_latest.config.yml
+++ b/spec/support/browserstack/windows/win_8/win8_firefox_32.config.yml
@@ -1,13 +1,14 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "Windows Firefox"
-  "name": "BStack Test Run"
-  "project": "My Project"
+  "build": "Windows 8 Firefox 32"
+  "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
 
 browser_caps:
   -
     "browser": "firefox"
-    "os": "Windows"
\ No newline at end of file
+    "browser_version": "32.0"
+    "os": "windows"
+    "os_version": "8"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/win_8/win8_firefox_75.config.yml b/spec/support/browserstack/windows/win_8/win8_firefox_75.config.yml
new file mode 100644
index 000000000..30db92f87
--- /dev/null
+++ b/spec/support/browserstack/windows/win_8/win8_firefox_75.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows 8 Firefox 75"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "75.0"
+    "os": "windows"
+    "os_version": "8"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/windows_ie_latest.config.yml b/spec/support/browserstack/windows/windows_ie_latest.config.yml
deleted file mode 100644
index 7b3962f89..000000000
--- a/spec/support/browserstack/windows/windows_ie_latest.config.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "Windows IE"
-  "name": "BStack Test Run"
-  "project": "My Project"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "internet explorer"
-    "os": "Windows"
\ 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_45esr.config.yml
new file mode 100644
index 000000000..f769036a8
--- /dev/null
+++ b/spec/support/browserstack/windows/xp/xp_firefox_45esr.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows XP Firefox 45 ESR"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "45.0"
+    "os": "windows"
+    "os_version": "xp"
\ No newline at end of file
diff --git a/spec/support/browserstack/windows/xp/xp_firefox_47.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_47.config.yml
new file mode 100644
index 000000000..3051c52e7
--- /dev/null
+++ b/spec/support/browserstack/windows/xp/xp_firefox_47.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows XP Firefox 47"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "47.0"
+    "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_5.config.yml
new file mode 100644
index 000000000..5ed6fc233
--- /dev/null
+++ b/spec/support/browserstack/windows/xp/xp_firefox_5.config.yml
@@ -0,0 +1,14 @@
+server: "hub-cloud.browserstack.com"
+
+common_caps:
+  "build": "Windows XP Firefox 5"
+  "project": "BeEF"
+  "browserstack.local": true
+  "browserstack.video": false
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "browser_version": "5.0"
+    "os": "windows"
+    "os_version": "xp"
\ No newline at end of file