diff --git a/common/src/web/BUILD.bazel b/common/src/web/BUILD.bazel
index ddc0429b6fd9d..9581efbee8636 100644
--- a/common/src/web/BUILD.bazel
+++ b/common/src/web/BUILD.bazel
@@ -5,8 +5,8 @@ filegroup(
         "**/*",
     ]),
     visibility = [
+        "//dotnet/test/common:__pkg__",
         "//java/client/test/org/openqa/selenium/environment:__pkg__",
         "//javascript/node/selenium-webdriver:__pkg__",
-        "//dotnet/test/common:__pkg__"
     ],
 )
diff --git a/cpp/prebuilt/BUILD.bazel b/cpp/prebuilt/BUILD.bazel
index 81b60a53ce6a5..b28bcb047a155 100644
--- a/cpp/prebuilt/BUILD.bazel
+++ b/cpp/prebuilt/BUILD.bazel
@@ -2,8 +2,8 @@ load("//:copy_file.bzl", "copy_file")
 
 copy_file(
     name = "noblur32",
-    out = "i386/x_ignore_nofocus.so",
     src = "i386/libnoblur.so",
+    out = "i386/x_ignore_nofocus.so",
     visibility = [
         "//dotnet/src/webdriver:__pkg__",
         "//java/client/src/org/openqa/selenium/firefox/xpi:__pkg__",
@@ -12,8 +12,8 @@ copy_file(
 
 copy_file(
     name = "noblur64",
-    out = "amd64/x_ignore_nofocus.so",
     src = "amd64/libnoblur64.so",
+    out = "amd64/x_ignore_nofocus.so",
     visibility = [
         "//dotnet/src/webdriver:__pkg__",
         "//java/client/src/org/openqa/selenium/firefox/xpi:__pkg__",
diff --git a/dotnet/src/support/BUILD.bazel b/dotnet/src/support/BUILD.bazel
index fc07f41843bbd..0095f32ea380c 100644
--- a/dotnet/src/support/BUILD.bazel
+++ b/dotnet/src/support/BUILD.bazel
@@ -1,118 +1,120 @@
-load("@io_bazel_rules_dotnet//dotnet:defs.bzl", "net_library", "core_library", "core_resource")
+load("@io_bazel_rules_dotnet//dotnet:defs.bzl", "core_library", "core_resource", "net_library")
 load("//dotnet:nuget.bzl", "nuget_package")
-load("//dotnet:selenium-dotnet-version.bzl",
-     "SE_VERSION",
-     "ASSEMBLY_VERSION",
-     "SUPPORTED_NET_FRAMEWORKS")
+load(
+    "//dotnet:selenium-dotnet-version.bzl",
+    "ASSEMBLY_VERSION",
+    "SE_VERSION",
+    "SUPPORTED_NET_FRAMEWORKS",
+)
 
 [net_library(
-  name = "{}".format(framework),
-  srcs = glob([
-    "*.cs",
-    "Events/*.cs",
-    "Extensions/*.cs",
-    "PageObjects/**/*.cs",
-    "UI/*.cs",
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
-    "//dotnet/src/webdriver:{}assembly".format(framework)
-  ],
-  dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework),
-  out = "merged/{}/WebDriver.Support.dll".format(framework),
-  visibility = ["//visibility:public"],
+    name = "{}".format(framework),
+    srcs = glob([
+        "*.cs",
+        "Events/*.cs",
+        "Extensions/*.cs",
+        "PageObjects/**/*.cs",
+        "UI/*.cs",
+    ]),
+    out = "merged/{}/WebDriver.Support.dll".format(framework),
+    dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework),
+    visibility = ["//visibility:public"],
+    deps = [
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
+        "//dotnet/src/webdriver:{}assembly".format(framework),
+    ],
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 core_library(
-  name = "netstandard2.0",
-  srcs = glob([
-    "*.cs",
-    "Events/*.cs",
-    "Extensions/*.cs",
-    "PageObjects/**/*.cs",
-    "UI/*.cs",
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
-    "//dotnet/src/webdriver:netstandard2.0"
-  ],
-  defines = [
-    "NETSTANDARD2_0"
-  ],
-  out = "merged/netstandard2.0/WebDriver.Support.dll",
-  visibility = ["//visibility:public"]
+    name = "netstandard2.0",
+    srcs = glob([
+        "*.cs",
+        "Events/*.cs",
+        "Extensions/*.cs",
+        "PageObjects/**/*.cs",
+        "UI/*.cs",
+    ]),
+    out = "merged/netstandard2.0/WebDriver.Support.dll",
+    defines = [
+        "NETSTANDARD2_0",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//dotnet/src/webdriver:netstandard2.0",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
+    ],
 )
 
 [net_library(
-  name = "{}-strongnamed".format(framework),
-  srcs = glob([
-    "*.cs",
-    "Events/*.cs",
-    "Extensions/*.cs",
-    "PageObjects/**/*.cs",
-    "UI/*.cs",
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
-    "//dotnet/src/webdriver:{}assembly-strongnamed".format(framework)
-  ],
-  out = "strongnamed/{}/WebDriver.Support.dll".format(framework),
-  keyfile = "//dotnet:WebDriver.snk",
-  visibility = ["//visibility:public"],
-  dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework)
+    name = "{}-strongnamed".format(framework),
+    srcs = glob([
+        "*.cs",
+        "Events/*.cs",
+        "Extensions/*.cs",
+        "PageObjects/**/*.cs",
+        "UI/*.cs",
+    ]),
+    out = "strongnamed/{}/WebDriver.Support.dll".format(framework),
+    dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework),
+    keyfile = "//dotnet:WebDriver.snk",
+    visibility = ["//visibility:public"],
+    deps = [
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
+        "//dotnet/src/webdriver:{}assembly-strongnamed".format(framework),
+    ],
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 core_library(
-  name = "netstandard2.0-strongnamed",
-  srcs = glob([
-    "*.cs",
-    "Events/*.cs",
-    "Extensions/*.cs",
-    "PageObjects/**/*.cs",
-    "UI/*.cs",
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
-    "//dotnet/src/webdriver:netstandard2.0-strongnamed"
-  ],
-  defines = [
-    "NETSTANDARD2_0"
-  ],
-  keyfile = "//dotnet:WebDriver.snk",
-  out = "strongnamed/netstandard2.0/WebDriver.Support.dll",
-  visibility = ["//visibility:public"]
+    name = "netstandard2.0-strongnamed",
+    srcs = glob([
+        "*.cs",
+        "Events/*.cs",
+        "Extensions/*.cs",
+        "PageObjects/**/*.cs",
+        "UI/*.cs",
+    ]),
+    out = "strongnamed/netstandard2.0/WebDriver.Support.dll",
+    defines = [
+        "NETSTANDARD2_0",
+    ],
+    keyfile = "//dotnet:WebDriver.snk",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//dotnet/src/webdriver:netstandard2.0-strongnamed",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
+    ],
 )
 
 nuget_package(
-  name = "package",
-  src = "WebDriver.Support.nuspec",
-  deps = [
-    ":net45",
-    ":net46",
-    ":net47",
-    ":netstandard2.0",
-  ],
-  package_id = "Selenium.Support",
-  package_version = "{}".format(SE_VERSION),
+    name = "package",
+    src = "WebDriver.Support.nuspec",
+    package_id = "Selenium.Support",
+    package_version = "{}".format(SE_VERSION),
+    deps = [
+        ":net45",
+        ":net46",
+        ":net47",
+        ":netstandard2.0",
+    ],
 )
 
 nuget_package(
-  name = "package-strongnamed",
-  src = "WebDriver.Support.nuspec",
-  deps = [
-    ":net45-strongnamed",
-    ":net46-strongnamed",
-    ":net47-strongnamed",
-    ":netstandard2.0-strongnamed",
-  ],
-  package_id = "Selenium.Support.StrongNamed",
-  package_version = "{}".format(SE_VERSION),
+    name = "package-strongnamed",
+    src = "WebDriver.Support.nuspec",
+    package_id = "Selenium.Support.StrongNamed",
+    package_version = "{}".format(SE_VERSION),
+    deps = [
+        ":net45-strongnamed",
+        ":net46-strongnamed",
+        ":net47-strongnamed",
+        ":netstandard2.0-strongnamed",
+    ],
 )
diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel
index 73489cc04ae8a..63ff2ae3c6e30 100644
--- a/dotnet/src/webdriver/BUILD.bazel
+++ b/dotnet/src/webdriver/BUILD.bazel
@@ -1,200 +1,202 @@
-load("@io_bazel_rules_dotnet//dotnet:defs.bzl", "net_library", "core_library", "core_resource")
+load("@io_bazel_rules_dotnet//dotnet:defs.bzl", "core_library", "core_resource", "net_library")
 load("//dotnet:merge-assemblies.bzl", "merged_assembly")
 load("//dotnet:nuget.bzl", "nuget_package")
-load("//dotnet:selenium-dotnet-version.bzl",
-     "SE_VERSION",
-     "ASSEMBLY_VERSION",
-     "SUPPORTED_NET_FRAMEWORKS")
+load(
+    "//dotnet:selenium-dotnet-version.bzl",
+    "ASSEMBLY_VERSION",
+    "SE_VERSION",
+    "SUPPORTED_NET_FRAMEWORKS",
+)
 
 [net_library(
-  name = "{}assembly".format(framework),
-  srcs = glob([
-    "*.cs",
-    "Chrome/*.cs",
-    "Edge/*.cs",
-    "Firefox/**/*.cs",
-    "Html5/*.cs",
-    "IE/*.cs",
-    "Interactions/*.cs",
-    "Internal/*.cs",
-    "Opera/*.cs",
-    "Remote/**/*.cs",
-    "Safari/*.cs",
-    "Support/*.cs"
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.io.compression.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.io.compression.filesystem.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.net.http.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
-    "@json.net//:net45"
-  ],
-  resources = [
-    ":isDisplayed",
-    ":getAttribute"
-  ],
-  visibility = ["//visibility:public"],
-  out = "unmerged/{}/WebDriver.dll".format(framework),
-  dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework)
+    name = "{}assembly".format(framework),
+    srcs = glob([
+        "*.cs",
+        "Chrome/*.cs",
+        "Edge/*.cs",
+        "Firefox/**/*.cs",
+        "Html5/*.cs",
+        "IE/*.cs",
+        "Interactions/*.cs",
+        "Internal/*.cs",
+        "Opera/*.cs",
+        "Remote/**/*.cs",
+        "Safari/*.cs",
+        "Support/*.cs",
+    ]),
+    out = "unmerged/{}/WebDriver.dll".format(framework),
+    dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework),
+    resources = [
+        ":getAttribute",
+        ":isDisplayed",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.io.compression.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.io.compression.filesystem.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.net.http.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
+        "@json.net//:net45",
+    ],
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 core_library(
-  name = "netstandard2.0",
-  srcs = glob([
-    "*.cs",
-    "Chrome/*.cs",
-    "Edge/*.cs",
-    "Firefox/**/*.cs",
-    "Html5/*.cs",
-    "IE/*.cs",
-    "Interactions/*.cs",
-    "Internal/*.cs",
-    "Opera/*.cs",
-    "Remote/**/*.cs",
-    "Safari/*.cs",
-    "Support/*.cs"
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
-    "@json.net//:netcore"
-  ],
-  resources = [
-    ":isDisplayed",
-    ":getAttribute"
-  ],
-  defines = [
-    "NETSTANDARD2_0"
-  ],
-  out = "merged/netstandard2.0/WebDriver.dll",
-  visibility = ["//visibility:public"]
+    name = "netstandard2.0",
+    srcs = glob([
+        "*.cs",
+        "Chrome/*.cs",
+        "Edge/*.cs",
+        "Firefox/**/*.cs",
+        "Html5/*.cs",
+        "IE/*.cs",
+        "Interactions/*.cs",
+        "Internal/*.cs",
+        "Opera/*.cs",
+        "Remote/**/*.cs",
+        "Safari/*.cs",
+        "Support/*.cs",
+    ]),
+    out = "merged/netstandard2.0/WebDriver.dll",
+    defines = [
+        "NETSTANDARD2_0",
+    ],
+    resources = [
+        ":getAttribute",
+        ":isDisplayed",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
+        "@json.net//:netcore",
+    ],
 )
 
 [net_library(
-  name = "{}assembly-strongnamed".format(framework),
-  srcs = glob([
-    "*.cs",
-    "Chrome/*.cs",
-    "Edge/*.cs",
-    "Firefox/**/*.cs",
-    "Html5/*.cs",
-    "IE/*.cs",
-    "Interactions/*.cs",
-    "Internal/*.cs",
-    "Opera/*.cs",
-    "Remote/**/*.cs",
-    "Safari/*.cs",
-    "Support/*.cs"
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.io.compression.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.io.compression.filesystem.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.net.http.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
-    "@json.net//:net45"
-  ],
-  resources = [
-    ":isDisplayed",
-    ":getAttribute"
-  ],
-  visibility = ["//visibility:public"],
-  out = "strongnamed-unmerged/{}/WebDriver.dll".format(framework, framework),
-  keyfile = "//dotnet:WebDriver.snk",
-  dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework)
+    name = "{}assembly-strongnamed".format(framework),
+    srcs = glob([
+        "*.cs",
+        "Chrome/*.cs",
+        "Edge/*.cs",
+        "Firefox/**/*.cs",
+        "Html5/*.cs",
+        "IE/*.cs",
+        "Interactions/*.cs",
+        "Internal/*.cs",
+        "Opera/*.cs",
+        "Remote/**/*.cs",
+        "Safari/*.cs",
+        "Support/*.cs",
+    ]),
+    out = "strongnamed-unmerged/{}/WebDriver.dll".format(framework, framework),
+    dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework),
+    keyfile = "//dotnet:WebDriver.snk",
+    resources = [
+        ":getAttribute",
+        ":isDisplayed",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.io.compression.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.io.compression.filesystem.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.net.http.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
+        "@json.net//:net45",
+    ],
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 core_library(
-  name = "netstandard2.0-strongnamed",
-  srcs = glob([
-    "*.cs",
-    "Chrome/*.cs",
-    "Edge/*.cs",
-    "Firefox/**/*.cs",
-    "Html5/*.cs",
-    "IE/*.cs",
-    "Interactions/*.cs",
-    "Internal/*.cs",
-    "Opera/*.cs",
-    "Remote/**/*.cs",
-    "Safari/*.cs",
-    "Support/*.cs"
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
-    "@json.net//:netcore"
-  ],
-  resources = [
-    ":isDisplayed",
-    ":getAttribute"
-  ],
-  defines = [
-    "NETSTANDARD2_0"
-  ],
-  keyfile = "//dotnet:WebDriver.snk",
-  out = "strongnamed/netstandard2.0/WebDriver.dll",
-  visibility = ["//visibility:public"]
+    name = "netstandard2.0-strongnamed",
+    srcs = glob([
+        "*.cs",
+        "Chrome/*.cs",
+        "Edge/*.cs",
+        "Firefox/**/*.cs",
+        "Html5/*.cs",
+        "IE/*.cs",
+        "Interactions/*.cs",
+        "Internal/*.cs",
+        "Opera/*.cs",
+        "Remote/**/*.cs",
+        "Safari/*.cs",
+        "Support/*.cs",
+    ]),
+    out = "strongnamed/netstandard2.0/WebDriver.dll",
+    defines = [
+        "NETSTANDARD2_0",
+    ],
+    keyfile = "//dotnet:WebDriver.snk",
+    resources = [
+        ":getAttribute",
+        ":isDisplayed",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
+        "@json.net//:netcore",
+    ],
 )
 
 [merged_assembly(
-  name = "{}".format(framework),
-  src_assembly = ":{}assembly".format(framework),
-  deps = ["@json.net//:net45"],
-  visibility = ["//visibility:public"],
-  out = "merged/{}/WebDriver.dll".format(framework),
+    name = "{}".format(framework),
+    out = "merged/{}/WebDriver.dll".format(framework),
+    src_assembly = ":{}assembly".format(framework),
+    visibility = ["//visibility:public"],
+    deps = ["@json.net//:net45"],
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 [merged_assembly(
-  name = "{}-strongnamed".format(framework),
-  src_assembly = ":{}assembly-strongnamed".format(framework),
-  deps = ["@json.net//:net45"],
-  keyfile = "//dotnet:WebDriver.snk",
-  visibility = ["//visibility:public"],
-  out = "strongnamed/{}/WebDriver.dll".format(framework),
+    name = "{}-strongnamed".format(framework),
+    out = "strongnamed/{}/WebDriver.dll".format(framework),
+    keyfile = "//dotnet:WebDriver.snk",
+    src_assembly = ":{}assembly-strongnamed".format(framework),
+    visibility = ["//visibility:public"],
+    deps = ["@json.net//:net45"],
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 nuget_package(
-  name = "package",
-  src = "WebDriver.nuspec",
-  deps = [
-    ":net45",
-    ":net46",
-    ":net47",
-    ":netstandard2.0",
-  ],
-  package_id = "Selenium.WebDriver",
-  package_version = "{}".format(SE_VERSION),
-  visibility = ["//visibility:public"],
+    name = "package",
+    src = "WebDriver.nuspec",
+    package_id = "Selenium.WebDriver",
+    package_version = "{}".format(SE_VERSION),
+    visibility = ["//visibility:public"],
+    deps = [
+        ":net45",
+        ":net46",
+        ":net47",
+        ":netstandard2.0",
+    ],
 )
 
 nuget_package(
-  name = "package-strongnamed",
-  src = "WebDriver.nuspec",
-  deps = [
-    ":net45-strongnamed",
-    ":net46-strongnamed",
-    ":net47-strongnamed",
-    ":netstandard2.0-strongnamed",
-  ],
-  package_id = "Selenium.WebDriver.StrongNamed",
-  package_version = "{}".format(SE_VERSION),
-  visibility = ["//visibility:public"],
+    name = "package-strongnamed",
+    src = "WebDriver.nuspec",
+    package_id = "Selenium.WebDriver.StrongNamed",
+    package_version = "{}".format(SE_VERSION),
+    visibility = ["//visibility:public"],
+    deps = [
+        ":net45-strongnamed",
+        ":net46-strongnamed",
+        ":net47-strongnamed",
+        ":netstandard2.0-strongnamed",
+    ],
 )
 
 core_resource(
-  name = "isDisplayed",
-  src = "//javascript/atoms/fragments:is-displayed.js",
-  identifier = "isDisplayed.js"
+    name = "isDisplayed",
+    src = "//javascript/atoms/fragments:is-displayed.js",
+    identifier = "isDisplayed.js",
 )
 
 core_resource(
-  name = "getAttribute",
-  src = "//javascript/webdriver/atoms:get-attribute.js",
-  identifier = "getAttribute.js"
+    name = "getAttribute",
+    src = "//javascript/webdriver/atoms:get-attribute.js",
+    identifier = "getAttribute.js",
 )
diff --git a/dotnet/src/webdriverbackedselenium/BUILD.bazel b/dotnet/src/webdriverbackedselenium/BUILD.bazel
index 49367fcad8d80..e1554b39a6aa0 100644
--- a/dotnet/src/webdriverbackedselenium/BUILD.bazel
+++ b/dotnet/src/webdriverbackedselenium/BUILD.bazel
@@ -1,246 +1,248 @@
-load("@io_bazel_rules_dotnet//dotnet:defs.bzl", "net_library", "core_library", "core_resource")
+load("@io_bazel_rules_dotnet//dotnet:defs.bzl", "core_library", "core_resource", "net_library")
 load("//dotnet:nuget.bzl", "nuget_package")
-load("//dotnet:selenium-dotnet-version.bzl",
-     "SE_VERSION",
-     "ASSEMBLY_VERSION",
-     "SUPPORTED_NET_FRAMEWORKS")
+load(
+    "//dotnet:selenium-dotnet-version.bzl",
+    "ASSEMBLY_VERSION",
+    "SE_VERSION",
+    "SUPPORTED_NET_FRAMEWORKS",
+)
 
 [net_library(
-  name = "{}".format(framework),
-  srcs = glob([
-    "*.cs",
-    "Internal/**/*.cs",
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
-    "//dotnet/src/webdriver:{}assembly".format(framework)
-  ],
-  resources = [
-    ":injectableSelenium",
-    ":htmlutils",
-    ":findElement",
-    ":findOption",
-    ":fireEvent",
-    ":fireEventAt",
-    ":getText",
-    ":linkLocator",
-    ":isElementPresent",
-    ":isSomethingSelected",
-    ":isTextPresent",
-    ":isVisible",
-    ":type",
-  ],
-  visibility = ["//visibility:public"],
-  out = "merged/{}/Selenium.WebDriverBackedSelenium.dll".format(framework),
-  dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework)
+    name = "{}".format(framework),
+    srcs = glob([
+        "*.cs",
+        "Internal/**/*.cs",
+    ]),
+    out = "merged/{}/Selenium.WebDriverBackedSelenium.dll".format(framework),
+    dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework),
+    resources = [
+        ":findElement",
+        ":findOption",
+        ":fireEvent",
+        ":fireEventAt",
+        ":getText",
+        ":htmlutils",
+        ":injectableSelenium",
+        ":isElementPresent",
+        ":isSomethingSelected",
+        ":isTextPresent",
+        ":isVisible",
+        ":linkLocator",
+        ":type",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
+        "//dotnet/src/webdriver:{}assembly".format(framework),
+    ],
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 core_library(
-  name = "netstandard2.0",
-  srcs = glob([
-    "*.cs",
-    "Internal/**/*.cs",
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
-    "//dotnet/src/webdriver:netstandard2.0"
-  ],
-  resources = [
-    ":injectableSelenium",
-    ":htmlutils",
-    ":findElement",
-    ":findOption",
-    ":fireEvent",
-    ":fireEventAt",
-    ":getText",
-    ":linkLocator",
-    ":isElementPresent",
-    ":isSomethingSelected",
-    ":isTextPresent",
-    ":isVisible",
-    ":type",
-  ],
-  defines = [
-    "NETSTANDARD2_0"
-  ],
-  out = "merged/netstandard2.0/Selenium.WebDriverBackedSelenium.dll",
-  visibility = ["//visibility:public"]
+    name = "netstandard2.0",
+    srcs = glob([
+        "*.cs",
+        "Internal/**/*.cs",
+    ]),
+    out = "merged/netstandard2.0/Selenium.WebDriverBackedSelenium.dll",
+    defines = [
+        "NETSTANDARD2_0",
+    ],
+    resources = [
+        ":findElement",
+        ":findOption",
+        ":fireEvent",
+        ":fireEventAt",
+        ":getText",
+        ":htmlutils",
+        ":injectableSelenium",
+        ":isElementPresent",
+        ":isSomethingSelected",
+        ":isTextPresent",
+        ":isVisible",
+        ":linkLocator",
+        ":type",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//dotnet/src/webdriver:netstandard2.0",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
+    ],
 )
 
 [net_library(
-  name = "{}-strongnamed".format(framework),
-  srcs = glob([
-    "*.cs",
-    "Internal/**/*.cs",
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
-    "//dotnet/src/webdriver:{}assembly-strongnamed".format(framework)
-  ],
-  resources = [
-    ":injectableSelenium",
-    ":htmlutils",
-    ":findElement",
-    ":findOption",
-    ":fireEvent",
-    ":fireEventAt",
-    ":getText",
-    ":linkLocator",
-    ":isElementPresent",
-    ":isSomethingSelected",
-    ":isTextPresent",
-    ":isVisible",
-    ":type",
-  ],
-  visibility = ["//visibility:public"],
-  out = "merged/{}/Selenium.WebDriverBackedSelenium.dll".format(framework),
-  keyfile = "//dotnet:WebDriver.snk",
-  dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework)
+    name = "{}-strongnamed".format(framework),
+    srcs = glob([
+        "*.cs",
+        "Internal/**/*.cs",
+    ]),
+    out = "merged/{}/Selenium.WebDriverBackedSelenium.dll".format(framework),
+    dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_{}".format(framework),
+    keyfile = "//dotnet:WebDriver.snk",
+    resources = [
+        ":findElement",
+        ":findOption",
+        ":fireEvent",
+        ":fireEventAt",
+        ":getText",
+        ":htmlutils",
+        ":injectableSelenium",
+        ":isElementPresent",
+        ":isSomethingSelected",
+        ":isTextPresent",
+        ":isVisible",
+        ":linkLocator",
+        ":type",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
+        "//dotnet/src/webdriver:{}assembly-strongnamed".format(framework),
+    ],
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 core_library(
-  name = "netstandard2.0-strongnamed",
-  srcs = glob([
-    "*.cs",
-    "Internal/**/*.cs",
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
-    "//dotnet/src/webdriver:netstandard2.0-strongnamed"
-  ],
-  resources = [
-    ":injectableSelenium",
-    ":htmlutils",
-    ":findElement",
-    ":findOption",
-    ":fireEvent",
-    ":fireEventAt",
-    ":getText",
-    ":linkLocator",
-    ":isElementPresent",
-    ":isSomethingSelected",
-    ":isTextPresent",
-    ":isVisible",
-    ":type",
-  ],
-  defines = [
-    "NETSTANDARD2_0"
-  ],
-  out = "merged/netstandard2.0/Selenium.WebDriverBackedSelenium.dll",
-  keyfile = "//dotnet:WebDriver.snk",
-  visibility = ["//visibility:public"]
+    name = "netstandard2.0-strongnamed",
+    srcs = glob([
+        "*.cs",
+        "Internal/**/*.cs",
+    ]),
+    out = "merged/netstandard2.0/Selenium.WebDriverBackedSelenium.dll",
+    defines = [
+        "NETSTANDARD2_0",
+    ],
+    keyfile = "//dotnet:WebDriver.snk",
+    resources = [
+        ":findElement",
+        ":findOption",
+        ":fireEvent",
+        ":fireEventAt",
+        ":getText",
+        ":htmlutils",
+        ":injectableSelenium",
+        ":isElementPresent",
+        ":isSomethingSelected",
+        ":isTextPresent",
+        ":isVisible",
+        ":linkLocator",
+        ":type",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//dotnet/src/webdriver:netstandard2.0-strongnamed",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.core:netstandard.dll",
+    ],
 )
 
 nuget_package(
-  name = "package",
-  src = "Selenium.WebDriverBackedSelenium.nuspec",
-  deps = [
-    ":net45",
-    ":net46",
-    ":net47",
-    ":netstandard2.0",
-  ],
-  package_id = "Selenium.WebDriverBackedSelenium",
-  package_version = "{}".format(SE_VERSION),
-  visibility = ["//visibility:public"],
+    name = "package",
+    src = "Selenium.WebDriverBackedSelenium.nuspec",
+    package_id = "Selenium.WebDriverBackedSelenium",
+    package_version = "{}".format(SE_VERSION),
+    visibility = ["//visibility:public"],
+    deps = [
+        ":net45",
+        ":net46",
+        ":net47",
+        ":netstandard2.0",
+    ],
 )
 
 nuget_package(
-  name = "package-strongnamed",
-  src = "Selenium.WebDriverBackedSelenium.nuspec",
-  deps = [
-    ":net45-strongnamed",
-    ":net46-strongnamed",
-    ":net47-strongnamed",
-    ":netstandard2.0-strongnamed",
-  ],
-  package_id = "Selenium.WebDriverBackedSelenium.StrongNamed",
-  package_version = "{}".format(SE_VERSION),
-  visibility = ["//visibility:public"],
+    name = "package-strongnamed",
+    src = "Selenium.WebDriverBackedSelenium.nuspec",
+    package_id = "Selenium.WebDriverBackedSelenium.StrongNamed",
+    package_version = "{}".format(SE_VERSION),
+    visibility = ["//visibility:public"],
+    deps = [
+        ":net45-strongnamed",
+        ":net46-strongnamed",
+        ":net47-strongnamed",
+        ":netstandard2.0-strongnamed",
+    ],
 )
 
 core_resource(
-  name = "injectableSelenium",
-  src = "//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
-  identifier = "injectableSelenium.js"
+    name = "injectableSelenium",
+    src = "//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
+    identifier = "injectableSelenium.js",
 )
 
 core_resource(
-  name = "htmlutils",
-  src = "//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
-  identifier = "htmlutils.js"
+    name = "htmlutils",
+    src = "//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
+    identifier = "htmlutils.js",
 )
 
 core_resource(
-  name = "findElement",
-  src = "//javascript/selenium-atoms:findElement.js",
-  identifier = "findElement.js"
+    name = "findElement",
+    src = "//javascript/selenium-atoms:findElement.js",
+    identifier = "findElement.js",
 )
 
 core_resource(
-  name = "findOption",
-  src = "//javascript/selenium-atoms:findOption.js",
-  identifier = "findOption.js"
+    name = "findOption",
+    src = "//javascript/selenium-atoms:findOption.js",
+    identifier = "findOption.js",
 )
 
 core_resource(
-  name = "fireEvent",
-  src = "//javascript/selenium-atoms:fireEvent.js",
-  identifier = "fireEvent.js"
+    name = "fireEvent",
+    src = "//javascript/selenium-atoms:fireEvent.js",
+    identifier = "fireEvent.js",
 )
 
 core_resource(
-  name = "fireEventAt",
-  src = "//javascript/selenium-atoms:fireEventAt.js",
-  identifier = "fireEventAt.js"
+    name = "fireEventAt",
+    src = "//javascript/selenium-atoms:fireEventAt.js",
+    identifier = "fireEventAt.js",
 )
- 
+
 core_resource(
-  name = "getText",
-  src = "//javascript/selenium-atoms:getText.js",
-  identifier = "getText.js"
+    name = "getText",
+    src = "//javascript/selenium-atoms:getText.js",
+    identifier = "getText.js",
 )
- 
+
 core_resource(
-  name = "linkLocator",
-  src = "//javascript/selenium-atoms:linkLocator.js",
-  identifier = "linkLocator.js"
+    name = "linkLocator",
+    src = "//javascript/selenium-atoms:linkLocator.js",
+    identifier = "linkLocator.js",
 )
 
 core_resource(
-  name = "isElementPresent",
-  src = "//javascript/selenium-atoms:isElementPresent.js",
-  identifier = "isElementPresent.js"
+    name = "isElementPresent",
+    src = "//javascript/selenium-atoms:isElementPresent.js",
+    identifier = "isElementPresent.js",
 )
 
 core_resource(
-  name = "isSomethingSelected",
-  src = "//javascript/selenium-atoms:isSomethingSelected.js",
-  identifier = "isSomethingSelected.js"
+    name = "isSomethingSelected",
+    src = "//javascript/selenium-atoms:isSomethingSelected.js",
+    identifier = "isSomethingSelected.js",
 )
 
 core_resource(
-  name = "isTextPresent",
-  src = "//javascript/selenium-atoms:isTextPresent.js",
-  identifier = "isTextPresent.js"
+    name = "isTextPresent",
+    src = "//javascript/selenium-atoms:isTextPresent.js",
+    identifier = "isTextPresent.js",
 )
 
 core_resource(
-  name = "isVisible",
-  src = "//javascript/selenium-atoms:isVisible.js",
-  identifier = "isVisible.js"
+    name = "isVisible",
+    src = "//javascript/selenium-atoms:isVisible.js",
+    identifier = "isVisible.js",
 )
 
 core_resource(
-  name = "type",
-  src = "//javascript/selenium-atoms:type.js",
-  identifier = "type.js"
+    name = "type",
+    src = "//javascript/selenium-atoms:type.js",
+    identifier = "type.js",
 )
diff --git a/dotnet/test/common/BUILD.bazel b/dotnet/test/common/BUILD.bazel
index 57181bb146b91..f961def466ed2 100644
--- a/dotnet/test/common/BUILD.bazel
+++ b/dotnet/test/common/BUILD.bazel
@@ -1,52 +1,52 @@
 load("@io_bazel_rules_dotnet//dotnet:defs.bzl", "net_nunit3_test")
 
 SUPPORTED_BROWSERS = [
-  ("chrome", "Chrome"),
-  ("chromedev", "ChromeDev"),
-  ("firefox", "Firefox"),
-  ("firefoxnightly", "FirefoxNightly"),
-  ("ie", "IE"),
-  ("edge", "Edge"),
-  ("safari", "Safari"),
-  ("safaritechpreview", "SafariTechPreview"),
+    ("chrome", "Chrome"),
+    ("chromedev", "ChromeDev"),
+    ("firefox", "Firefox"),
+    ("firefoxnightly", "FirefoxNightly"),
+    ("ie", "IE"),
+    ("edge", "Edge"),
+    ("safari", "Safari"),
+    ("safaritechpreview", "SafariTechPreview"),
 ]
 
 [net_nunit3_test(
-  name = "{}".format(target_name),
-  srcs = glob([
-    "*.cs",
-    "CustomDriverConfigs/*.cs",
-    "CustomTestAttributes/*.cs",
-    "Environment/*.cs",
-    "HTML5/*.cs",
-    "Interactions/*.cs",
-  ]),
-  deps = [
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
-    "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
-    "//dotnet/src/webdriver:net47assembly",
-    "@json.net//:net45",
-    "@moq//:net45",
-    "@nunit//:net45",
-    "@benderproxy//:net47",
-  ],
-  data = [
-    "appconfig.json",
-    "//java/client/test/org/openqa/selenium/environment:WebServer",
-    "//java/client/test/org/openqa/selenium/environment:WebServer_deploy.jar",
-    "//common/src/web",
-  ],
-  size = "enormous",
-  args = [
-    "--agents=1",
-    "--params=ConfigFile=$(location appconfig.json)",
-    "--params=ActiveWebsiteConfig=HostsFileRedirect",
-    "--params=ActiveDriverConfig={}".format(config_setting),
-  ],
-  visibility = ["//visibility:public"],
-  out = "WebDriver.Common.Tests.dll",
-  dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_net47"
+    name = "{}".format(target_name),
+    size = "enormous",
+    srcs = glob([
+        "*.cs",
+        "CustomDriverConfigs/*.cs",
+        "CustomTestAttributes/*.cs",
+        "Environment/*.cs",
+        "HTML5/*.cs",
+        "Interactions/*.cs",
+    ]),
+    out = "WebDriver.Common.Tests.dll",
+    args = [
+        "--agents=1",
+        "--params=ConfigFile=$(location appconfig.json)",
+        "--params=ActiveWebsiteConfig=HostsFileRedirect",
+        "--params=ActiveDriverConfig={}".format(config_setting),
+    ],
+    data = [
+        "appconfig.json",
+        "//common/src/web",
+        "//java/client/test/org/openqa/selenium/environment:WebServer",
+        "//java/client/test/org/openqa/selenium/environment:WebServer_deploy.jar",
+    ],
+    dotnet_context_data = "@io_bazel_rules_dotnet//:net_context_data_net47",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//dotnet/src/webdriver:net47assembly",
+        "@benderproxy//:net47",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.core.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.data.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.drawing.dll",
+        "@io_bazel_rules_dotnet//dotnet/stdlib.net:system.xml.dll",
+        "@json.net//:net45",
+        "@moq//:net45",
+        "@nunit//:net45",
+    ],
 ) for (target_name, config_setting) in SUPPORTED_BROWSERS]
diff --git a/java/client/src/org/openqa/selenium/remote/http/BUILD.bazel b/java/client/src/org/openqa/selenium/remote/http/BUILD.bazel
index 00d005d364231..516b6ed12a447 100644
--- a/java/client/src/org/openqa/selenium/remote/http/BUILD.bazel
+++ b/java/client/src/org/openqa/selenium/remote/http/BUILD.bazel
@@ -11,8 +11,8 @@ java_library(
         "//java/client/test/org/openqa/selenium/net:__pkg__",
         "//java/client/test/org/openqa/selenium/remote:__subpackages__",
         "//java/client/test/org/openqa/selenium/testing/drivers:__pkg__",
-        "//java/server/src/org/openqa/selenium/netty:__subpackages__",
         "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+        "//java/server/src/org/openqa/selenium/netty:__subpackages__",
         "//java/server/test/org/openqa/selenium/grid:__subpackages__",
     ],
     deps = [
diff --git a/java/client/src/org/openqa/selenium/remote/tracing/BUILD.bazel b/java/client/src/org/openqa/selenium/remote/tracing/BUILD.bazel
index 5552c1ef2ea8b..9c5203125c37f 100644
--- a/java/client/src/org/openqa/selenium/remote/tracing/BUILD.bazel
+++ b/java/client/src/org/openqa/selenium/remote/tracing/BUILD.bazel
@@ -1,21 +1,21 @@
 java_library(
     name = "tracing",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/client/test/org/openqa/selenium/remote/tracing:__subpackages__",
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     exports = [
         # Exposed by tracing APIs
         "//java/client/src/org/openqa/selenium/remote/http",
     ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote/http",
-        "//third_party/java/guava",
         "//third_party/java/contrib:opentracing-tracerresolver",
+        "//third_party/java/guava",
         "//third_party/java/opentracing:opentracing-api",
-        "//third_party/java/opentracing:opentracing-util",
         "//third_party/java/opentracing:opentracing-noop",
-    ],
-    visibility = [
-        "//java/client/test/org/openqa/selenium/remote/tracing:__subpackages__",
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+        "//third_party/java/opentracing:opentracing-util",
     ],
 )
diff --git a/java/client/test/org/openqa/selenium/net/BUILD.bazel b/java/client/test/org/openqa/selenium/net/BUILD.bazel
index 8e510f9cf8044..915f48c1feaf6 100644
--- a/java/client/test/org/openqa/selenium/net/BUILD.bazel
+++ b/java/client/test/org/openqa/selenium/net/BUILD.bazel
@@ -12,10 +12,10 @@ java_library(
 java_test_suite(
     name = "SmallTests",
     size = "small",
+    srcs = glob(["*Test.java"]),
     tags = [
         "no-sandbox",
     ],
-    srcs = glob(["*Test.java"]),
     deps = [
         ":net",
         "//java/client/src/org/openqa/selenium:core",
diff --git a/java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel b/java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel
index 44ecde0370e29..cf7557e059de4 100644
--- a/java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel
+++ b/java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel
@@ -6,6 +6,9 @@ java_library(
     srcs = [
         "HttpClientTestBase.java",
     ],
+    visibility = [
+        "//java/client/test/org/openqa/selenium:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/json",
@@ -17,15 +20,12 @@ java_library(
         "//third_party/java/junit",
         "//third_party/java/servlet:javax.servlet-api",
     ],
-    visibility = [
-        "//java/client/test/org/openqa/selenium:__subpackages__",
-    ]
 )
 
 java_test_suite(
     name = "SmallTests",
-    srcs = glob(["*Test.java"]),
     size = "small",
+    srcs = glob(["*Test.java"]),
     tags = [
         "no-sandbox",
     ],
@@ -39,4 +39,4 @@ java_test_suite(
         "//third_party/java/guava",
         "//third_party/java/junit",
     ],
-)
\ No newline at end of file
+)
diff --git a/java/client/test/org/openqa/selenium/remote/tracing/BUILD.bazel b/java/client/test/org/openqa/selenium/remote/tracing/BUILD.bazel
index b6bb676bc39e2..6b7ca74f15be0 100644
--- a/java/client/test/org/openqa/selenium/remote/tracing/BUILD.bazel
+++ b/java/client/test/org/openqa/selenium/remote/tracing/BUILD.bazel
@@ -3,17 +3,16 @@ load("//java:rules.bzl", "java_test_suite")
 java_test_suite(
     name = "SmallTests",
     size = "small",
+    srcs = glob(["*.java"]),
     tags = [
         "no-sandbox",
     ],
-    srcs = glob(["*.java"]),
     deps = [
         "//java/client/src/org/openqa/selenium/remote/tracing",
-        "//java/client/test/org/openqa/selenium/remote/tracing/simple",
         "//java/client/test/org/openqa/selenium/environment",
+        "//java/client/test/org/openqa/selenium/remote/tracing/simple",
         "//third_party/java/assertj",
         "//third_party/java/guava",
         "//third_party/java/junit",
     ],
 )
-
diff --git a/java/client/test/org/openqa/selenium/remote/tracing/simple/BUILD.bazel b/java/client/test/org/openqa/selenium/remote/tracing/simple/BUILD.bazel
index e0a3399e74fac..9cc215fbf58a1 100644
--- a/java/client/test/org/openqa/selenium/remote/tracing/simple/BUILD.bazel
+++ b/java/client/test/org/openqa/selenium/remote/tracing/simple/BUILD.bazel
@@ -1,13 +1,13 @@
 java_library(
     name = "simple",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/client/test/org/openqa/selenium/remote/tracing:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote/tracing",
         "//third_party/java/guava",
         "//third_party/java/opentracing:opentracing-api",
         "//third_party/java/opentracing:opentracing-util",
     ],
-    visibility = [
-        "//java/client/test/org/openqa/selenium/remote/tracing:__pkg__",
-    ],
-)
\ No newline at end of file
+)
diff --git a/java/server/src/org/openqa/selenium/events/BUILD.bazel b/java/server/src/org/openqa/selenium/events/BUILD.bazel
index 443130d099241..e1223bb0557a5 100644
--- a/java/server/src/org/openqa/selenium/events/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/events/BUILD.bazel
@@ -1,12 +1,12 @@
 java_library(
     name = "events",
     srcs = glob(["*.java"]),
-    deps = [
-        "//java/client/src/org/openqa/selenium/json",
-    ],
     visibility = [
         "//java/server/src/org/openqa/selenium/events:__subpackages__",
         "//java/server/src/org/openqa/selenium/grid:__subpackages__",
         "//java/server/test/org/openqa/selenium/grid:__subpackages__",
     ],
-)
\ No newline at end of file
+    deps = [
+        "//java/client/src/org/openqa/selenium/json",
+    ],
+)
diff --git a/java/server/src/org/openqa/selenium/events/local/BUILD.bazel b/java/server/src/org/openqa/selenium/events/local/BUILD.bazel
index 6d544337657ad..6d88c0699e913 100644
--- a/java/server/src/org/openqa/selenium/events/local/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/events/local/BUILD.bazel
@@ -1,12 +1,12 @@
 java_library(
     name = "local",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/server/src/org/openqa/selenium/events",
         "//java/server/src/org/openqa/selenium/grid/config",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ],
-)
\ No newline at end of file
+)
diff --git a/java/server/src/org/openqa/selenium/events/zeromq/BUILD.bazel b/java/server/src/org/openqa/selenium/events/zeromq/BUILD.bazel
index 2905794c7d8f0..1f722a1f759f4 100644
--- a/java/server/src/org/openqa/selenium/events/zeromq/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/events/zeromq/BUILD.bazel
@@ -1,6 +1,9 @@
 java_library(
     name = "zeromq",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/test/org/openqa/selenium/grid/router:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/net",
@@ -9,7 +12,4 @@ java_library(
         "//third_party/java/guava",
         "//third_party/java/zeromq:jeromq",
     ],
-    visibility = [
-        "//java/server/test/org/openqa/selenium/grid/router:__pkg__",
-    ],
 )
diff --git a/java/server/src/org/openqa/selenium/grid/component/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/component/BUILD.bazel
index 86f8491029e1c..64062aefa0d69 100644
--- a/java/server/src/org/openqa/selenium/grid/component/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/component/BUILD.bazel
@@ -6,4 +6,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/netty/server:__pkg__",
         "//java/server/test/org/openqa/selenium/grid:__subpackages__",
     ],
-)
\ No newline at end of file
+)
diff --git a/java/server/src/org/openqa/selenium/grid/config/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/config/BUILD.bazel
index a03d37747687a..62d4c4bb937c3 100644
--- a/java/server/src/org/openqa/selenium/grid/config/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/config/BUILD.bazel
@@ -1,13 +1,13 @@
 java_library(
     name = "config",
     srcs = glob(["*.java"]),
-    deps = [
-        "//third_party/java/guava",
-    ],
     visibility = [
         "//java/server/src/org/openqa/selenium/events:__subpackages__",
         "//java/server/src/org/openqa/selenium/grid:__subpackages__",
         "//java/server/src/org/openqa/selenium/netty/server:__pkg__",
         "//java/server/test/org/openqa/selenium/grid:__subpackages__",
     ],
-)
\ No newline at end of file
+    deps = [
+        "//third_party/java/guava",
+    ],
+)
diff --git a/java/server/src/org/openqa/selenium/grid/data/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/data/BUILD.bazel
index cbeb02782e671..df6e38ac84029 100644
--- a/java/server/src/org/openqa/selenium/grid/data/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/data/BUILD.bazel
@@ -1,6 +1,10 @@
 java_library(
     name = "data",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/json",
@@ -8,8 +12,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/events",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ],
 )
diff --git a/java/server/src/org/openqa/selenium/grid/distributor/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/BUILD.bazel
index 7c261179152b6..6374b7b6059b5 100644
--- a/java/server/src/org/openqa/selenium/grid/distributor/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/distributor/BUILD.bazel
@@ -1,6 +1,10 @@
 java_library(
     name = "distributor",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/json",
@@ -12,8 +16,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/web",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ]
-)
\ No newline at end of file
+)
diff --git a/java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel
index 6cd859ff061b5..6324367df2cd2 100644
--- a/java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel
@@ -1,6 +1,10 @@
 java_library(
     name = "local",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/test/org/openqa/selenium/grid/distributor:__pkg__",
+        "//java/server/test/org/openqa/selenium/grid/router:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote",
@@ -15,8 +19,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/sessionmap",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/test/org/openqa/selenium/grid/distributor:__pkg__",
-        "//java/server/test/org/openqa/selenium/grid/router:__pkg__",
-    ]
 )
diff --git a/java/server/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel
index 689f29720eab3..3495367ba62c4 100644
--- a/java/server/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel
@@ -1,6 +1,10 @@
 java_library(
     name = "remote",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/test/org/openqa/selenium/grid/distributor:__pkg__",
+        "//java/server/test/org/openqa/selenium/grid/router:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/json",
@@ -10,8 +14,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/node",
         "//java/server/src/org/openqa/selenium/grid/web",
     ],
-    visibility = [
-        "//java/server/test/org/openqa/selenium/grid/distributor:__pkg__",
-        "//java/server/test/org/openqa/selenium/grid/router:__pkg__",
-    ]
-)
\ No newline at end of file
+)
diff --git a/java/server/src/org/openqa/selenium/grid/node/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/node/BUILD.bazel
index 39dd007667217..1cb0cf00c6713 100644
--- a/java/server/src/org/openqa/selenium/grid/node/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/node/BUILD.bazel
@@ -1,6 +1,10 @@
 java_library(
     name = "node",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/json",
@@ -12,8 +16,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/web",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ]
 )
diff --git a/java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel
index fc84c94de597d..04bcbb7f97b43 100644
--- a/java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel
@@ -1,6 +1,9 @@
 java_library(
     name = "local",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote",
@@ -13,7 +16,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/web",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ],
-)
\ No newline at end of file
+)
diff --git a/java/server/src/org/openqa/selenium/grid/node/remote/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/node/remote/BUILD.bazel
index 144c484aba467..d20ab01f68b95 100644
--- a/java/server/src/org/openqa/selenium/grid/node/remote/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/node/remote/BUILD.bazel
@@ -1,6 +1,11 @@
 java_library(
     name = "remote",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid/distributor:__subpackages__",
+        "//java/server/test/org/openqa/selenium/grid/node:__pkg__",
+        "//java/server/test/org/openqa/selenium/grid/router:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/net",
@@ -12,9 +17,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/web",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid/distributor:__subpackages__",
-        "//java/server/test/org/openqa/selenium/grid/node:__pkg__",
-        "//java/server/test/org/openqa/selenium/grid/router:__pkg__",
-    ],
 )
diff --git a/java/server/src/org/openqa/selenium/grid/router/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/router/BUILD.bazel
index 1f30a7108078b..e4b0e8ffd4042 100644
--- a/java/server/src/org/openqa/selenium/grid/router/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/router/BUILD.bazel
@@ -1,6 +1,9 @@
 java_library(
     name = "router",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/net",
@@ -13,7 +16,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/web",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ]
-)
\ No newline at end of file
+)
diff --git a/java/server/src/org/openqa/selenium/grid/server/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/server/BUILD.bazel
index e6a7a47f24622..d467c3573a3f1 100644
--- a/java/server/src/org/openqa/selenium/grid/server/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/server/BUILD.bazel
@@ -1,6 +1,11 @@
 java_library(
     name = "server",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+        "//java/server/src/org/openqa/selenium/netty/server:__pkg__",
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/json",
@@ -15,9 +20,4 @@ java_library(
         "//third_party/java/jetty",
         "//third_party/java/servlet:javax.servlet-api",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-        "//java/server/src/org/openqa/selenium/netty/server:__pkg__",
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ],
 )
diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel
index be152ddd922cf..74a1b2fd2c871 100644
--- a/java/server/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel
@@ -1,6 +1,10 @@
 java_library(
     name = "sessionmap",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/json",
@@ -10,8 +14,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/web",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ],
-)
\ No newline at end of file
+)
diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/local/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionmap/local/BUILD.bazel
index 7c624dd68efee..524b5522d140d 100644
--- a/java/server/src/org/openqa/selenium/grid/sessionmap/local/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/sessionmap/local/BUILD.bazel
@@ -1,6 +1,9 @@
 java_library(
     name = "local",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/src/org/openqa/selenium/remote/tracing",
@@ -8,7 +11,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/data",
         "//java/server/src/org/openqa/selenium/grid/sessionmap",
     ],
-    visibility = [
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ]
-)
\ No newline at end of file
+)
diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel
index a9f5248e7bec5..3f77c93be5a84 100644
--- a/java/server/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel
@@ -1,6 +1,9 @@
 java_library(
     name = "remote",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote",
@@ -8,7 +11,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/sessionmap",
         "//java/server/src/org/openqa/selenium/grid/web",
     ],
-    visibility = [
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ]
 )
diff --git a/java/server/src/org/openqa/selenium/grid/web/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/web/BUILD.bazel
index 993ce72cdfdf2..647e7a1f3716b 100644
--- a/java/server/src/org/openqa/selenium/grid/web/BUILD.bazel
+++ b/java/server/src/org/openqa/selenium/grid/web/BUILD.bazel
@@ -1,6 +1,10 @@
 java_library(
     name = "web",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/json",
@@ -8,8 +12,4 @@ java_library(
         "//java/client/src/org/openqa/selenium/remote/http",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ],
 )
diff --git a/java/server/test/org/openqa/selenium/grid/distributor/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/distributor/BUILD.bazel
index 6839187f66ab5..54b4c7b854cf0 100644
--- a/java/server/test/org/openqa/selenium/grid/distributor/BUILD.bazel
+++ b/java/server/test/org/openqa/selenium/grid/distributor/BUILD.bazel
@@ -6,9 +6,9 @@ java_test_suite(
     srcs = glob(["*Test.java"]),
     deps = [
         "//java/client/src/org/openqa/selenium:core",
+        "//java/client/src/org/openqa/selenium/net",
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/src/org/openqa/selenium/remote/tracing",
-        "//java/client/src/org/openqa/selenium/net",
         "//java/client/src/org/openqa/selenium/support",
         "//java/server/src/org/openqa/selenium/events",
         "//java/server/src/org/openqa/selenium/events/local",
diff --git a/java/server/test/org/openqa/selenium/grid/testing/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/testing/BUILD.bazel
index c8bd955ce4f6d..612692030bd22 100644
--- a/java/server/test/org/openqa/selenium/grid/testing/BUILD.bazel
+++ b/java/server/test/org/openqa/selenium/grid/testing/BUILD.bazel
@@ -2,13 +2,13 @@ java_library(
     name = "testing",
     testonly = True,
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote",
         "//java/server/src/org/openqa/selenium/grid/data",
         "//java/server/src/org/openqa/selenium/grid/node",
         "//java/server/src/org/openqa/selenium/grid/web",
     ],
-    visibility = [
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ]
-)
\ No newline at end of file
+)
diff --git a/java/server/test/org/openqa/testing/BUILD.bazel b/java/server/test/org/openqa/testing/BUILD.bazel
index 2d0b0b989965b..a463814575dc5 100644
--- a/java/server/test/org/openqa/testing/BUILD.bazel
+++ b/java/server/test/org/openqa/testing/BUILD.bazel
@@ -1,11 +1,11 @@
 java_library(
     name = "testing",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/test/org/openqa/selenium:__subpackages__",
+    ],
     deps = [
         "//third_party/java/guava",
         "//third_party/java/servlet:javax.servlet-api",
     ],
-    visibility = [
-        "//java/server/test/org/openqa/selenium:__subpackages__",
-    ],
 )
diff --git a/javascript/node/selenium-webdriver/BUILD.bazel b/javascript/node/selenium-webdriver/BUILD.bazel
index 2ff940b3bffbf..6facfe2a9d228 100644
--- a/javascript/node/selenium-webdriver/BUILD.bazel
+++ b/javascript/node/selenium-webdriver/BUILD.bazel
@@ -54,7 +54,6 @@ nodejs_binary(
 
 jasmine_node_test(
     name = "tests",
-    local = True,
     srcs = TEST_FILES,
     bootstrap = ["selenium/javascript/node/selenium-webdriver/tools/init_jasmine.js"],
     data = TEST_DATA + [
@@ -69,6 +68,7 @@ jasmine_node_test(
         "@npm//sinon",
         "@npm//xml2js",
     ],
+    local = True,
     deps = [
         "//javascript/node/selenium-webdriver/lib/atoms:get_attribute",
         "//javascript/node/selenium-webdriver/lib/atoms:is_displayed",
diff --git a/javascript/node/selenium-webdriver/lib/atoms/BUILD.bazel b/javascript/node/selenium-webdriver/lib/atoms/BUILD.bazel
index b10da1fb83473..c3f9073d9ee32 100644
--- a/javascript/node/selenium-webdriver/lib/atoms/BUILD.bazel
+++ b/javascript/node/selenium-webdriver/lib/atoms/BUILD.bazel
@@ -13,8 +13,8 @@ genrule(
     name = "is_displayed",
     srcs = ["//javascript/atoms/fragments:is-displayed.js"],
     outs = ["is-displayed.js"],
-    tools = [":make_atoms_module"],
     cmd = "$(location :make_atoms_module) $< $@",
+    tools = [":make_atoms_module"],
     visibility = ["//javascript/node/selenium-webdriver:__pkg__"],
 )
 
@@ -22,8 +22,7 @@ genrule(
     name = "get_attribute",
     srcs = ["//javascript/webdriver/atoms:get-attribute.js"],
     outs = ["get-attribute.js"],
-    tools = [":make_atoms_module"],
     cmd = "$(location :make_atoms_module) $< $@",
+    tools = [":make_atoms_module"],
     visibility = ["//javascript/node/selenium-webdriver:__pkg__"],
 )
-
diff --git a/third_party/dotnet/ilrepack/BUILD.bazel b/third_party/dotnet/ilrepack/BUILD.bazel
index 1b99513e82e66..da51758bfc59d 100644
--- a/third_party/dotnet/ilrepack/BUILD.bazel
+++ b/third_party/dotnet/ilrepack/BUILD.bazel
@@ -1,3 +1,3 @@
 licenses(["notice"])
 
-exports_files(["ilrepack.exe"])
\ No newline at end of file
+exports_files(["ilrepack.exe"])
diff --git a/third_party/dotnet/nuget/packages/BUILD.bazel b/third_party/dotnet/nuget/packages/BUILD.bazel
index 01cdc9661bc95..f61ea7c71425c 100644
--- a/third_party/dotnet/nuget/packages/BUILD.bazel
+++ b/third_party/dotnet/nuget/packages/BUILD.bazel
@@ -1,10 +1,10 @@
 licenses(["notice"])
 
 exports_files([
-  "benderproxy.bzl",
-  "castle.core.bzl",
-  "moq.bzl",
-  "newtonsoft.json.bzl",
-  "nunit.bzl",
-  "system.threading.tasks.extensions.bzl"
+    "benderproxy.bzl",
+    "castle.core.bzl",
+    "moq.bzl",
+    "newtonsoft.json.bzl",
+    "nunit.bzl",
+    "system.threading.tasks.extensions.bzl",
 ])
diff --git a/third_party/java/jetty/BUILD.bazel b/third_party/java/jetty/BUILD.bazel
index f02b073e593dd..34aca6b5241b4 100644
--- a/third_party/java/jetty/BUILD.bazel
+++ b/third_party/java/jetty/BUILD.bazel
@@ -29,13 +29,14 @@ genrule(
     name = "strip-services",
     srcs = [":bundle-jars_deploy.jar"],
     outs = ["stripped-bundle.jar"],
-    tools = ["//java/client/src/org/openqa/selenium/tools:DeleteFromZip"],
     cmd = "cp $< $@ && chmod +w $@ && $(location //java/client/src/org/openqa/selenium/tools:DeleteFromZip) $@ META-INF/services",
+    tools = ["//java/client/src/org/openqa/selenium/tools:DeleteFromZip"],
     visibility = ["//visibility:private"],
 )
 
 java_binary(
     name = "bundle-jars",
+    visibility = ["//visibility:private"],
     runtime_deps = [
         ":jetty-http-repacked",
         ":jetty-io-repacked",
@@ -46,20 +47,22 @@ java_binary(
         ":jetty-util-repacked",
         ":jetty-xml-repacked",
     ],
-    visibility = ["//visibility:private"],
 )
 
-repack_jars(JETTY_VERSION, [
-    "jetty-client",
-    "jetty-http",
-    "jetty-io",
-    "jetty-jmx",
-    "jetty-security",
-    "jetty-server",
-    "jetty-servlet",
-    "jetty-util",
-    "jetty-xml",
-])
+repack_jars(
+    JETTY_VERSION,
+    [
+        "jetty-client",
+        "jetty-http",
+        "jetty-io",
+        "jetty-jmx",
+        "jetty-security",
+        "jetty-server",
+        "jetty-servlet",
+        "jetty-util",
+        "jetty-xml",
+    ],
+)
 
 filegroup(
     name = "jarjar-rules",