--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -297965,16 +297965,21 @@
      {}
     ]
    ],
    "webdriver/tests/__init__.py": [
     [
      {}
     ]
    ],
+   "webdriver/tests/accept_alert/__init__.py": [
+    [
+     {}
+    ]
+   ],
    "webdriver/tests/actions/__init__.py": [
     [
      {}
     ]
    ],
    "webdriver/tests/actions/conftest.py": [
     [
      {}
@@ -298000,67 +298005,192 @@
      {}
     ]
    ],
    "webdriver/tests/actions/support/test_actions_wdspec.html": [
     [
      {}
     ]
    ],
+   "webdriver/tests/add_cookie/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/close_window/__init__.py": [
+    [
+     {}
+    ]
+   ],
    "webdriver/tests/conftest.py": [
     [
      {}
     ]
    ],
+   "webdriver/tests/delete_cookie/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/dismiss_alert/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/element_clear/__init__.py": [
+    [
+     {}
+    ]
+   ],
    "webdriver/tests/element_click/__init__.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/__init__.py": [
-    [
-     {}
-    ]
-   ],
    "webdriver/tests/element_send_keys/__init__.py": [
     [
      {}
     ]
    ],
    "webdriver/tests/execute_async_script/__init__.py": [
     [
      {}
     ]
    ],
    "webdriver/tests/execute_script/__init__.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/conftest.py": [
-    [
-     {}
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/support/__init__.py": [
-    [
-     {}
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/support/create.py": [
-    [
-     {}
-    ]
-   ],
-   "webdriver/tests/state/__init__.py": [
-    [
-     {}
-    ]
-   ],
-   "webdriver/tests/state/text/__init__.py": [
+   "webdriver/tests/find_element/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/find_element_from_element/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/find_elements/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/find_elements_from_element/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/fullscreen_window/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_active_element/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_alert_text/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_current_url/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_element_property/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_element_tag_name/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_element_text/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_named_cookie/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_timeouts/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_title/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_window_rect/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/is_element_selected/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/maximize_window/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/minimize_window/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/conftest.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/support/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/support/create.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/page_source/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/send_alert_text/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/set_window_rect/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/status/__init__.py": [
     [
      {}
     ]
    ],
    "webdriver/tests/support/__init__.py": [
     [
      {}
     ]
@@ -298090,16 +298220,21 @@
      {}
     ]
    ],
    "webdriver/tests/support/wait.py": [
     [
      {}
     ]
    ],
+   "webdriver/tests/switch_to_parent_frame/__init__.py": [
+    [
+     {}
+    ]
+   ],
    "webgl/common.js": [
     [
      {}
     ]
    ],
    "webmessaging/MessageEvent-trusted-worker.js": [
     [
      {}
@@ -396619,16 +396754,22 @@
   },
   "wdspec": {
    "infrastructure/webdriver/tests/test_load_file.py": [
     [
      "/infrastructure/webdriver/tests/test_load_file.py",
      {}
     ]
    ],
+   "webdriver/tests/accept_alert/accept.py": [
+    [
+     "/webdriver/tests/accept_alert/accept.py",
+     {}
+    ]
+   ],
    "webdriver/tests/actions/key.py": [
     [
      "/webdriver/tests/actions/key.py",
      {}
     ]
    ],
    "webdriver/tests/actions/key_shortcuts.py": [
     [
@@ -396677,74 +396818,54 @@
    "webdriver/tests/actions/special_keys.py": [
     [
      "/webdriver/tests/actions/special_keys.py",
      {
       "timeout": "long"
      }
     ]
    ],
+   "webdriver/tests/add_cookie/add.py": [
+    [
+     "/webdriver/tests/add_cookie/add.py",
+     {}
+    ]
+   ],
    "webdriver/tests/close_window/close.py": [
     [
      "/webdriver/tests/close_window/close.py",
      {}
     ]
    ],
    "webdriver/tests/close_window/user_prompts.py": [
     [
      "/webdriver/tests/close_window/user_prompts.py",
      {
       "timeout": "long"
      }
     ]
    ],
-   "webdriver/tests/contexts/json_serialize_windowproxy.py": [
-    [
-     "/webdriver/tests/contexts/json_serialize_windowproxy.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/contexts/maximize_window.py": [
-    [
-     "/webdriver/tests/contexts/maximize_window.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/contexts/resizing_and_positioning.py": [
-    [
-     "/webdriver/tests/contexts/resizing_and_positioning.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/cookies/add_cookie.py": [
-    [
-     "/webdriver/tests/cookies/add_cookie.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/cookies/delete_cookie.py": [
-    [
-     "/webdriver/tests/cookies/delete_cookie.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/cookies/get_named_cookie.py": [
-    [
-     "/webdriver/tests/cookies/get_named_cookie.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/document_handling/page_source.py": [
-    [
-     "/webdriver/tests/document_handling/page_source.py",
-     {}
+   "webdriver/tests/delete_cookie/delete.py": [
+    [
+     "/webdriver/tests/delete_cookie/delete.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/dismiss_alert/dismiss.py": [
+    [
+     "/webdriver/tests/dismiss_alert/dismiss.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/element_clear/clear.py": [
+    [
+     "/webdriver/tests/element_clear/clear.py",
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/element_click/bubbling.py": [
     [
      "/webdriver/tests/element_click/bubbling.py",
      {}
     ]
    ],
@@ -396755,43 +396876,19 @@
     ]
    ],
    "webdriver/tests/element_click/stale.py": [
     [
      "/webdriver/tests/element_click/stale.py",
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/find_element.py": [
-    [
-     "/webdriver/tests/element_retrieval/find_element.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/element_retrieval/find_element_from_element.py": [
-    [
-     "/webdriver/tests/element_retrieval/find_element_from_element.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/element_retrieval/find_elements.py": [
-    [
-     "/webdriver/tests/element_retrieval/find_elements.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/element_retrieval/find_elements_from_element.py": [
-    [
-     "/webdriver/tests/element_retrieval/find_elements_from_element.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/element_retrieval/get_active_element.py": [
-    [
-     "/webdriver/tests/element_retrieval/get_active_element.py",
+   "webdriver/tests/element_send_keys/content_editable.py": [
+    [
+     "/webdriver/tests/element_send_keys/content_editable.py",
      {}
     ]
    ],
    "webdriver/tests/element_send_keys/form_controls.py": [
     [
      "/webdriver/tests/element_send_keys/form_controls.py",
      {}
     ]
@@ -396827,201 +396924,239 @@
     ]
    ],
    "webdriver/tests/execute_script/cyclic.py": [
     [
      "/webdriver/tests/execute_script/cyclic.py",
      {}
     ]
    ],
+   "webdriver/tests/execute_script/json_serialize_windowproxy.py": [
+    [
+     "/webdriver/tests/execute_script/json_serialize_windowproxy.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
    "webdriver/tests/execute_script/user_prompts.py": [
     [
      "/webdriver/tests/execute_script/user_prompts.py",
      {}
     ]
    ],
-   "webdriver/tests/fullscreen_window.py": [
-    [
-     "/webdriver/tests/fullscreen_window.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/get_window_rect.py": [
-    [
-     "/webdriver/tests/get_window_rect.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/interaction/element_clear.py": [
-    [
-     "/webdriver/tests/interaction/element_clear.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/interaction/send_keys_content_editable.py": [
-    [
-     "/webdriver/tests/interaction/send_keys_content_editable.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/minimize_window.py": [
-    [
-     "/webdriver/tests/minimize_window.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/navigation/current_url.py": [
-    [
-     "/webdriver/tests/navigation/current_url.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/navigation/get_title.py": [
-    [
-     "/webdriver/tests/navigation/get_title.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/sessions/get_timeouts.py": [
-    [
-     "/webdriver/tests/sessions/get_timeouts.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/create_alwaysMatch.py": [
-    [
-     "/webdriver/tests/sessions/new_session/create_alwaysMatch.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/create_firstMatch.py": [
-    [
-     "/webdriver/tests/sessions/new_session/create_firstMatch.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/default_values.py": [
-    [
-     "/webdriver/tests/sessions/new_session/default_values.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/invalid_capabilities.py": [
-    [
-     "/webdriver/tests/sessions/new_session/invalid_capabilities.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/merge.py": [
-    [
-     "/webdriver/tests/sessions/new_session/merge.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/response.py": [
-    [
-     "/webdriver/tests/sessions/new_session/response.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/status.py": [
-    [
-     "/webdriver/tests/sessions/status.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/set_window_rect.py": [
-    [
-     "/webdriver/tests/set_window_rect.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/state/get_element_attribute.py": [
-    [
-     "/webdriver/tests/state/get_element_attribute.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/state/get_element_property.py": [
-    [
-     "/webdriver/tests/state/get_element_property.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/state/get_element_tag_name.py": [
-    [
-     "/webdriver/tests/state/get_element_tag_name.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/state/is_element_selected.py": [
-    [
-     "/webdriver/tests/state/is_element_selected.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/state/text/get_text.py": [
-    [
-     "/webdriver/tests/state/text/get_text.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/switch_to_parent_frame.py": [
-    [
-     "/webdriver/tests/switch_to_parent_frame.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/user_prompts/accept_alert.py": [
-    [
-     "/webdriver/tests/user_prompts/accept_alert.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/user_prompts/dismiss_alert.py": [
-    [
-     "/webdriver/tests/user_prompts/dismiss_alert.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/user_prompts/get_alert_text.py": [
-    [
-     "/webdriver/tests/user_prompts/get_alert_text.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/user_prompts/send_alert_text.py": [
-    [
-     "/webdriver/tests/user_prompts/send_alert_text.py",
+   "webdriver/tests/find_element/find.py": [
+    [
+     "/webdriver/tests/find_element/find.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/find_element_from_element/find.py": [
+    [
+     "/webdriver/tests/find_element_from_element/find.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/find_elements/find.py": [
+    [
+     "/webdriver/tests/find_elements/find.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/find_elements_from_element/find.py": [
+    [
+     "/webdriver/tests/find_elements_from_element/find.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/fullscreen_window/fullscreen.py": [
+    [
+     "/webdriver/tests/fullscreen_window/fullscreen.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/get_active_element/get.py": [
+    [
+     "/webdriver/tests/get_active_element/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_alert_text/get.py": [
+    [
+     "/webdriver/tests/get_alert_text/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_current_url/get.py": [
+    [
+     "/webdriver/tests/get_current_url/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_element_attribute/get.py": [
+    [
+     "/webdriver/tests/get_element_attribute/get.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/get_element_property/get.py": [
+    [
+     "/webdriver/tests/get_element_property/get.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/get_element_tag_name/get.py": [
+    [
+     "/webdriver/tests/get_element_tag_name/get.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/get_element_text/get.py": [
+    [
+     "/webdriver/tests/get_element_text/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_named_cookie/get.py": [
+    [
+     "/webdriver/tests/get_named_cookie/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_timeouts/get.py": [
+    [
+     "/webdriver/tests/get_timeouts/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_title/get.py": [
+    [
+     "/webdriver/tests/get_title/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_window_rect/get.py": [
+    [
+     "/webdriver/tests/get_window_rect/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/is_element_selected/selected.py": [
+    [
+     "/webdriver/tests/is_element_selected/selected.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/maximize_window/maximize.py": [
+    [
+     "/webdriver/tests/maximize_window/maximize.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/minimize_window/minimize.py": [
+    [
+     "/webdriver/tests/minimize_window/minimize.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/create_alwaysMatch.py": [
+    [
+     "/webdriver/tests/new_session/create_alwaysMatch.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/new_session/create_firstMatch.py": [
+    [
+     "/webdriver/tests/new_session/create_firstMatch.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/new_session/default_values.py": [
+    [
+     "/webdriver/tests/new_session/default_values.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/new_session/invalid_capabilities.py": [
+    [
+     "/webdriver/tests/new_session/invalid_capabilities.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/new_session/merge.py": [
+    [
+     "/webdriver/tests/new_session/merge.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/new_session/response.py": [
+    [
+     "/webdriver/tests/new_session/response.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/page_source/source.py": [
+    [
+     "/webdriver/tests/page_source/source.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/send_alert_text/send.py": [
+    [
+     "/webdriver/tests/send_alert_text/send.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/set_window_rect/resizing_and_positioning.py": [
+    [
+     "/webdriver/tests/set_window_rect/resizing_and_positioning.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/set_window_rect/set.py": [
+    [
+     "/webdriver/tests/set_window_rect/set.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/status/status.py": [
+    [
+     "/webdriver/tests/status/status.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/switch_to_parent_frame/switch.py": [
+    [
+     "/webdriver/tests/switch_to_parent_frame/switch.py",
      {}
     ]
    ]
   }
  },
  "paths": {
   "./.codecov.yml": [
    "e2322808739a5977e90896b4755cfc20f4ab2046",
@@ -553599,17 +553734,17 @@
    "40ab5636653dfd105738ab38e7d22316132eb630",
    "testharness"
   ],
   "dom/events/event-global.worker.js": [
    "084a6f752edee6578113035fece6d0eb85a2fdf7",
    "testharness"
   ],
   "dom/events/relatedTarget.window.js": [
-   "0426d2ecae3f3562be175e4364353d979365ed1c",
+   "3dd9ddfa4d8d584f6ddf6db52e4e9020491088d8",
    "testharness"
   ],
   "dom/historical.html": [
    "291d078c4424d0491aeab7524d350eab7304f989",
    "testharness"
   ],
   "dom/interface-objects.html": [
    "05963c8b0a839f3e07b5478d99fc034e4654b515",
@@ -579719,17 +579854,17 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "html/webappapis/timers/evil-spec-example.html": [
    "49fd55dbbf64c6973a0e76284c0e3d8b7bf0ef3c",
    "testharness"
   ],
   "html/webappapis/timers/missing-timeout-setinterval.any.js": [
-   "79b4a278f0e35646cfdffeebf8f0523e2772bc9b",
+   "40ad74d6ed3719dcad2097246d74d49c87b989aa",
    "testharness"
   ],
   "html/webappapis/timers/negative-setinterval.html": [
    "405046cab9cd15a88d57eace1f293ebdd7b1b3e2",
    "testharness"
   ],
   "html/webappapis/timers/negative-settimeout.html": [
    "e5673e7cca2b006afd3e2e4e5dd3e56fb10efa4e",
@@ -610746,16 +610881,24 @@
   "webdriver/README.md": [
    "185acb69e9516e0564e16bf7d7f8dc2a4c48d3c7",
    "support"
   ],
   "webdriver/tests/__init__.py": [
    "b2ebe4b632b1a75e7334b97c3df7075f494dd5c6",
    "support"
   ],
+  "webdriver/tests/accept_alert/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/accept_alert/accept.py": [
+   "9cd5e82f18455062ec07a5c8a0bef31cfe4ea86f",
+   "wdspec"
+  ],
   "webdriver/tests/actions/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/actions/conftest.py": [
    "f366a25d9d5e35a2897413a265398bc7a54f7c44",
    "support"
   ],
@@ -610810,54 +610953,62 @@
   "webdriver/tests/actions/support/refine.py": [
    "0d244bffe67ef57be68aad99f1cbc7440ff80e27",
    "support"
   ],
   "webdriver/tests/actions/support/test_actions_wdspec.html": [
    "95203777fcc012ab64465287737a89a4ba2c31dc",
    "support"
   ],
+  "webdriver/tests/add_cookie/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/add_cookie/add.py": [
+   "29891e121def1917c47c70efd19b40ed5f2ea61d",
+   "wdspec"
+  ],
+  "webdriver/tests/close_window/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
   "webdriver/tests/close_window/close.py": [
    "4138394adbccb06712b22a2f982e8638aa03629a",
    "wdspec"
   ],
   "webdriver/tests/close_window/user_prompts.py": [
    "fc8d7f3da2bdba9bb59820a9f6ae3fb46d8153bf",
    "wdspec"
   ],
   "webdriver/tests/conftest.py": [
    "c812269d034c9ca1b8c4f136dd5d0cea52f4d0f0",
    "support"
   ],
-  "webdriver/tests/contexts/json_serialize_windowproxy.py": [
-   "d29c82c48b3bd1e2b07c40798a774eb77d6178a5",
-   "wdspec"
-  ],
-  "webdriver/tests/contexts/maximize_window.py": [
-   "e0dfeb6234371077baa7f67a45d7ffa9b61c9759",
-   "wdspec"
-  ],
-  "webdriver/tests/contexts/resizing_and_positioning.py": [
-   "479379109115668183643e8a050396219332887d",
-   "wdspec"
-  ],
-  "webdriver/tests/cookies/add_cookie.py": [
-   "29891e121def1917c47c70efd19b40ed5f2ea61d",
-   "wdspec"
-  ],
-  "webdriver/tests/cookies/delete_cookie.py": [
+  "webdriver/tests/delete_cookie/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/delete_cookie/delete.py": [
    "ce1212fea0ccb629298132fe272948307b108705",
    "wdspec"
   ],
-  "webdriver/tests/cookies/get_named_cookie.py": [
-   "a3116e826f4db0221224ccb9a0e0d71ecb1f9a85",
+  "webdriver/tests/dismiss_alert/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/dismiss_alert/dismiss.py": [
+   "f200db4350a738fc14c9aed853fd3011141e8f3a",
    "wdspec"
   ],
-  "webdriver/tests/document_handling/page_source.py": [
-   "5dddfce0a5e43f02b8a050afda8c9a07c43cf797",
+  "webdriver/tests/element_clear/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/element_clear/clear.py": [
+   "476fad0b4a5a38a9ac15ddeb1c26b0b18fd66e8c",
    "wdspec"
   ],
   "webdriver/tests/element_click/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/element_click/bubbling.py": [
    "67d9b7aeb95132759d28696cdcc60a279ccb702a",
@@ -610866,44 +611017,24 @@
   "webdriver/tests/element_click/select.py": [
    "bddc341a0feb0d06e75415b8f98b8e9e0c2a829d",
    "wdspec"
   ],
   "webdriver/tests/element_click/stale.py": [
    "37af63203540dfe11d36fe05d74694f05c6505f2",
    "wdspec"
   ],
-  "webdriver/tests/element_retrieval/__init__.py": [
-   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-   "support"
-  ],
-  "webdriver/tests/element_retrieval/find_element.py": [
-   "8c9ed3ac2169f4b65a2e172a6e77b9586d83afa2",
-   "wdspec"
-  ],
-  "webdriver/tests/element_retrieval/find_element_from_element.py": [
-   "4ac7c4f27f19fe0b6a42fe888b478b78d9c4ca7e",
-   "wdspec"
-  ],
-  "webdriver/tests/element_retrieval/find_elements.py": [
-   "fa8c2de1ffd12432bf14368b9c72000567ab8d20",
-   "wdspec"
-  ],
-  "webdriver/tests/element_retrieval/find_elements_from_element.py": [
-   "0afca7c9c332ac6bc4da4dd9607ae36b42914a14",
-   "wdspec"
-  ],
-  "webdriver/tests/element_retrieval/get_active_element.py": [
-   "7d40a7641dbf04cd78f1dba630afa2e8d80dad13",
-   "wdspec"
-  ],
   "webdriver/tests/element_send_keys/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
+  "webdriver/tests/element_send_keys/content_editable.py": [
+   "9c071e60e1203cf31120f20874b5f38ba41dacc3",
+   "wdspec"
+  ],
   "webdriver/tests/element_send_keys/form_controls.py": [
    "d169ab4ec07abb0ad3b7b2759f8156d0ab69c6db",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/interactability.py": [
    "197bf11c6cae354d9f3cc07f836a857345046e1c",
    "wdspec"
   ],
@@ -610930,126 +611061,250 @@
   "webdriver/tests/execute_script/collections.py": [
    "7162405055534f77fd7e57419b3cc2a210ddd4e0",
    "wdspec"
   ],
   "webdriver/tests/execute_script/cyclic.py": [
    "9d8a28b94b8cdac88650b675cb00bf21261444e8",
    "wdspec"
   ],
+  "webdriver/tests/execute_script/json_serialize_windowproxy.py": [
+   "d29c82c48b3bd1e2b07c40798a774eb77d6178a5",
+   "wdspec"
+  ],
   "webdriver/tests/execute_script/user_prompts.py": [
    "1cb98dd72664cfcfede1255484239f4505c06d20",
    "wdspec"
   ],
-  "webdriver/tests/fullscreen_window.py": [
+  "webdriver/tests/find_element/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/find_element/find.py": [
+   "8c9ed3ac2169f4b65a2e172a6e77b9586d83afa2",
+   "wdspec"
+  ],
+  "webdriver/tests/find_element_from_element/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/find_element_from_element/find.py": [
+   "4ac7c4f27f19fe0b6a42fe888b478b78d9c4ca7e",
+   "wdspec"
+  ],
+  "webdriver/tests/find_elements/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/find_elements/find.py": [
+   "fa8c2de1ffd12432bf14368b9c72000567ab8d20",
+   "wdspec"
+  ],
+  "webdriver/tests/find_elements_from_element/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/find_elements_from_element/find.py": [
+   "0afca7c9c332ac6bc4da4dd9607ae36b42914a14",
+   "wdspec"
+  ],
+  "webdriver/tests/fullscreen_window/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/fullscreen_window/fullscreen.py": [
    "c244064c0595d9274ddef98c527d193355ba13fa",
    "wdspec"
   ],
-  "webdriver/tests/get_window_rect.py": [
-   "c9139c16aa950c734c776887d6a762b867790812",
+  "webdriver/tests/get_active_element/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_active_element/get.py": [
+   "7d40a7641dbf04cd78f1dba630afa2e8d80dad13",
+   "wdspec"
+  ],
+  "webdriver/tests/get_alert_text/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_alert_text/get.py": [
+   "5547f710db1787eb44454988d32a4b52c758e9c2",
+   "wdspec"
+  ],
+  "webdriver/tests/get_current_url/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_current_url/get.py": [
+   "828e40301838c99aa2978733bbce3db3acc185a0",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_attribute/get.py": [
+   "1fcd451313d40a0b0a84ced63596d032ffc97f2a",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_property/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_element_property/get.py": [
+   "5e5d8e471d69dd8116e37de07abc07af09216f66",
    "wdspec"
   ],
-  "webdriver/tests/interaction/element_clear.py": [
-   "476fad0b4a5a38a9ac15ddeb1c26b0b18fd66e8c",
+  "webdriver/tests/get_element_tag_name/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_element_tag_name/get.py": [
+   "ce749e286bd030083fcac15dd75c49caf032f990",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_text/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_element_text/get.py": [
+   "570274d59020c4d8d0b8ecd604660ee7d710a165",
+   "wdspec"
+  ],
+  "webdriver/tests/get_named_cookie/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_named_cookie/get.py": [
+   "a3116e826f4db0221224ccb9a0e0d71ecb1f9a85",
    "wdspec"
   ],
-  "webdriver/tests/interaction/send_keys_content_editable.py": [
-   "9c071e60e1203cf31120f20874b5f38ba41dacc3",
+  "webdriver/tests/get_timeouts/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_timeouts/get.py": [
+   "eaee354d16aa8c3a0fc960198fa4c5d9365bdee5",
+   "wdspec"
+  ],
+  "webdriver/tests/get_title/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_title/get.py": [
+   "23adf150ec59de0748c12ad1025b0be251619bff",
+   "wdspec"
+  ],
+  "webdriver/tests/get_window_rect/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_window_rect/get.py": [
+   "c9139c16aa950c734c776887d6a762b867790812",
    "wdspec"
   ],
   "webdriver/tests/interface.html": [
    "f7b2c45ff8b1b5790dd390fbe2ab997766f5d9a8",
    "testharness"
   ],
-  "webdriver/tests/minimize_window.py": [
+  "webdriver/tests/is_element_selected/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/is_element_selected/selected.py": [
+   "f52c565da22038a41db7344cbcfa2a6a101cc61d",
+   "wdspec"
+  ],
+  "webdriver/tests/maximize_window/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/maximize_window/maximize.py": [
+   "e0dfeb6234371077baa7f67a45d7ffa9b61c9759",
+   "wdspec"
+  ],
+  "webdriver/tests/minimize_window/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/minimize_window/minimize.py": [
    "08d4414ce915f1ebe7825d5d99e204dc331fe155",
    "wdspec"
   ],
-  "webdriver/tests/navigation/current_url.py": [
-   "828e40301838c99aa2978733bbce3db3acc185a0",
-   "wdspec"
-  ],
-  "webdriver/tests/navigation/get_title.py": [
-   "23adf150ec59de0748c12ad1025b0be251619bff",
-   "wdspec"
-  ],
-  "webdriver/tests/sessions/get_timeouts.py": [
-   "eaee354d16aa8c3a0fc960198fa4c5d9365bdee5",
-   "wdspec"
-  ],
-  "webdriver/tests/sessions/new_session/conftest.py": [
+  "webdriver/tests/new_session/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/new_session/conftest.py": [
    "d2df38e506cb9a3e501f03fe03e2a31af42d6f04",
    "support"
   ],
-  "webdriver/tests/sessions/new_session/create_alwaysMatch.py": [
+  "webdriver/tests/new_session/create_alwaysMatch.py": [
    "84f8ad0908e9ec787f9db73ff66cbe193c2c9626",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/create_firstMatch.py": [
+  "webdriver/tests/new_session/create_firstMatch.py": [
    "fbdabf1852c07db0f5df2d47954c1cd5d7285492",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/default_values.py": [
+  "webdriver/tests/new_session/default_values.py": [
    "92c26366f8fd0d37587457b9b5a630df4b19cc60",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/invalid_capabilities.py": [
+  "webdriver/tests/new_session/invalid_capabilities.py": [
    "fcc36e5ca46cb8a9fb9927d5f618c7e9433a0260",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/merge.py": [
+  "webdriver/tests/new_session/merge.py": [
    "000b28631bb6d862b654f1f998852f5f1a6b2e12",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/response.py": [
+  "webdriver/tests/new_session/response.py": [
    "5eabb99858b9c3051efb351096d7ba8dca8dbfce",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/support/__init__.py": [
+  "webdriver/tests/new_session/support/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/sessions/new_session/support/create.py": [
+  "webdriver/tests/new_session/support/create.py": [
    "4bfb99fd4ba44ab5b4e70e9246cbb200c098ae89",
    "support"
   ],
-  "webdriver/tests/sessions/status.py": [
-   "75edf0e629d9cd494c63585408c76217ff953722",
+  "webdriver/tests/page_source/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/page_source/source.py": [
+   "5dddfce0a5e43f02b8a050afda8c9a07c43cf797",
    "wdspec"
   ],
-  "webdriver/tests/set_window_rect.py": [
+  "webdriver/tests/send_alert_text/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/send_alert_text/send.py": [
+   "e6878e7923b1cdddff2450057020de0bf2e6aa7c",
+   "wdspec"
+  ],
+  "webdriver/tests/set_window_rect/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/set_window_rect/resizing_and_positioning.py": [
+   "479379109115668183643e8a050396219332887d",
+   "wdspec"
+  ],
+  "webdriver/tests/set_window_rect/set.py": [
    "079038aa66cb729cf205aac040a5fe075d01fd8a",
    "wdspec"
   ],
-  "webdriver/tests/state/__init__.py": [
+  "webdriver/tests/status/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/state/get_element_attribute.py": [
-   "1fcd451313d40a0b0a84ced63596d032ffc97f2a",
-   "wdspec"
-  ],
-  "webdriver/tests/state/get_element_property.py": [
-   "5e5d8e471d69dd8116e37de07abc07af09216f66",
-   "wdspec"
-  ],
-  "webdriver/tests/state/get_element_tag_name.py": [
-   "ce749e286bd030083fcac15dd75c49caf032f990",
-   "wdspec"
-  ],
-  "webdriver/tests/state/is_element_selected.py": [
-   "f52c565da22038a41db7344cbcfa2a6a101cc61d",
-   "wdspec"
-  ],
-  "webdriver/tests/state/text/__init__.py": [
-   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-   "support"
-  ],
-  "webdriver/tests/state/text/get_text.py": [
-   "570274d59020c4d8d0b8ecd604660ee7d710a165",
+  "webdriver/tests/status/status.py": [
+   "75edf0e629d9cd494c63585408c76217ff953722",
    "wdspec"
   ],
   "webdriver/tests/support/__init__.py": [
    "5a31a3917a5157516c10951a3b3d5ffb43b992d9",
    "support"
   ],
   "webdriver/tests/support/asserts.py": [
    "1b839404daaca1d059cba98377edb91691ef7e82",
@@ -611070,36 +611325,24 @@
   "webdriver/tests/support/merge_dictionaries.py": [
    "84a6d3c6f8f4afded0f21264bbaeebec38a7f827",
    "support"
   ],
   "webdriver/tests/support/wait.py": [
    "511d4ba0ff21325b7503440b4111fac325139edc",
    "support"
   ],
-  "webdriver/tests/switch_to_parent_frame.py": [
+  "webdriver/tests/switch_to_parent_frame/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/switch_to_parent_frame/switch.py": [
    "487a0588e9c017640017b775c06c21f919d16fa9",
    "wdspec"
   ],
-  "webdriver/tests/user_prompts/accept_alert.py": [
-   "9cd5e82f18455062ec07a5c8a0bef31cfe4ea86f",
-   "wdspec"
-  ],
-  "webdriver/tests/user_prompts/dismiss_alert.py": [
-   "f200db4350a738fc14c9aed853fd3011141e8f3a",
-   "wdspec"
-  ],
-  "webdriver/tests/user_prompts/get_alert_text.py": [
-   "5547f710db1787eb44454988d32a4b52c758e9c2",
-   "wdspec"
-  ],
-  "webdriver/tests/user_prompts/send_alert_text.py": [
-   "e6878e7923b1cdddff2450057020de0bf2e6aa7c",
-   "wdspec"
-  ],
   "webgl/bufferSubData.html": [
    "526612470551a0eb157b310c587d50080087808d",
    "testharness"
   ],
   "webgl/common.js": [
    "a671260c24103c4b3d41d57251e691caa286ace4",
    "support"
   ],

rename from testing/web-platform/meta/webdriver/tests/cookies/delete_cookie.py.ini
rename to testing/web-platform/meta/webdriver/tests/delete_cookie/delete.py.ini
--- a/testing/web-platform/meta/webdriver/tests/cookies/delete_cookie.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/delete_cookie/delete.py.ini
@@ -1,4 +1,4 @@
-[delete_cookie.py]
+[delete.py]
   [test_handle_prompt_accept]
     expected: FAIL
 

new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/webdriver/tests/element_clear/clear.py.ini
@@ -0,0 +1,49 @@
+[clear.py]
+  [test_clear_content_editable_resettable_element[element0\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element1\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element2\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element3\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element4\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element5\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element6\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element7\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element8\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element9\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element10\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element11\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element12\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element13\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element14\]]
+    expected: FAIL
+
+  [test_clear_content_editable_resettable_element[element15\]]
+    expected: FAIL
+

rename from testing/web-platform/meta/webdriver/tests/contexts/json_serialize_windowproxy.py.ini
rename to testing/web-platform/meta/webdriver/tests/execute_script/json_serialize_windowproxy.py.ini

rename from testing/web-platform/meta/webdriver/tests/element_retrieval/find_element_from_element.py.ini
rename to testing/web-platform/meta/webdriver/tests/find_element_from_element/find.py.ini
--- a/testing/web-platform/meta/webdriver/tests/element_retrieval/find_element_from_element.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/find_element_from_element/find.py.ini
@@ -1,4 +1,4 @@
-[find_element_from_element.py]
+[find.py]
   [test_parent_of_document_node_errors]
     expected: FAIL
 

rename from testing/web-platform/meta/webdriver/tests/element_retrieval/find_elements_from_element.py.ini
rename to testing/web-platform/meta/webdriver/tests/find_elements_from_element/find.py.ini
--- a/testing/web-platform/meta/webdriver/tests/element_retrieval/find_elements_from_element.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/find_elements_from_element/find.py.ini
@@ -1,4 +1,4 @@
-[find_elements_from_element.py]
+[find.py]
   [test_parent_of_document_node_errors]
     expected: FAIL
 

rename from testing/web-platform/meta/webdriver/tests/fullscreen_window.py.ini
rename to testing/web-platform/meta/webdriver/tests/fullscreen_window/fullscreen.py.ini
--- a/testing/web-platform/meta/webdriver/tests/fullscreen_window.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/fullscreen_window/fullscreen.py.ini
@@ -1,4 +1,4 @@
-[fullscreen_window.py]
+[fullscreen.py]
   [test_handle_prompt_accept]
     expected: FAIL
 

rename from testing/web-platform/meta/webdriver/tests/element_retrieval/get_active_element.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_active_element/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/element_retrieval/get_active_element.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_active_element/get.py.ini
@@ -1,9 +1,9 @@
-[get_active_element.py]
+[get.py]
   disabled:
     if webrender: bug 1425588
   [test_handle_prompt_dismiss]
     expected: FAIL
 
   [test_handle_prompt_accept]
     expected: FAIL
 

rename from testing/web-platform/meta/webdriver/tests/navigation/current_url.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_current_url/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/navigation/current_url.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_current_url/get.py.ini
@@ -1,3 +1,3 @@
-[current_url.py]
+[get.py]
   disabled:
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1429391

rename from testing/web-platform/meta/webdriver/tests/state/get_element_attribute.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_element_attribute/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/state/get_element_attribute.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_element_attribute/get.py.ini
@@ -1,7 +1,7 @@
-[get_element_attribute.py]
+[get.py]
   [test_handle_prompt_dismiss]
     expected: FAIL
 
   [test_handle_prompt_accept]
     expected: FAIL
 

rename from testing/web-platform/meta/webdriver/tests/state/get_element_property.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_element_property/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/state/get_element_property.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_element_property/get.py.ini
@@ -1,7 +1,7 @@
-[get_element_property.py]
+[get.py]
   [test_handle_prompt_dismiss]
     expected: FAIL
 
   [test_handle_prompt_accept]
     expected: FAIL
 

rename from testing/web-platform/meta/webdriver/tests/state/get_element_tag_name.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_element_tag_name/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/state/get_element_tag_name.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_element_tag_name/get.py.ini
@@ -1,7 +1,7 @@
-[get_element_tag_name.py]
+[get.py]
   [test_handle_prompt_dismiss]
     expected: FAIL
 
   [test_handle_prompt_accept]
     expected: FAIL
 

rename from testing/web-platform/meta/webdriver/tests/navigation/get_title.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_title/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/navigation/get_title.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_title/get.py.ini
@@ -1,8 +1,8 @@
-[get_title.py]
+[get.py]
   disabled:
     if webrender: bug 1425588
   [test_title_handle_prompt_dismiss]
     expected: FAIL
 
   [test_title_handle_prompt_accept]
     expected: FAIL

rename from testing/web-platform/meta/webdriver/tests/get_window_rect.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_window_rect/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/get_window_rect.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_window_rect/get.py.ini
@@ -1,6 +1,6 @@
-[get_window_rect.py]
+[get.py]
   disabled:
     if not debug and stylo and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): wpt-sync Bug 1446953
   [test_handle_prompt_accept]
     expected: FAIL
 

rename from testing/web-platform/meta/webdriver/tests/state/is_element_selected.py.ini
rename to testing/web-platform/meta/webdriver/tests/is_element_selected/selected.py.ini
--- a/testing/web-platform/meta/webdriver/tests/state/is_element_selected.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/is_element_selected/selected.py.ini
@@ -1,7 +1,7 @@
-[is_element_selected.py]
+[selected.py]
   [test_handle_prompt_dismiss]
     expected: FAIL
 
   [test_handle_prompt_accept]
     expected: FAIL
 

rename from testing/web-platform/meta/webdriver/tests/contexts/maximize_window.py.ini
rename to testing/web-platform/meta/webdriver/tests/maximize_window/maximize.py.ini
--- a/testing/web-platform/meta/webdriver/tests/contexts/maximize_window.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/maximize_window/maximize.py.ini
@@ -1,3 +1,3 @@
-[maximize_window.py]
+[maximize.py]
   disabled:
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1399633

rename from testing/web-platform/meta/webdriver/tests/minimize_window.py.ini
rename to testing/web-platform/meta/webdriver/tests/minimize_window/minimize.py.ini
--- a/testing/web-platform/meta/webdriver/tests/minimize_window.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/minimize_window/minimize.py.ini
@@ -1,6 +1,6 @@
-[minimize_window.py]
+[minimize.py]
   disabled:
     if not debug and stylo and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): wpt-sync Bug 1449780
   [test_handle_prompt_accept]
     expected: FAIL
 

rename from testing/web-platform/meta/webdriver/tests/sessions/new_session/create_alwaysMatch.py.ini
rename to testing/web-platform/meta/webdriver/tests/new_session/create_alwaysMatch.py.ini

rename from testing/web-platform/meta/webdriver/tests/sessions/new_session/create_firstMatch.py.ini
rename to testing/web-platform/meta/webdriver/tests/new_session/create_firstMatch.py.ini

rename from testing/web-platform/meta/webdriver/tests/sessions/new_session/default_values.py.ini
rename to testing/web-platform/meta/webdriver/tests/new_session/default_values.py.ini

rename from testing/web-platform/meta/webdriver/tests/sessions/new_session/invalid_capabilities.py.ini
rename to testing/web-platform/meta/webdriver/tests/new_session/invalid_capabilities.py.ini

rename from testing/web-platform/meta/webdriver/tests/sessions/new_session/response.py.ini
rename to testing/web-platform/meta/webdriver/tests/new_session/response.py.ini

rename from testing/web-platform/meta/webdriver/tests/set_window_rect.py.ini
rename to testing/web-platform/meta/webdriver/tests/set_window_rect/set.py.ini
--- a/testing/web-platform/meta/webdriver/tests/set_window_rect.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/set_window_rect/set.py.ini
@@ -1,8 +1,8 @@
-[set_window_rect.py]
+[set.py]
   [test_handle_prompt_accept]
     expected: FAIL
 
   [test_restore_from_maximized]
     disabled:
       if debug and stylo and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): wpt-sync Bug 1444624
 

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/user_prompts/accept_alert.py
rename to testing/web-platform/tests/webdriver/tests/accept_alert/accept.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/cookies/add_cookie.py
rename to testing/web-platform/tests/webdriver/tests/add_cookie/add.py

new file mode 100644

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/cookies/delete_cookie.py
rename to testing/web-platform/tests/webdriver/tests/delete_cookie/delete.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/user_prompts/dismiss_alert.py
rename to testing/web-platform/tests/webdriver/tests/dismiss_alert/dismiss.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/interaction/element_clear.py
rename to testing/web-platform/tests/webdriver/tests/element_clear/clear.py

deleted file mode 100644

rename from testing/web-platform/tests/webdriver/tests/interaction/send_keys_content_editable.py
rename to testing/web-platform/tests/webdriver/tests/element_send_keys/content_editable.py

rename from testing/web-platform/tests/webdriver/tests/contexts/json_serialize_windowproxy.py
rename to testing/web-platform/tests/webdriver/tests/execute_script/json_serialize_windowproxy.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/element_retrieval/find_element.py
rename to testing/web-platform/tests/webdriver/tests/find_element/find.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/element_retrieval/find_element_from_element.py
rename to testing/web-platform/tests/webdriver/tests/find_element_from_element/find.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/element_retrieval/find_elements.py
rename to testing/web-platform/tests/webdriver/tests/find_elements/find.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/element_retrieval/find_elements_from_element.py
rename to testing/web-platform/tests/webdriver/tests/find_elements_from_element/find.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/fullscreen_window.py
rename to testing/web-platform/tests/webdriver/tests/fullscreen_window/fullscreen.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/element_retrieval/get_active_element.py
rename to testing/web-platform/tests/webdriver/tests/get_active_element/get.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/user_prompts/get_alert_text.py
rename to testing/web-platform/tests/webdriver/tests/get_alert_text/get.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/navigation/current_url.py
rename to testing/web-platform/tests/webdriver/tests/get_current_url/get.py

rename from testing/web-platform/tests/webdriver/tests/state/get_element_attribute.py
rename to testing/web-platform/tests/webdriver/tests/get_element_attribute/get.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/state/get_element_property.py
rename to testing/web-platform/tests/webdriver/tests/get_element_property/get.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/state/get_element_tag_name.py
rename to testing/web-platform/tests/webdriver/tests/get_element_tag_name/get.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/state/text/get_text.py
rename to testing/web-platform/tests/webdriver/tests/get_element_text/get.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/cookies/get_named_cookie.py
rename to testing/web-platform/tests/webdriver/tests/get_named_cookie/get.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/sessions/get_timeouts.py
rename to testing/web-platform/tests/webdriver/tests/get_timeouts/get.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/navigation/get_title.py
rename to testing/web-platform/tests/webdriver/tests/get_title/get.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/get_window_rect.py
rename to testing/web-platform/tests/webdriver/tests/get_window_rect/get.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/state/is_element_selected.py
rename to testing/web-platform/tests/webdriver/tests/is_element_selected/selected.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/contexts/maximize_window.py
rename to testing/web-platform/tests/webdriver/tests/maximize_window/maximize.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/minimize_window.py
rename to testing/web-platform/tests/webdriver/tests/minimize_window/minimize.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/conftest.py
rename to testing/web-platform/tests/webdriver/tests/new_session/conftest.py

rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/create_alwaysMatch.py
rename to testing/web-platform/tests/webdriver/tests/new_session/create_alwaysMatch.py

rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/create_firstMatch.py
rename to testing/web-platform/tests/webdriver/tests/new_session/create_firstMatch.py

rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/default_values.py
rename to testing/web-platform/tests/webdriver/tests/new_session/default_values.py

rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/invalid_capabilities.py
rename to testing/web-platform/tests/webdriver/tests/new_session/invalid_capabilities.py

rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/merge.py
rename to testing/web-platform/tests/webdriver/tests/new_session/merge.py

rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/response.py
rename to testing/web-platform/tests/webdriver/tests/new_session/response.py

rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/support/__init__.py
rename to testing/web-platform/tests/webdriver/tests/new_session/support/__init__.py

rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/support/create.py
rename to testing/web-platform/tests/webdriver/tests/new_session/support/create.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/document_handling/page_source.py
rename to testing/web-platform/tests/webdriver/tests/page_source/source.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/user_prompts/send_alert_text.py
rename to testing/web-platform/tests/webdriver/tests/send_alert_text/send.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/contexts/resizing_and_positioning.py
rename to testing/web-platform/tests/webdriver/tests/set_window_rect/resizing_and_positioning.py

rename from testing/web-platform/tests/webdriver/tests/set_window_rect.py
rename to testing/web-platform/tests/webdriver/tests/set_window_rect/set.py

deleted file mode 100644

deleted file mode 100644

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/sessions/status.py
rename to testing/web-platform/tests/webdriver/tests/status/status.py

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/switch_to_parent_frame.py
rename to testing/web-platform/tests/webdriver/tests/switch_to_parent_frame/switch.py