From bde431bb449b1d957d4e0b736111ff342f2a919d Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 7 Apr 2015 10:55:52 -0400
Subject: Tests: Rename files

Ref gh-1528
---
 tests/lib/bootstrap.js                             |   12 +-
 tests/unit/accordion/accordion_common.js           |   32 -
 tests/unit/accordion/accordion_core.js             |  207 ---
 tests/unit/accordion/accordion_events.js           |  168 ---
 tests/unit/accordion/accordion_methods.js          |  136 --
 tests/unit/accordion/accordion_options.js          |  467 ------
 tests/unit/accordion/accordion_test_helpers.js     |   35 -
 tests/unit/accordion/common.js                     |   32 +
 tests/unit/accordion/core.js                       |  207 +++
 tests/unit/accordion/events.js                     |  168 +++
 tests/unit/accordion/helper.js                     |   35 +
 tests/unit/accordion/methods.js                    |  136 ++
 tests/unit/accordion/options.js                    |  467 ++++++
 tests/unit/autocomplete/autocomplete_common.js     |   37 -
 tests/unit/autocomplete/autocomplete_core.js       |  401 ------
 tests/unit/autocomplete/autocomplete_events.js     |  185 ---
 tests/unit/autocomplete/autocomplete_methods.js    |   48 -
 tests/unit/autocomplete/autocomplete_options.js    |  317 ----
 tests/unit/autocomplete/common.js                  |   37 +
 tests/unit/autocomplete/core.js                    |  401 ++++++
 tests/unit/autocomplete/events.js                  |  185 +++
 tests/unit/autocomplete/methods.js                 |   48 +
 tests/unit/autocomplete/options.js                 |  317 ++++
 tests/unit/button/button_common.js                 |   22 -
 tests/unit/button/button_core.js                   |  230 ---
 tests/unit/button/button_events.js                 |   36 -
 tests/unit/button/button_methods.js                |   73 -
 tests/unit/button/button_options.js                |  157 --
 tests/unit/button/common.js                        |   22 +
 tests/unit/button/core.js                          |  230 +++
 tests/unit/button/events.js                        |   36 +
 tests/unit/button/methods.js                       |   73 +
 tests/unit/button/options.js                       |  157 ++
 tests/unit/datepicker/common.js                    |    7 +
 tests/unit/datepicker/core.js                      |  530 +++++++
 tests/unit/datepicker/datepicker_common.js         |    7 -
 tests/unit/datepicker/datepicker_core.js           |  530 -------
 tests/unit/datepicker/datepicker_events.js         |  154 --
 tests/unit/datepicker/datepicker_methods.js        |  126 --
 tests/unit/datepicker/datepicker_options.js        | 1127 ---------------
 tests/unit/datepicker/datepicker_test_helpers.js   |   38 -
 tests/unit/datepicker/events.js                    |  154 ++
 tests/unit/datepicker/helper.js                    |   38 +
 tests/unit/datepicker/methods.js                   |  126 ++
 tests/unit/datepicker/options.js                   | 1127 +++++++++++++++
 tests/unit/dialog/common-deprecated.js             |   54 +
 tests/unit/dialog/common.js                        |   53 +
 tests/unit/dialog/core.js                          |  308 ++++
 tests/unit/dialog/deprecated.html                  |   33 +
 tests/unit/dialog/deprecated.js                    |   30 +
 tests/unit/dialog/dialog_common.js                 |   53 -
 tests/unit/dialog/dialog_common_deprecated.js      |   54 -
 tests/unit/dialog/dialog_core.js                   |  308 ----
 tests/unit/dialog/dialog_deprecated.html           |   33 -
 tests/unit/dialog/dialog_deprecated.js             |   30 -
 tests/unit/dialog/dialog_events.js                 |  370 -----
 tests/unit/dialog/dialog_methods.js                |  267 ----
 tests/unit/dialog/dialog_options.js                |  557 -------
 tests/unit/dialog/dialog_test_helpers.js           |   55 -
 tests/unit/dialog/events.js                        |  370 +++++
 tests/unit/dialog/helper.js                        |   55 +
 tests/unit/dialog/methods.js                       |  267 ++++
 tests/unit/dialog/options.js                       |  557 +++++++
 tests/unit/draggable/common.js                     |   48 +
 tests/unit/draggable/core.js                       |  346 +++++
 tests/unit/draggable/draggable_common.js           |   48 -
 tests/unit/draggable/draggable_core.js             |  346 -----
 tests/unit/draggable/draggable_events.js           |  164 ---
 tests/unit/draggable/draggable_methods.js          |  104 --
 tests/unit/draggable/draggable_options.js          | 1493 -------------------
 tests/unit/draggable/draggable_test_helpers.js     |  158 --
 tests/unit/draggable/events.js                     |  164 +++
 tests/unit/draggable/helper.js                     |  158 ++
 tests/unit/draggable/methods.js                    |  104 ++
 tests/unit/draggable/options.js                    | 1493 +++++++++++++++++++
 tests/unit/droppable/common-deprecated.js          |   28 +
 tests/unit/droppable/common.js                     |   26 +
 tests/unit/droppable/core.js                       |   29 +
 tests/unit/droppable/deprecated.html               |   22 +
 tests/unit/droppable/deprecated.js                 |    1 +
 tests/unit/droppable/droppable_common.js           |   26 -
 .../unit/droppable/droppable_common_deprecated.js  |   28 -
 tests/unit/droppable/droppable_core.js             |   29 -
 tests/unit/droppable/droppable_deprecated.html     |   22 -
 tests/unit/droppable/droppable_deprecated.js       |    1 -
 tests/unit/droppable/droppable_events.js           |   64 -
 tests/unit/droppable/droppable_methods.js          |   92 --
 tests/unit/droppable/droppable_options.js          |  205 ---
 tests/unit/droppable/droppable_test_helpers.js     |   18 -
 tests/unit/droppable/events.js                     |   64 +
 tests/unit/droppable/helper.js                     |   18 +
 tests/unit/droppable/methods.js                    |   92 ++
 tests/unit/droppable/options.js                    |  205 +++
 tests/unit/effects/core.js                         |  341 +++++
 tests/unit/effects/effects.html                    |    2 +-
 tests/unit/effects/effects_core.js                 |  341 -----
 tests/unit/effects/effects_scale.js                |   72 -
 tests/unit/effects/scale.js                        |   72 +
 tests/unit/menu/common.js                          |   29 +
 tests/unit/menu/core.js                            |   76 +
 tests/unit/menu/events.js                          |  737 ++++++++++
 tests/unit/menu/helper.js                          |   36 +
 tests/unit/menu/menu_common.js                     |   29 -
 tests/unit/menu/menu_core.js                       |   76 -
 tests/unit/menu/menu_events.js                     |  737 ----------
 tests/unit/menu/menu_methods.js                    |  116 --
 tests/unit/menu/menu_options.js                    |  125 --
 tests/unit/menu/menu_test_helpers.js               |   36 -
 tests/unit/menu/methods.js                         |  116 ++
 tests/unit/menu/options.js                         |  125 ++
 tests/unit/position/core.js                        |  770 ++++++++++
 tests/unit/position/position.html                  |    2 +-
 tests/unit/position/position_core.js               |  770 ----------
 tests/unit/progressbar/common.js                   |   24 +
 tests/unit/progressbar/core.js                     |   64 +
 tests/unit/progressbar/events.js                   |   58 +
 tests/unit/progressbar/methods.js                  |   42 +
 tests/unit/progressbar/options.js                  |   79 +
 tests/unit/progressbar/progressbar_common.js       |   24 -
 tests/unit/progressbar/progressbar_core.js         |   64 -
 tests/unit/progressbar/progressbar_events.js       |   58 -
 tests/unit/progressbar/progressbar_methods.js      |   42 -
 tests/unit/progressbar/progressbar_options.js      |   79 -
 tests/unit/resizable/common.js                     |   40 +
 tests/unit/resizable/core.js                       |  244 ++++
 tests/unit/resizable/events.js                     |  242 ++++
 tests/unit/resizable/helper.js                     |   18 +
 tests/unit/resizable/methods.js                    |   21 +
 tests/unit/resizable/options.js                    |  466 ++++++
 tests/unit/resizable/resizable_common.js           |   40 -
 tests/unit/resizable/resizable_core.js             |  244 ----
 tests/unit/resizable/resizable_events.js           |  242 ----
 tests/unit/resizable/resizable_methods.js          |   21 -
 tests/unit/resizable/resizable_options.js          |  466 ------
 tests/unit/resizable/resizable_test_helpers.js     |   18 -
 tests/unit/selectable/common.js                    |   29 +
 tests/unit/selectable/core.js                      |    3 +
 tests/unit/selectable/events.js                    |   63 +
 tests/unit/selectable/methods.js                   |  111 ++
 tests/unit/selectable/options.js                   |   64 +
 tests/unit/selectable/selectable_common.js         |   29 -
 tests/unit/selectable/selectable_core.js           |    3 -
 tests/unit/selectable/selectable_events.js         |   63 -
 tests/unit/selectable/selectable_methods.js        |  111 --
 tests/unit/selectable/selectable_options.js        |   64 -
 tests/unit/selectmenu/common.js                    |   34 +
 tests/unit/selectmenu/core.js                      |  332 +++++
 tests/unit/selectmenu/events.js                    |  136 ++
 tests/unit/selectmenu/methods.js                   |  189 +++
 tests/unit/selectmenu/options.js                   |  128 ++
 tests/unit/selectmenu/selectmenu_common.js         |   34 -
 tests/unit/selectmenu/selectmenu_core.js           |  332 -----
 tests/unit/selectmenu/selectmenu_events.js         |  136 --
 tests/unit/selectmenu/selectmenu_methods.js        |  189 ---
 tests/unit/selectmenu/selectmenu_options.js        |  128 --
 tests/unit/slider/common.js                        |   35 +
 tests/unit/slider/core.js                          |  309 ++++
 tests/unit/slider/events.js                        |  208 +++
 tests/unit/slider/methods.js                       |  116 ++
 tests/unit/slider/options.js                       |  349 +++++
 tests/unit/slider/slider_common.js                 |   35 -
 tests/unit/slider/slider_core.js                   |  309 ----
 tests/unit/slider/slider_events.js                 |  208 ---
 tests/unit/slider/slider_methods.js                |  116 --
 tests/unit/slider/slider_options.js                |  349 -----
 tests/unit/sortable/common.js                      |   53 +
 tests/unit/sortable/core.js                        |   42 +
 tests/unit/sortable/events.js                      |  378 +++++
 tests/unit/sortable/helper.js                      |   16 +
 tests/unit/sortable/methods.js                     |  129 ++
 tests/unit/sortable/options.js                     |  496 +++++++
 tests/unit/sortable/sortable_common.js             |   53 -
 tests/unit/sortable/sortable_core.js               |   42 -
 tests/unit/sortable/sortable_events.js             |  378 -----
 tests/unit/sortable/sortable_methods.js            |  129 --
 tests/unit/sortable/sortable_options.js            |  496 -------
 tests/unit/sortable/sortable_test_helpers.js       |   16 -
 tests/unit/spinner/common.js                       |   35 +
 tests/unit/spinner/core.js                         |  257 ++++
 tests/unit/spinner/events.js                       |  263 ++++
 tests/unit/spinner/helper.js                       |   14 +
 tests/unit/spinner/methods.js                      |  211 +++
 tests/unit/spinner/options.js                      |  271 ++++
 tests/unit/spinner/spinner_common.js               |   35 -
 tests/unit/spinner/spinner_core.js                 |  257 ----
 tests/unit/spinner/spinner_events.js               |  263 ----
 tests/unit/spinner/spinner_methods.js              |  211 ---
 tests/unit/spinner/spinner_options.js              |  271 ----
 tests/unit/spinner/spinner_test_helpers.js         |   14 -
 tests/unit/tabs/common.js                          |   31 +
 tests/unit/tabs/core.js                            |  667 +++++++++
 tests/unit/tabs/events.js                          |  322 +++++
 tests/unit/tabs/helper.js                          |   74 +
 tests/unit/tabs/methods.js                         |  290 ++++
 tests/unit/tabs/options.js                         |  374 +++++
 tests/unit/tabs/tabs_common.js                     |   31 -
 tests/unit/tabs/tabs_core.js                       |  667 ---------
 tests/unit/tabs/tabs_events.js                     |  322 -----
 tests/unit/tabs/tabs_methods.js                    |  290 ----
 tests/unit/tabs/tabs_options.js                    |  374 -----
 tests/unit/tabs/tabs_test_helpers.js               |   74 -
 tests/unit/tooltip/common-deprecated.js            |   31 +
 tests/unit/tooltip/common.js                       |   30 +
 tests/unit/tooltip/core.js                         |  224 +++
 tests/unit/tooltip/deprecated.html                 |   29 +
 tests/unit/tooltip/deprecated.js                   |   16 +
 tests/unit/tooltip/events.js                       |   60 +
 tests/unit/tooltip/methods.js                      |  139 ++
 tests/unit/tooltip/options.js                      |  215 +++
 tests/unit/tooltip/tooltip_common.js               |   30 -
 tests/unit/tooltip/tooltip_common_deprecated.js    |   31 -
 tests/unit/tooltip/tooltip_core.js                 |  224 ---
 tests/unit/tooltip/tooltip_deprecated.html         |   29 -
 tests/unit/tooltip/tooltip_deprecated.js           |   16 -
 tests/unit/tooltip/tooltip_events.js               |   60 -
 tests/unit/tooltip/tooltip_methods.js              |  139 --
 tests/unit/tooltip/tooltip_options.js              |  215 ---
 tests/unit/widget/animation.js                     |  263 ++++
 tests/unit/widget/classes.js                       |  146 ++
 tests/unit/widget/core.js                          | 1514 ++++++++++++++++++++
 tests/unit/widget/extend.js                        |  112 ++
 tests/unit/widget/widget.html                      |    8 +-
 tests/unit/widget/widget_animation.js              |  263 ----
 tests/unit/widget/widget_classes.js                |  146 --
 tests/unit/widget/widget_core.js                   | 1514 --------------------
 tests/unit/widget/widget_extend.js                 |  112 --
 226 files changed, 21475 insertions(+), 21481 deletions(-)
 delete mode 100644 tests/unit/accordion/accordion_common.js
 delete mode 100644 tests/unit/accordion/accordion_core.js
 delete mode 100644 tests/unit/accordion/accordion_events.js
 delete mode 100644 tests/unit/accordion/accordion_methods.js
 delete mode 100644 tests/unit/accordion/accordion_options.js
 delete mode 100644 tests/unit/accordion/accordion_test_helpers.js
 create mode 100644 tests/unit/accordion/common.js
 create mode 100644 tests/unit/accordion/core.js
 create mode 100644 tests/unit/accordion/events.js
 create mode 100644 tests/unit/accordion/helper.js
 create mode 100644 tests/unit/accordion/methods.js
 create mode 100644 tests/unit/accordion/options.js
 delete mode 100644 tests/unit/autocomplete/autocomplete_common.js
 delete mode 100644 tests/unit/autocomplete/autocomplete_core.js
 delete mode 100644 tests/unit/autocomplete/autocomplete_events.js
 delete mode 100644 tests/unit/autocomplete/autocomplete_methods.js
 delete mode 100644 tests/unit/autocomplete/autocomplete_options.js
 create mode 100644 tests/unit/autocomplete/common.js
 create mode 100644 tests/unit/autocomplete/core.js
 create mode 100644 tests/unit/autocomplete/events.js
 create mode 100644 tests/unit/autocomplete/methods.js
 create mode 100644 tests/unit/autocomplete/options.js
 delete mode 100644 tests/unit/button/button_common.js
 delete mode 100644 tests/unit/button/button_core.js
 delete mode 100644 tests/unit/button/button_events.js
 delete mode 100644 tests/unit/button/button_methods.js
 delete mode 100644 tests/unit/button/button_options.js
 create mode 100644 tests/unit/button/common.js
 create mode 100644 tests/unit/button/core.js
 create mode 100644 tests/unit/button/events.js
 create mode 100644 tests/unit/button/methods.js
 create mode 100644 tests/unit/button/options.js
 create mode 100644 tests/unit/datepicker/common.js
 create mode 100644 tests/unit/datepicker/core.js
 delete mode 100644 tests/unit/datepicker/datepicker_common.js
 delete mode 100644 tests/unit/datepicker/datepicker_core.js
 delete mode 100644 tests/unit/datepicker/datepicker_events.js
 delete mode 100644 tests/unit/datepicker/datepicker_methods.js
 delete mode 100644 tests/unit/datepicker/datepicker_options.js
 delete mode 100644 tests/unit/datepicker/datepicker_test_helpers.js
 create mode 100644 tests/unit/datepicker/events.js
 create mode 100644 tests/unit/datepicker/helper.js
 create mode 100644 tests/unit/datepicker/methods.js
 create mode 100644 tests/unit/datepicker/options.js
 create mode 100644 tests/unit/dialog/common-deprecated.js
 create mode 100644 tests/unit/dialog/common.js
 create mode 100644 tests/unit/dialog/core.js
 create mode 100644 tests/unit/dialog/deprecated.html
 create mode 100644 tests/unit/dialog/deprecated.js
 delete mode 100644 tests/unit/dialog/dialog_common.js
 delete mode 100644 tests/unit/dialog/dialog_common_deprecated.js
 delete mode 100644 tests/unit/dialog/dialog_core.js
 delete mode 100644 tests/unit/dialog/dialog_deprecated.html
 delete mode 100644 tests/unit/dialog/dialog_deprecated.js
 delete mode 100644 tests/unit/dialog/dialog_events.js
 delete mode 100644 tests/unit/dialog/dialog_methods.js
 delete mode 100644 tests/unit/dialog/dialog_options.js
 delete mode 100644 tests/unit/dialog/dialog_test_helpers.js
 create mode 100644 tests/unit/dialog/events.js
 create mode 100644 tests/unit/dialog/helper.js
 create mode 100644 tests/unit/dialog/methods.js
 create mode 100644 tests/unit/dialog/options.js
 create mode 100644 tests/unit/draggable/common.js
 create mode 100644 tests/unit/draggable/core.js
 delete mode 100644 tests/unit/draggable/draggable_common.js
 delete mode 100644 tests/unit/draggable/draggable_core.js
 delete mode 100644 tests/unit/draggable/draggable_events.js
 delete mode 100644 tests/unit/draggable/draggable_methods.js
 delete mode 100644 tests/unit/draggable/draggable_options.js
 delete mode 100644 tests/unit/draggable/draggable_test_helpers.js
 create mode 100644 tests/unit/draggable/events.js
 create mode 100644 tests/unit/draggable/helper.js
 create mode 100644 tests/unit/draggable/methods.js
 create mode 100644 tests/unit/draggable/options.js
 create mode 100644 tests/unit/droppable/common-deprecated.js
 create mode 100644 tests/unit/droppable/common.js
 create mode 100644 tests/unit/droppable/core.js
 create mode 100644 tests/unit/droppable/deprecated.html
 create mode 100644 tests/unit/droppable/deprecated.js
 delete mode 100644 tests/unit/droppable/droppable_common.js
 delete mode 100644 tests/unit/droppable/droppable_common_deprecated.js
 delete mode 100644 tests/unit/droppable/droppable_core.js
 delete mode 100644 tests/unit/droppable/droppable_deprecated.html
 delete mode 100644 tests/unit/droppable/droppable_deprecated.js
 delete mode 100644 tests/unit/droppable/droppable_events.js
 delete mode 100644 tests/unit/droppable/droppable_methods.js
 delete mode 100644 tests/unit/droppable/droppable_options.js
 delete mode 100644 tests/unit/droppable/droppable_test_helpers.js
 create mode 100644 tests/unit/droppable/events.js
 create mode 100644 tests/unit/droppable/helper.js
 create mode 100644 tests/unit/droppable/methods.js
 create mode 100644 tests/unit/droppable/options.js
 create mode 100644 tests/unit/effects/core.js
 delete mode 100644 tests/unit/effects/effects_core.js
 delete mode 100644 tests/unit/effects/effects_scale.js
 create mode 100644 tests/unit/effects/scale.js
 create mode 100644 tests/unit/menu/common.js
 create mode 100644 tests/unit/menu/core.js
 create mode 100644 tests/unit/menu/events.js
 create mode 100644 tests/unit/menu/helper.js
 delete mode 100644 tests/unit/menu/menu_common.js
 delete mode 100644 tests/unit/menu/menu_core.js
 delete mode 100644 tests/unit/menu/menu_events.js
 delete mode 100644 tests/unit/menu/menu_methods.js
 delete mode 100644 tests/unit/menu/menu_options.js
 delete mode 100644 tests/unit/menu/menu_test_helpers.js
 create mode 100644 tests/unit/menu/methods.js
 create mode 100644 tests/unit/menu/options.js
 create mode 100644 tests/unit/position/core.js
 delete mode 100644 tests/unit/position/position_core.js
 create mode 100644 tests/unit/progressbar/common.js
 create mode 100644 tests/unit/progressbar/core.js
 create mode 100644 tests/unit/progressbar/events.js
 create mode 100644 tests/unit/progressbar/methods.js
 create mode 100644 tests/unit/progressbar/options.js
 delete mode 100644 tests/unit/progressbar/progressbar_common.js
 delete mode 100644 tests/unit/progressbar/progressbar_core.js
 delete mode 100644 tests/unit/progressbar/progressbar_events.js
 delete mode 100644 tests/unit/progressbar/progressbar_methods.js
 delete mode 100644 tests/unit/progressbar/progressbar_options.js
 create mode 100644 tests/unit/resizable/common.js
 create mode 100644 tests/unit/resizable/core.js
 create mode 100644 tests/unit/resizable/events.js
 create mode 100644 tests/unit/resizable/helper.js
 create mode 100644 tests/unit/resizable/methods.js
 create mode 100644 tests/unit/resizable/options.js
 delete mode 100644 tests/unit/resizable/resizable_common.js
 delete mode 100644 tests/unit/resizable/resizable_core.js
 delete mode 100644 tests/unit/resizable/resizable_events.js
 delete mode 100644 tests/unit/resizable/resizable_methods.js
 delete mode 100644 tests/unit/resizable/resizable_options.js
 delete mode 100644 tests/unit/resizable/resizable_test_helpers.js
 create mode 100644 tests/unit/selectable/common.js
 create mode 100644 tests/unit/selectable/core.js
 create mode 100644 tests/unit/selectable/events.js
 create mode 100644 tests/unit/selectable/methods.js
 create mode 100644 tests/unit/selectable/options.js
 delete mode 100644 tests/unit/selectable/selectable_common.js
 delete mode 100644 tests/unit/selectable/selectable_core.js
 delete mode 100644 tests/unit/selectable/selectable_events.js
 delete mode 100644 tests/unit/selectable/selectable_methods.js
 delete mode 100644 tests/unit/selectable/selectable_options.js
 create mode 100644 tests/unit/selectmenu/common.js
 create mode 100644 tests/unit/selectmenu/core.js
 create mode 100644 tests/unit/selectmenu/events.js
 create mode 100644 tests/unit/selectmenu/methods.js
 create mode 100644 tests/unit/selectmenu/options.js
 delete mode 100644 tests/unit/selectmenu/selectmenu_common.js
 delete mode 100644 tests/unit/selectmenu/selectmenu_core.js
 delete mode 100644 tests/unit/selectmenu/selectmenu_events.js
 delete mode 100644 tests/unit/selectmenu/selectmenu_methods.js
 delete mode 100644 tests/unit/selectmenu/selectmenu_options.js
 create mode 100644 tests/unit/slider/common.js
 create mode 100644 tests/unit/slider/core.js
 create mode 100644 tests/unit/slider/events.js
 create mode 100644 tests/unit/slider/methods.js
 create mode 100644 tests/unit/slider/options.js
 delete mode 100644 tests/unit/slider/slider_common.js
 delete mode 100644 tests/unit/slider/slider_core.js
 delete mode 100644 tests/unit/slider/slider_events.js
 delete mode 100644 tests/unit/slider/slider_methods.js
 delete mode 100644 tests/unit/slider/slider_options.js
 create mode 100644 tests/unit/sortable/common.js
 create mode 100644 tests/unit/sortable/core.js
 create mode 100644 tests/unit/sortable/events.js
 create mode 100644 tests/unit/sortable/helper.js
 create mode 100644 tests/unit/sortable/methods.js
 create mode 100644 tests/unit/sortable/options.js
 delete mode 100644 tests/unit/sortable/sortable_common.js
 delete mode 100644 tests/unit/sortable/sortable_core.js
 delete mode 100644 tests/unit/sortable/sortable_events.js
 delete mode 100644 tests/unit/sortable/sortable_methods.js
 delete mode 100644 tests/unit/sortable/sortable_options.js
 delete mode 100644 tests/unit/sortable/sortable_test_helpers.js
 create mode 100644 tests/unit/spinner/common.js
 create mode 100644 tests/unit/spinner/core.js
 create mode 100644 tests/unit/spinner/events.js
 create mode 100644 tests/unit/spinner/helper.js
 create mode 100644 tests/unit/spinner/methods.js
 create mode 100644 tests/unit/spinner/options.js
 delete mode 100644 tests/unit/spinner/spinner_common.js
 delete mode 100644 tests/unit/spinner/spinner_core.js
 delete mode 100644 tests/unit/spinner/spinner_events.js
 delete mode 100644 tests/unit/spinner/spinner_methods.js
 delete mode 100644 tests/unit/spinner/spinner_options.js
 delete mode 100644 tests/unit/spinner/spinner_test_helpers.js
 create mode 100644 tests/unit/tabs/common.js
 create mode 100644 tests/unit/tabs/core.js
 create mode 100644 tests/unit/tabs/events.js
 create mode 100644 tests/unit/tabs/helper.js
 create mode 100644 tests/unit/tabs/methods.js
 create mode 100644 tests/unit/tabs/options.js
 delete mode 100644 tests/unit/tabs/tabs_common.js
 delete mode 100644 tests/unit/tabs/tabs_core.js
 delete mode 100644 tests/unit/tabs/tabs_events.js
 delete mode 100644 tests/unit/tabs/tabs_methods.js
 delete mode 100644 tests/unit/tabs/tabs_options.js
 delete mode 100644 tests/unit/tabs/tabs_test_helpers.js
 create mode 100644 tests/unit/tooltip/common-deprecated.js
 create mode 100644 tests/unit/tooltip/common.js
 create mode 100644 tests/unit/tooltip/core.js
 create mode 100644 tests/unit/tooltip/deprecated.html
 create mode 100644 tests/unit/tooltip/deprecated.js
 create mode 100644 tests/unit/tooltip/events.js
 create mode 100644 tests/unit/tooltip/methods.js
 create mode 100644 tests/unit/tooltip/options.js
 delete mode 100644 tests/unit/tooltip/tooltip_common.js
 delete mode 100644 tests/unit/tooltip/tooltip_common_deprecated.js
 delete mode 100644 tests/unit/tooltip/tooltip_core.js
 delete mode 100644 tests/unit/tooltip/tooltip_deprecated.html
 delete mode 100644 tests/unit/tooltip/tooltip_deprecated.js
 delete mode 100644 tests/unit/tooltip/tooltip_events.js
 delete mode 100644 tests/unit/tooltip/tooltip_methods.js
 delete mode 100644 tests/unit/tooltip/tooltip_options.js
 create mode 100644 tests/unit/widget/animation.js
 create mode 100644 tests/unit/widget/classes.js
 create mode 100644 tests/unit/widget/core.js
 create mode 100644 tests/unit/widget/extend.js
 delete mode 100644 tests/unit/widget/widget_animation.js
 delete mode 100644 tests/unit/widget/widget_classes.js
 delete mode 100644 tests/unit/widget/widget_core.js
 delete mode 100644 tests/unit/widget/widget_extend.js

(limited to 'tests')

diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js
index b9598c6df..6d608f2eb 100644
--- a/tests/lib/bootstrap.js
+++ b/tests/lib/bootstrap.js
@@ -123,14 +123,14 @@ function swarmInject() {
 
 	if ( widget ) {
 		modules = modules.concat([
-			widget + ( deprecated ? "_common_deprecated" : "_common" ),
-			widget + "_core",
-			widget + "_events",
-			widget + "_methods",
-			widget + "_options"
+			( deprecated ? "common-deprecated" : "common" ),
+			"core",
+			"events",
+			"methods",
+			"options"
 		]);
 		if ( deprecated ) {
-			modules = modules.concat( widget + "_deprecated" );
+			modules = modules.concat( "deprecated" );
 		}
 	}
 
diff --git a/tests/unit/accordion/accordion_common.js b/tests/unit/accordion/accordion_common.js
deleted file mode 100644
index 8a859f0ca..000000000
--- a/tests/unit/accordion/accordion_common.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define( [
-	"lib/common",
-	"ui/accordion"
-], function( common ) {
-
-common.testWidget( "accordion", {
-	defaults: {
-		active: 0,
-		animate: {},
-		classes: {
-			"ui-accordion-header": "ui-corner-top",
-			"ui-accordion-header-collapsed": "ui-corner-all",
-			"ui-accordion-content": "ui-corner-bottom"
-		},
-		collapsible: false,
-		disabled: false,
-		event: "click",
-		header: "> li > :first-child, > :not(li):even",
-		heightStyle: "auto",
-		icons: {
-			"activeHeader": "ui-icon-triangle-1-s",
-			"header": "ui-icon-triangle-1-e"
-		},
-
-		// callbacks
-		activate: null,
-		beforeActivate: null,
-		create: null
-	}
-});
-
-} );
diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js
deleted file mode 100644
index bd3b56752..000000000
--- a/tests/unit/accordion/accordion_core.js
+++ /dev/null
@@ -1,207 +0,0 @@
-define( [
-	"jquery",
-	"./accordion_test_helpers",
-	"ui/accordion"
-], function( $, testHelper ) {
-
-var setupTeardown = testHelper.setupTeardown,
-	state = testHelper.state;
-
-module( "accordion: core", setupTeardown() );
-
-$.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( type, selector ) {
-	test( "markup structure: " + type, function( assert ) {
-		expect( 10 );
-		var element = $( selector ).accordion(),
-			headers = element.find( ".ui-accordion-header" ),
-			content = headers.next();
-
-		assert.hasClasses( element, "ui-accordion ui-widget" );
-		equal( headers.length, 3, ".ui-accordion-header elements exist, correct number" );
-		assert.hasClasses( headers[ 0 ],
-			"ui-accordion-header ui-accordion-header-active ui-accordion-icons" );
-		assert.hasClasses( headers[ 1 ],
-			"ui-accordion-header ui-accordion-header-collapsed ui-accordion-icons" );
-		assert.hasClasses( headers[ 2 ],
-			"ui-accordion-header ui-accordion-header-collapsed ui-accordion-icons" );
-		equal( content.length, 3, ".ui-accordion-content elements exist, correct number" );
-		assert.hasClasses( content[ 0 ],
-			"ui-accordion-content ui-widget-content ui-accordion-content-active" );
-		assert.hasClasses( content[ 1 ], "ui-accordion-content ui-widget-content" );
-		assert.hasClasses( content[ 2 ], "ui-accordion-content ui-widget-content" );
-		deepEqual( element.find( ".ui-accordion-header" ).next().get(),
-			element.find( ".ui-accordion-content" ).get(),
-			"content panels come immediately after headers" );
-	});
-});
-
-test( "handle click on header-descendant", function() {
-	expect( 1 );
-	var element = $( "#navigation" ).accordion();
-	$( "#navigation h2:eq(1) a" ).click();
-	state( element, 0, 1, 0 );
-});
-
-test( "accessibility", function () {
-	expect( 61 );
-	var element = $( "#list1" ).accordion({
-			active: 1,
-			collapsible: true
-		}),
-		headers = element.find( ".ui-accordion-header" );
-
-	equal( element.attr( "role" ), "tablist", "element role" );
-	headers.each(function( i ) {
-		var header = headers.eq( i ),
-			panel = header.next();
-		equal( header.attr( "role" ), "tab", "header " + i + " role" );
-		equal( header.attr( "aria-controls" ), panel.attr( "id" ), "header " + i + " aria-controls" );
-		equal( panel.attr( "role" ), "tabpanel", "panel " + i + " role" );
-		equal( panel.attr( "aria-labelledby" ), header.attr( "id" ), "panel " + i + " aria-labelledby" );
-	});
-
-	equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
-	equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" );
-	equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" );
-	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" );
-	equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" );
-	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
-	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
-	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
-	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
-	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
-	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
-
-	element.accordion( "option", "active", 0 );
-	equal( headers.eq( 0 ).attr( "tabindex" ), 0, "active header (0) has tabindex=0" );
-	equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab (0) has aria-selected=true" );
-	equal( headers.eq( 0 ).attr( "aria-expanded" ), "true", "active tab (0) has aria-expanded=true" );
-	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "false", "active tabpanel (0) has aria-hidden=false" );
-	equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" );
-	equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" );
-	equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" );
-	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" );
-	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
-	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
-	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
-
-	element.accordion( "option", "active", false );
-	equal( headers.eq( 0 ).attr( "tabindex" ), 0, "previously active header (0) has tabindex=0" );
-	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
-	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
-	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
-	equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" );
-	equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" );
-	equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" );
-	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" );
-	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
-	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
-	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
-
-	element.accordion( "option", "active", 1 );
-	equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
-	equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" );
-	equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" );
-	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" );
-	equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" );
-	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
-	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
-	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
-	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
-	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
-	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
-
-});
-
-asyncTest( "keyboard support", function( assert ) {
-	expect( 13 );
-	var element = $( "#list1" ).accordion(),
-		headers = element.find( ".ui-accordion-header" ),
-		anchor = headers.eq( 1 ).next().find( "a" ).eq( 0 ),
-		keyCode = $.ui.keyCode;
-	equal( headers.filter( ".ui-state-focus" ).length, 0, "no headers focused on init" );
-	headers.eq( 0 ).simulate( "focus" );
-	setTimeout( step1 );
-
-	function step1() {
-		assert.hasClasses( headers.eq( 0 ), "ui-state-focus", "first header has focus" );
-		headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
-		setTimeout( step2 );
-	}
-
-	// Support: IE 11 with jQuery 1.7 - 1.8 only
-	// All of the setTimeouts() from keydowns aren't necessary with newer jQuery.
-	// Only the explicit focus simulations require them.
-	function step2() {
-		assert.hasClasses( headers.eq( 1 ), "ui-state-focus", "DOWN moves focus to next header" );
-		headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.RIGHT } );
-		setTimeout( step3 );
-	}
-
-	function step3() {
-		assert.hasClasses( headers.eq( 2 ), "ui-state-focus", "RIGHT moves focus to next header" );
-		headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
-		setTimeout( step4 );
-	}
-
-	function step4() {
-		assert.hasClasses( headers.eq( 0 ), "ui-state-focus", "DOWN wraps focus to first header" );
-		headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.UP } );
-		setTimeout( step5 );
-	}
-
-	function step5() {
-		assert.hasClasses( headers.eq( 2 ), "ui-state-focus", "UP wraps focus to last header" );
-		headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.LEFT } );
-		setTimeout( step6 );
-	}
-
-	function step6() {
-		assert.hasClasses( headers.eq( 1 ),
-			"ui-state-focus", "LEFT moves focus to previous header" );
-		headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.HOME } );
-		setTimeout( step7 );
-	}
-
-	function step7() {
-		assert.hasClasses( headers.eq( 0 ), "ui-state-focus", "HOME moves focus to first header" );
-		headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.END } );
-		setTimeout( step8 );
-	}
-
-	function step8() {
-		assert.hasClasses( headers.eq( 2 ), "ui-state-focus", "END moves focus to last header" );
-		headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.ENTER } );
-		setTimeout( step9 );
-	}
-
-	function step9() {
-		equal( element.accordion( "option", "active" ) , 2, "ENTER activates panel" );
-		headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
-		setTimeout( step10 );
-	}
-
-	function step10() {
-		equal( element.accordion( "option", "active" ), 1, "SPACE activates panel" );
-		anchor.simulate( "focus" );
-		setTimeout( step11 );
-	}
-
-	function step11() {
-		assert.lacksClasses( headers.eq( 1 ), "ui-state-focus",
-			"header loses focus when focusing inside the panel" );
-		anchor.simulate( "keydown", { keyCode: keyCode.UP, ctrlKey: true } );
-		setTimeout( step12 );
-	}
-
-	function step12() {
-		assert.hasClasses( headers.eq( 1 ), "ui-state-focus", "CTRL+UP moves focus to header" );
-		start();
-	}
-});
-
-} );
diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
deleted file mode 100644
index ac05df30d..000000000
--- a/tests/unit/accordion/accordion_events.js
+++ /dev/null
@@ -1,168 +0,0 @@
-define( [
-	"jquery",
-	"./accordion_test_helpers",
-	"ui/accordion"
-], function( $, testHelper ) {
-
-var setupTeardown = testHelper.setupTeardown,
-	state = testHelper.state;
-
-module( "accordion: events", setupTeardown() );
-
-test( "create", function() {
-	expect( 10 );
-
-	var element = $( "#list1" ),
-		headers = element.children( "h3" ),
-		contents = headers.next();
-
-	element.accordion({
-		create: function( event, ui ) {
-			equal( ui.header.length, 1, "header length" );
-			strictEqual( ui.header[ 0 ], headers[ 0 ], "header" );
-			equal( ui.panel.length, 1, "panel length" );
-			strictEqual( ui.panel[ 0 ], contents[ 0 ], "panel" );
-		}
-	});
-	element.accordion( "destroy" );
-
-	element.accordion({
-		active: 2,
-		create: function( event, ui ) {
-			equal( ui.header.length, 1, "header length" );
-			strictEqual( ui.header[ 0 ], headers[ 2 ], "header" );
-			equal( ui.panel.length, 1, "panel length" );
-			strictEqual( ui.panel[ 0 ], contents[ 2 ], "panel" );
-		}
-	});
-	element.accordion( "destroy" );
-
-	element.accordion({
-		active: false,
-		collapsible: true,
-		create: function( event, ui ) {
-			equal( ui.header.length, 0, "header length" );
-			equal( ui.panel.length, 0, "panel length" );
-		}
-	});
-	element.accordion( "destroy" );
-});
-
-test( "beforeActivate", function() {
-	expect( 38 );
-	var element = $( "#list1" ).accordion({
-			active: false,
-			collapsible: true
-		}),
-		headers = element.find( ".ui-accordion-header" ),
-		content = element.find( ".ui-accordion-content" );
-
-	element.one( "accordionbeforeactivate", function( event, ui ) {
-		ok( !( "originalEvent" in event ) );
-		equal( ui.oldHeader.length, 0 );
-		equal( ui.oldPanel.length, 0 );
-		equal( ui.newHeader.length, 1 );
-		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equal( ui.newPanel.length, 1 );
-		strictEqual( ui.newPanel[ 0 ], content[ 0 ] );
-		state( element, 0, 0, 0 );
-	});
-	element.accordion( "option", "active", 0 );
-	state( element, 1, 0, 0 );
-
-	element.one( "accordionbeforeactivate", function( event, ui ) {
-		equal( event.originalEvent.type, "click" );
-		equal( ui.oldHeader.length, 1 );
-		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equal( ui.oldPanel.length, 1 );
-		strictEqual( ui.oldPanel[ 0 ], content[ 0 ] );
-		equal( ui.newHeader.length, 1 );
-		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equal( ui.newPanel.length, 1 );
-		strictEqual( ui.newPanel[ 0 ], content[ 1 ] );
-		state( element, 1, 0, 0 );
-	});
-	headers.eq( 1 ).click();
-	state( element, 0, 1, 0 );
-
-	element.one( "accordionbeforeactivate", function( event, ui ) {
-		ok( !( "originalEvent" in event ) );
-		equal( ui.oldHeader.length, 1 );
-		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equal( ui.oldPanel.length, 1 );
-		strictEqual( ui.oldPanel[ 0 ], content[ 1 ] );
-		equal( ui.newHeader.length, 0 );
-		equal( ui.newPanel.length, 0 );
-		state( element, 0, 1, 0 );
-	});
-	element.accordion( "option", "active", false );
-	state( element, 0, 0, 0 );
-
-	element.one( "accordionbeforeactivate", function( event, ui ) {
-		ok( !( "originalEvent" in event ) );
-		equal( ui.oldHeader.length, 0 );
-		equal( ui.oldPanel.length, 0 );
-		equal( ui.newHeader.length, 1 );
-		strictEqual( ui.newHeader[ 0 ], headers[ 2 ] );
-		equal( ui.newPanel.length, 1 );
-		strictEqual( ui.newPanel[ 0 ], content[ 2 ] );
-		event.preventDefault();
-		state( element, 0, 0, 0 );
-	});
-	element.accordion( "option", "active", 2 );
-	state( element, 0, 0, 0 );
-});
-
-test( "activate", function() {
-	expect( 21 );
-	var element = $( "#list1" ).accordion({
-			active: false,
-			collapsible: true
-		}),
-		headers = element.find( ".ui-accordion-header" ),
-		content = element.find( ".ui-accordion-content" );
-
-	element.one( "accordionactivate", function( event, ui ) {
-		equal( ui.oldHeader.length, 0 );
-		equal( ui.oldPanel.length, 0 );
-		equal( ui.newHeader.length, 1 );
-		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equal( ui.newPanel.length, 1 );
-		strictEqual( ui.newPanel[ 0 ], content[ 0 ] );
-	});
-	element.accordion( "option", "active", 0 );
-
-	element.one( "accordionactivate", function( event, ui ) {
-		equal( ui.oldHeader.length, 1 );
-		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equal( ui.oldPanel.length, 1 );
-		strictEqual( ui.oldPanel[ 0 ], content[ 0 ] );
-		equal( ui.newHeader.length, 1 );
-		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equal( ui.newPanel.length, 1 );
-		strictEqual( ui.newPanel[ 0 ], content[ 1 ] );
-	});
-	headers.eq( 1 ).click();
-
-	element.one( "accordionactivate", function( event, ui ) {
-		equal( ui.oldHeader.length, 1 );
-		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equal( ui.oldPanel.length, 1 );
-		strictEqual( ui.oldPanel[ 0 ], content[ 1 ] );
-		equal( ui.newHeader.length, 0 );
-		equal( ui.newPanel.length, 0 );
-	});
-	element.accordion( "option", "active", false );
-
-	// prevent activation
-	element.one( "accordionbeforeactivate", function( event ) {
-		ok( true );
-		event.preventDefault();
-	});
-	element.one( "accordionactivate", function() {
-		ok( false );
-	});
-	element.accordion( "option", "active", 1 );
-});
-
-} );
diff --git a/tests/unit/accordion/accordion_methods.js b/tests/unit/accordion/accordion_methods.js
deleted file mode 100644
index f33996c36..000000000
--- a/tests/unit/accordion/accordion_methods.js
+++ /dev/null
@@ -1,136 +0,0 @@
-define( [
-	"jquery",
-	"./accordion_test_helpers",
-	"ui/accordion"
-], function( $, testHelper ) {
-
-var equalHeight = testHelper.equalHeight,
-	setupTeardown = testHelper.setupTeardown,
-	state = testHelper.state;
-
-module( "accordion: methods", setupTeardown() );
-
-test( "destroy", function( assert ) {
-	expect( 1 );
-	assert.domEqual( "#list1", function() {
-		$( "#list1" ).accordion().accordion( "destroy" );
-	});
-});
-
-test( "enable/disable", function( assert ) {
-	expect( 7 );
-	var element = $( "#list1" ).accordion();
-	state( element, 1, 0, 0 );
-	element.accordion( "disable" );
-
-	assert.hasClasses( element, "ui-state-disabled" );
-
-	equal( element.attr( "aria-disabled" ), "true", "element gets aria-disabled" );
-	assert.hasClasses( element, "ui-accordion-disabled" );
-
-	// event does nothing
-	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" );
-	state( element, 1, 0, 0 );
-	// option still works
-	element.accordion( "option", "active", 1 );
-	state( element, 0, 1, 0 );
-	element.accordion( "enable" );
-	element.accordion( "option", "active", 2 );
-	state( element, 0, 0, 1 );
-});
-
-test( "refresh", function() {
-	expect( 19 );
-	var element = $( "#navigation" )
-		.parent()
-			.height( 300 )
-		.end()
-		.accordion({
-			heightStyle: "fill"
-		});
-	equalHeight( element, 255 );
-
-	element.parent().height( 500 );
-	element.accordion( "refresh" );
-	equalHeight( element, 455 );
-
-	element = $( "#list1" );
-	element.accordion();
-	state( element, 1, 0, 0 );
-
-	// disable panel via markup
-	element.find( "h3.bar" ).eq( 1 ).addClass( "ui-state-disabled" );
-	element.accordion( "refresh" );
-	state( element, 1, 0, 0 );
-
-	// don't add multiple icons
-	element.accordion( "refresh" );
-	equal( element.find( ".ui-accordion-header-icon" ).length, 3 );
-
-	// add a panel
-	element
-		.append("<h3 class='bar' id='new_1'>new 1</h3>")
-		.append("<div class='foo' id='new_1_panel'>new 1</div>");
-	element.accordion( "refresh" );
-	state( element, 1, 0, 0, 0 );
-
-	// remove all tabs
-	element.find( "h3.bar, div.foo" ).remove();
-	element.accordion( "refresh" );
-	state( element );
-	equal( element.accordion( "option", "active" ), false, "no active accordion panel" );
-
-	// add panels
-	element
-		.append("<h3 class='bar' id='new_2'>new 2</h3>")
-		.append("<div class='foo' id='new_2_panel'>new 2</div>")
-		.append("<h3 class='bar' id='new_3'>new 3</h3>")
-		.append("<div class='foo' id='new_3_panel'>new 3</div>")
-		.append("<h3 class='bar' id='new_4'>new 4</h3>")
-		.append("<div class='foo' id='new_4_panel'>new 4</div>")
-		.append("<h3 class='bar' id='new_5'>new 5</h3>")
-		.append("<div class='foo' id='new_5_panel'>new 5</div>");
-	element.accordion( "refresh" );
-	state( element, 1, 0, 0, 0 );
-
-	// activate third tab
-	element.accordion( "option", "active", 2 );
-	state( element, 0, 0, 1, 0 );
-
-	// remove fourth panel, third panel should stay active
-	element.find( "h3.bar" ).eq( 3 ).remove();
-	element.find( "div.foo" ).eq( 3 ).remove();
-	element.accordion( "refresh" );
-	state( element, 0, 0, 1 );
-
-	// remove third (active) panel, second panel should become active
-	element.find( "h3.bar" ).eq( 2 ).remove();
-	element.find( "div.foo" ).eq( 2 ).remove();
-	element.accordion( "refresh" );
-	state( element, 0, 1 );
-
-	// remove first panel, previously active panel (now first) should stay active
-	element.find( "h3.bar" ).eq( 0 ).remove();
-	element.find( "div.foo" ).eq( 0 ).remove();
-	element.accordion( "refresh" );
-	state( element, 1 );
-
-	// collapse all panels
-	element.accordion( "option", {
-		collapsible: true,
-		active: false
-	});
-	state( element, 0 );
-	element.accordion( "refresh" );
-	state( element, 0 );
-});
-
-test( "widget", function() {
-	expect( 2 );
-	var element = $( "#list1" ).accordion(),
-		widgetElement = element.accordion( "widget" );
-	equal( widgetElement.length, 1, "one element" );
-	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
-});
-
-} );
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
deleted file mode 100644
index d33241dac..000000000
--- a/tests/unit/accordion/accordion_options.js
+++ /dev/null
@@ -1,467 +0,0 @@
-define( [
-	"jquery",
-	"./accordion_test_helpers",
-	"ui/accordion"
-], function( $, testHelper ) {
-
-var equalHeight = testHelper.equalHeight,
-	setupTeardown = testHelper.setupTeardown,
-	state = testHelper.state;
-
-module( "accordion: options", setupTeardown() );
-
-test( "{ active: default }", function() {
-	expect( 2 );
-	var element = $( "#list1" ).accordion();
-	equal( element.accordion( "option", "active" ), 0 );
-	state( element, 1, 0, 0 );
-});
-
-test( "{ active: null }", function() {
-	expect( 2 );
-	var element = $( "#list1" ).accordion({
-		active: null
-	});
-	equal( element.accordion( "option", "active" ), 0 );
-	state( element, 1, 0, 0 );
-});
-
-test( "{ active: false }", function() {
-	expect( 7 );
-	var element = $( "#list1" ).accordion({
-		active: false,
-		collapsible: true
-	});
-	state( element, 0, 0, 0 );
-	equal( element.find( ".ui-accordion-header.ui-state-active" ).length, 0, "no headers selected" );
-	equal( element.accordion( "option", "active" ), false );
-
-	element.accordion( "option", "collapsible", false );
-	state( element, 1, 0, 0 );
-	equal( element.accordion( "option", "active" ), 0 );
-
-	element.accordion( "destroy" );
-	element.accordion({
-		active: false
-	});
-	state( element, 1, 0, 0 );
-	strictEqual( element.accordion( "option", "active" ), 0 );
-});
-
-test( "{ active: Number }", function() {
-	expect( 8 );
-	var element = $( "#list1" ).accordion({
-		active: 2
-	});
-	equal( element.accordion( "option", "active" ), 2 );
-	state( element, 0, 0, 1 );
-
-	element.accordion( "option", "active", 0 );
-	equal( element.accordion( "option", "active" ), 0 );
-	state( element, 1, 0, 0 );
-
-	element.find( ".ui-accordion-header" ).eq( 1 ).click();
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.accordion( "option", "active", 10 );
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-});
-
-test( "{ active: -Number }", function() {
-	expect( 8 );
-	var element = $( "#list1" ).accordion({
-		active: -1
-	});
-	equal( element.accordion( "option", "active" ), 2 );
-	state( element, 0, 0, 1 );
-
-	element.accordion( "option", "active", -2 );
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.accordion( "option", "active", -10 );
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.accordion( "option", "active", -3 );
-	equal( element.accordion( "option", "active" ), 0 );
-	state( element, 1, 0, 0 );
-});
-
-test( "{ animate: false }", function() {
-	expect( 3 );
-	var element = $( "#list1" ).accordion({
-			animate: false
-		}),
-		panels = element.find( ".ui-accordion-content" ),
-		animate = $.fn.animate;
-	$.fn.animate = function() {
-		ok( false, ".animate() called" );
-	};
-
-	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
-	element.accordion( "option", "active", 1 );
-	ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
-	ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
-	$.fn.animate = animate;
-});
-
-asyncTest( "{ animate: Number }", function() {
-	expect( 7 );
-	var element = $( "#list1" ).accordion({
-			animate: 100
-		}),
-		panels = element.find( ".ui-accordion-content" ),
-		animate = $.fn.animate;
-	// called twice (both panels)
-	$.fn.animate = function( props, options ) {
-		equal( options.duration, 100, "correct duration" );
-		equal( options.easing, undefined, "default easing" );
-		animate.apply( this, arguments );
-	};
-
-	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
-	element.accordion( "option", "active", 1 );
-	panels.promise().done(function() {
-		ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
-		ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
-		$.fn.animate = animate;
-		start();
-	});
-});
-
-asyncTest( "{ animate: String }", function() {
-	expect( 7 );
-	var element = $( "#list1" ).accordion({
-			animate: "linear"
-		}),
-		panels = element.find( ".ui-accordion-content" ),
-		animate = $.fn.animate;
-	// called twice (both panels)
-	$.fn.animate = function( props, options ) {
-		equal( options.duration, undefined, "default duration" );
-		equal( options.easing, "linear", "correct easing" );
-		animate.apply( this, arguments );
-	};
-
-	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
-	element.accordion( "option", "active", 1 );
-	panels.promise().done(function() {
-		ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
-		ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
-		$.fn.animate = animate;
-		start();
-	});
-});
-
-asyncTest( "{ animate: {} }", function() {
-	expect( 7 );
-	var element = $( "#list1" ).accordion({
-			animate: {}
-		}),
-		panels = element.find( ".ui-accordion-content" ),
-		animate = $.fn.animate;
-	// called twice (both panels)
-	$.fn.animate = function( props, options ) {
-		equal( options.duration, undefined, "default duration" );
-		equal( options.easing, undefined, "default easing" );
-		animate.apply( this, arguments );
-	};
-
-	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
-	element.accordion( "option", "active", 1 );
-	panels.promise().done(function() {
-		ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
-		ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
-		$.fn.animate = animate;
-		start();
-	});
-});
-
-asyncTest( "{ animate: { duration, easing } }", function() {
-	expect( 7 );
-	var element = $( "#list1" ).accordion({
-			animate: { duration: 100, easing: "linear" }
-		}),
-		panels = element.find( ".ui-accordion-content" ),
-		animate = $.fn.animate;
-	// called twice (both panels)
-	$.fn.animate = function( props, options ) {
-		equal( options.duration, 100, "correct duration" );
-		equal( options.easing, "linear", "correct easing" );
-		animate.apply( this, arguments );
-	};
-
-	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
-	element.accordion( "option", "active", 1 );
-	panels.promise().done(function() {
-		ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
-		ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
-		$.fn.animate = animate;
-		start();
-	});
-});
-
-asyncTest( "{ animate: { duration, easing } }, animate down", function() {
-	expect( 7 );
-	var element = $( "#list1" ).accordion({
-			active: 1,
-			animate: { duration: 100, easing: "linear" }
-		}),
-		panels = element.find( ".ui-accordion-content" ),
-		animate = $.fn.animate;
-	// called twice (both panels)
-	$.fn.animate = function( props, options ) {
-		equal( options.duration, 100, "correct duration" );
-		equal( options.easing, "linear", "correct easing" );
-		animate.apply( this, arguments );
-	};
-
-	ok( panels.eq( 1 ).is( ":visible" ), "first panel visible" );
-	element.accordion( "option", "active", 0 );
-	panels.promise().done(function() {
-		ok( panels.eq( 1 ).is( ":hidden" ), "first panel hidden" );
-		ok( panels.eq( 0 ).is( ":visible" ), "second panel visible" );
-		$.fn.animate = animate;
-		start();
-	});
-});
-
-asyncTest( "{ animate: { duration, easing, down } }, animate down", function() {
-	expect( 7 );
-	var element = $( "#list1" ).accordion({
-			active: 1,
-			animate: {
-				duration: 100,
-				easing: "linear",
-				down: {
-					easing: "swing"
-				}
-			}
-		}),
-		panels = element.find( ".ui-accordion-content" ),
-		animate = $.fn.animate;
-	// called twice (both panels)
-	$.fn.animate = function( props, options ) {
-		equal( options.duration, 100, "correct duration" );
-		equal( options.easing, "swing", "correct easing" );
-		animate.apply( this, arguments );
-	};
-
-	ok( panels.eq( 1 ).is( ":visible" ), "first panel visible" );
-	element.accordion( "option", "active", 0 );
-	panels.promise().done(function() {
-		ok( panels.eq( 1 ).is( ":hidden" ), "first panel hidden" );
-		ok( panels.eq( 0 ).is( ":visible" ), "second panel visible" );
-		$.fn.animate = animate;
-		start();
-	});
-});
-
-test( "{ collapsible: false }", function() {
-	expect( 4 );
-	var element = $( "#list1" ).accordion({
-		active: 1
-	});
-	element.accordion( "option", "active", false );
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.find( ".ui-accordion-header" ).eq( 1 ).click();
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-});
-
-test( "{ collapsible: true }", function() {
-	expect( 6 );
-	var element = $( "#list1" ).accordion({
-		active: 1,
-		collapsible: true
-	});
-
-	element.accordion( "option", "active", false );
-	equal( element.accordion( "option", "active" ), false );
-	state( element, 0, 0, 0 );
-
-	element.accordion( "option", "active", 1 );
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.find( ".ui-accordion-header" ).eq( 1 ).click();
-	equal( element.accordion( "option", "active" ), false );
-	state( element, 0, 0, 0 );
-});
-
-test( "{ event: null }", function() {
-	expect( 5 );
-	var element = $( "#list1" ).accordion({
-		event: null
-	});
-	state( element, 1, 0, 0 );
-
-	element.accordion( "option", "active", 1 );
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	// ensure default click handler isn't bound
-	element.find( ".ui-accordion-header" ).eq( 2 ).click();
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-});
-
-test( "{ event: custom }", function() {
-	expect( 11 );
-	var element = $( "#list1" ).accordion({
-		event: "custom1 custom2"
-	});
-	state( element, 1, 0, 0 );
-
-	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom1" );
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	// ensure default click handler isn't bound
-	element.find( ".ui-accordion-header" ).eq( 2 ).trigger( "click" );
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.find( ".ui-accordion-header" ).eq( 2 ).trigger( "custom2" );
-	equal( element.accordion( "option", "active" ), 2 );
-	state( element, 0, 0, 1 );
-
-	element.accordion( "option", "event", "custom3" );
-
-	// ensure old event handlers are unbound
-	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom1" );
-	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom2" );
-	equal( element.accordion( "option", "active" ), 2 );
-	state( element, 0, 0, 1 );
-
-	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom3" );
-	equal( element.accordion( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-});
-
-test( "{ header: default }", function() {
-	expect( 2 );
-	// default: > li > :first-child,> :not(li):even
-	// > :not(li):even
-	state( $( "#list1" ).accordion(), 1, 0, 0);
-	// > li > :first-child
-	state( $( "#navigation" ).accordion(), 1, 0, 0);
-});
-
-test( "{ header: custom }", function( assert ) {
-	expect( 6 );
-	var element = $( "#navigationWrapper" ).accordion({
-		header: "h2"
-	});
-	element.find( "h2" ).each(function() {
-		assert.hasClasses( this, "ui-accordion-header" );
-	});
-	equal( element.find( ".ui-accordion-header" ).length, 3 );
-	state( element, 1, 0, 0 );
-	element.accordion( "option", "active", 2 );
-	state( element, 0, 0, 1 );
-});
-
-test( "{ heightStyle: 'auto' }", function() {
-	expect( 3 );
-	var element = $( "#navigation" ).accordion({ heightStyle: "auto" });
-	equalHeight( element, 105 );
-});
-
-test( "{ heightStyle: 'content' }", function() {
-	expect( 3 );
-	var element = $( "#navigation" ).accordion({ heightStyle: "content" }),
-		sizes = element.find( ".ui-accordion-content" ).map(function() {
-			return $( this ).height();
-		}).get();
-	equal( sizes[ 0 ], 75 );
-	equal( sizes[ 1 ], 105 );
-	equal( sizes[ 2 ], 45 );
-});
-
-test( "{ heightStyle: 'fill' }", function() {
-	expect( 3 );
-	$( "#navigationWrapper" ).height( 500 );
-	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
-	equalHeight( element, 455 );
-});
-
-test( "{ heightStyle: 'fill' } with sibling", function() {
-	expect( 3 );
-	$( "#navigationWrapper" ).height( 500 );
-	$( "<p>Lorem Ipsum</p>" )
-		.css({
-			height: 50,
-			marginTop: 20,
-			marginBottom: 30
-		})
-		.prependTo( "#navigationWrapper" );
-	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
-	equalHeight( element , 355 );
-});
-
-test( "{ heightStyle: 'fill' } with multiple siblings", function() {
-	expect( 3 );
-	$( "#navigationWrapper" ).height( 500 );
-	$( "<p>Lorem Ipsum</p>" )
-		.css({
-			height: 50,
-			marginTop: 20,
-			marginBottom: 30
-		})
-		.prependTo( "#navigationWrapper" );
-	$( "<p>Lorem Ipsum</p>" )
-		.css({
-			height: 50,
-			marginTop: 20,
-			marginBottom: 30,
-			position: "absolute"
-		})
-		.prependTo( "#navigationWrapper" );
-	$( "<p>Lorem Ipsum</p>" )
-		.css({
-			height: 25,
-			marginTop: 10,
-			marginBottom: 15
-		})
-		.prependTo( "#navigationWrapper" );
-	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
-	equalHeight( element, 305 );
-});
-
-test( "{ icons: false }", function() {
-	expect( 8 );
-	var element = $( "#list1" );
-	function icons( on ) {
-		deepEqual( element.find( "span.ui-icon").length, on ? 3 : 0 );
-		deepEqual( element.find( ".ui-accordion-header.ui-accordion-icons" ).length, on ? 3 : 0 );
-	}
-	element.accordion();
-	icons( true );
-	element.accordion( "destroy" ).accordion({
-		icons: false
-	});
-	icons( false );
-	element.accordion( "option", "icons", { header: "foo", activeHeader: "bar" } );
-	icons( true );
-	element.accordion( "option", "icons", false );
-	icons( false );
-});
-
-test( "{ icons: hash }", function( assert ) {
-	expect( 3 );
-	var element = $( "#list1" ).accordion({
-		icons: { activeHeader: "a1", header: "h1" }
-	});
-	assert.hasClasses( element.find( ".ui-accordion-header.ui-state-active span.ui-icon" ), "a1" );
-	element.accordion( "option", "icons", { activeHeader: "a2", header: "h2" } );
-	assert.lacksClasses( element.find( ".ui-accordion-header.ui-state-active span.ui-icon" ), "a1");
-	assert.hasClasses( element.find( ".ui-accordion-header.ui-state-active span.ui-icon" ), "a2" );
-});
-
-} );
diff --git a/tests/unit/accordion/accordion_test_helpers.js b/tests/unit/accordion/accordion_test_helpers.js
deleted file mode 100644
index 5eb3a4bc3..000000000
--- a/tests/unit/accordion/accordion_test_helpers.js
+++ /dev/null
@@ -1,35 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper",
-	"ui/accordion"
-], function( $, helper ) {
-
-return $.extend( helper, {
-	equalHeight: function( accordion, height ) {
-		accordion.find( ".ui-accordion-content" ).each(function() {
-			equal( $( this ).outerHeight(), height );
-		});
-	},
-
-	setupTeardown: function() {
-		var animate = $.ui.accordion.prototype.options.animate;
-		return {
-			setup: function() {
-				$.ui.accordion.prototype.options.animate = false;
-			},
-			teardown: function() {
-				$.ui.accordion.prototype.options.animate = animate;
-			}
-		};
-	},
-
-	state: function( accordion ) {
-		var expected = $.makeArray( arguments ).slice( 1 ),
-			actual = accordion.find( ".ui-accordion-content" ).map(function() {
-				return $( this ).css( "display" ) === "none" ? 0 : 1;
-			}).get();
-		QUnit.push( QUnit.equiv(actual, expected), actual, expected );
-	}
-} );
-
-} );
diff --git a/tests/unit/accordion/common.js b/tests/unit/accordion/common.js
new file mode 100644
index 000000000..8a859f0ca
--- /dev/null
+++ b/tests/unit/accordion/common.js
@@ -0,0 +1,32 @@
+define( [
+	"lib/common",
+	"ui/accordion"
+], function( common ) {
+
+common.testWidget( "accordion", {
+	defaults: {
+		active: 0,
+		animate: {},
+		classes: {
+			"ui-accordion-header": "ui-corner-top",
+			"ui-accordion-header-collapsed": "ui-corner-all",
+			"ui-accordion-content": "ui-corner-bottom"
+		},
+		collapsible: false,
+		disabled: false,
+		event: "click",
+		header: "> li > :first-child, > :not(li):even",
+		heightStyle: "auto",
+		icons: {
+			"activeHeader": "ui-icon-triangle-1-s",
+			"header": "ui-icon-triangle-1-e"
+		},
+
+		// callbacks
+		activate: null,
+		beforeActivate: null,
+		create: null
+	}
+});
+
+} );
diff --git a/tests/unit/accordion/core.js b/tests/unit/accordion/core.js
new file mode 100644
index 000000000..b1d45f77e
--- /dev/null
+++ b/tests/unit/accordion/core.js
@@ -0,0 +1,207 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/accordion"
+], function( $, testHelper ) {
+
+var setupTeardown = testHelper.setupTeardown,
+	state = testHelper.state;
+
+module( "accordion: core", setupTeardown() );
+
+$.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( type, selector ) {
+	test( "markup structure: " + type, function( assert ) {
+		expect( 10 );
+		var element = $( selector ).accordion(),
+			headers = element.find( ".ui-accordion-header" ),
+			content = headers.next();
+
+		assert.hasClasses( element, "ui-accordion ui-widget" );
+		equal( headers.length, 3, ".ui-accordion-header elements exist, correct number" );
+		assert.hasClasses( headers[ 0 ],
+			"ui-accordion-header ui-accordion-header-active ui-accordion-icons" );
+		assert.hasClasses( headers[ 1 ],
+			"ui-accordion-header ui-accordion-header-collapsed ui-accordion-icons" );
+		assert.hasClasses( headers[ 2 ],
+			"ui-accordion-header ui-accordion-header-collapsed ui-accordion-icons" );
+		equal( content.length, 3, ".ui-accordion-content elements exist, correct number" );
+		assert.hasClasses( content[ 0 ],
+			"ui-accordion-content ui-widget-content ui-accordion-content-active" );
+		assert.hasClasses( content[ 1 ], "ui-accordion-content ui-widget-content" );
+		assert.hasClasses( content[ 2 ], "ui-accordion-content ui-widget-content" );
+		deepEqual( element.find( ".ui-accordion-header" ).next().get(),
+			element.find( ".ui-accordion-content" ).get(),
+			"content panels come immediately after headers" );
+	});
+});
+
+test( "handle click on header-descendant", function() {
+	expect( 1 );
+	var element = $( "#navigation" ).accordion();
+	$( "#navigation h2:eq(1) a" ).click();
+	state( element, 0, 1, 0 );
+});
+
+test( "accessibility", function () {
+	expect( 61 );
+	var element = $( "#list1" ).accordion({
+			active: 1,
+			collapsible: true
+		}),
+		headers = element.find( ".ui-accordion-header" );
+
+	equal( element.attr( "role" ), "tablist", "element role" );
+	headers.each(function( i ) {
+		var header = headers.eq( i ),
+			panel = header.next();
+		equal( header.attr( "role" ), "tab", "header " + i + " role" );
+		equal( header.attr( "aria-controls" ), panel.attr( "id" ), "header " + i + " aria-controls" );
+		equal( panel.attr( "role" ), "tabpanel", "panel " + i + " role" );
+		equal( panel.attr( "aria-labelledby" ), header.attr( "id" ), "panel " + i + " aria-labelledby" );
+	});
+
+	equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
+	equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" );
+	equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" );
+	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" );
+	equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" );
+	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
+	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
+	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
+	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
+	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
+	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
+	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
+
+	element.accordion( "option", "active", 0 );
+	equal( headers.eq( 0 ).attr( "tabindex" ), 0, "active header (0) has tabindex=0" );
+	equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab (0) has aria-selected=true" );
+	equal( headers.eq( 0 ).attr( "aria-expanded" ), "true", "active tab (0) has aria-expanded=true" );
+	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "false", "active tabpanel (0) has aria-hidden=false" );
+	equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" );
+	equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" );
+	equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" );
+	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" );
+	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
+	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
+	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
+	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
+
+	element.accordion( "option", "active", false );
+	equal( headers.eq( 0 ).attr( "tabindex" ), 0, "previously active header (0) has tabindex=0" );
+	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
+	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
+	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
+	equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" );
+	equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" );
+	equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" );
+	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" );
+	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
+	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
+	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
+	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
+
+	element.accordion( "option", "active", 1 );
+	equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
+	equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" );
+	equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" );
+	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" );
+	equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" );
+	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
+	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
+	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
+	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
+	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
+	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
+	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
+
+});
+
+asyncTest( "keyboard support", function( assert ) {
+	expect( 13 );
+	var element = $( "#list1" ).accordion(),
+		headers = element.find( ".ui-accordion-header" ),
+		anchor = headers.eq( 1 ).next().find( "a" ).eq( 0 ),
+		keyCode = $.ui.keyCode;
+	equal( headers.filter( ".ui-state-focus" ).length, 0, "no headers focused on init" );
+	headers.eq( 0 ).simulate( "focus" );
+	setTimeout( step1 );
+
+	function step1() {
+		assert.hasClasses( headers.eq( 0 ), "ui-state-focus", "first header has focus" );
+		headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
+		setTimeout( step2 );
+	}
+
+	// Support: IE 11 with jQuery 1.7 - 1.8 only
+	// All of the setTimeouts() from keydowns aren't necessary with newer jQuery.
+	// Only the explicit focus simulations require them.
+	function step2() {
+		assert.hasClasses( headers.eq( 1 ), "ui-state-focus", "DOWN moves focus to next header" );
+		headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.RIGHT } );
+		setTimeout( step3 );
+	}
+
+	function step3() {
+		assert.hasClasses( headers.eq( 2 ), "ui-state-focus", "RIGHT moves focus to next header" );
+		headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
+		setTimeout( step4 );
+	}
+
+	function step4() {
+		assert.hasClasses( headers.eq( 0 ), "ui-state-focus", "DOWN wraps focus to first header" );
+		headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.UP } );
+		setTimeout( step5 );
+	}
+
+	function step5() {
+		assert.hasClasses( headers.eq( 2 ), "ui-state-focus", "UP wraps focus to last header" );
+		headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.LEFT } );
+		setTimeout( step6 );
+	}
+
+	function step6() {
+		assert.hasClasses( headers.eq( 1 ),
+			"ui-state-focus", "LEFT moves focus to previous header" );
+		headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.HOME } );
+		setTimeout( step7 );
+	}
+
+	function step7() {
+		assert.hasClasses( headers.eq( 0 ), "ui-state-focus", "HOME moves focus to first header" );
+		headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.END } );
+		setTimeout( step8 );
+	}
+
+	function step8() {
+		assert.hasClasses( headers.eq( 2 ), "ui-state-focus", "END moves focus to last header" );
+		headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.ENTER } );
+		setTimeout( step9 );
+	}
+
+	function step9() {
+		equal( element.accordion( "option", "active" ) , 2, "ENTER activates panel" );
+		headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
+		setTimeout( step10 );
+	}
+
+	function step10() {
+		equal( element.accordion( "option", "active" ), 1, "SPACE activates panel" );
+		anchor.simulate( "focus" );
+		setTimeout( step11 );
+	}
+
+	function step11() {
+		assert.lacksClasses( headers.eq( 1 ), "ui-state-focus",
+			"header loses focus when focusing inside the panel" );
+		anchor.simulate( "keydown", { keyCode: keyCode.UP, ctrlKey: true } );
+		setTimeout( step12 );
+	}
+
+	function step12() {
+		assert.hasClasses( headers.eq( 1 ), "ui-state-focus", "CTRL+UP moves focus to header" );
+		start();
+	}
+});
+
+} );
diff --git a/tests/unit/accordion/events.js b/tests/unit/accordion/events.js
new file mode 100644
index 000000000..7f7390c83
--- /dev/null
+++ b/tests/unit/accordion/events.js
@@ -0,0 +1,168 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/accordion"
+], function( $, testHelper ) {
+
+var setupTeardown = testHelper.setupTeardown,
+	state = testHelper.state;
+
+module( "accordion: events", setupTeardown() );
+
+test( "create", function() {
+	expect( 10 );
+
+	var element = $( "#list1" ),
+		headers = element.children( "h3" ),
+		contents = headers.next();
+
+	element.accordion({
+		create: function( event, ui ) {
+			equal( ui.header.length, 1, "header length" );
+			strictEqual( ui.header[ 0 ], headers[ 0 ], "header" );
+			equal( ui.panel.length, 1, "panel length" );
+			strictEqual( ui.panel[ 0 ], contents[ 0 ], "panel" );
+		}
+	});
+	element.accordion( "destroy" );
+
+	element.accordion({
+		active: 2,
+		create: function( event, ui ) {
+			equal( ui.header.length, 1, "header length" );
+			strictEqual( ui.header[ 0 ], headers[ 2 ], "header" );
+			equal( ui.panel.length, 1, "panel length" );
+			strictEqual( ui.panel[ 0 ], contents[ 2 ], "panel" );
+		}
+	});
+	element.accordion( "destroy" );
+
+	element.accordion({
+		active: false,
+		collapsible: true,
+		create: function( event, ui ) {
+			equal( ui.header.length, 0, "header length" );
+			equal( ui.panel.length, 0, "panel length" );
+		}
+	});
+	element.accordion( "destroy" );
+});
+
+test( "beforeActivate", function() {
+	expect( 38 );
+	var element = $( "#list1" ).accordion({
+			active: false,
+			collapsible: true
+		}),
+		headers = element.find( ".ui-accordion-header" ),
+		content = element.find( ".ui-accordion-content" );
+
+	element.one( "accordionbeforeactivate", function( event, ui ) {
+		ok( !( "originalEvent" in event ) );
+		equal( ui.oldHeader.length, 0 );
+		equal( ui.oldPanel.length, 0 );
+		equal( ui.newHeader.length, 1 );
+		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
+		equal( ui.newPanel.length, 1 );
+		strictEqual( ui.newPanel[ 0 ], content[ 0 ] );
+		state( element, 0, 0, 0 );
+	});
+	element.accordion( "option", "active", 0 );
+	state( element, 1, 0, 0 );
+
+	element.one( "accordionbeforeactivate", function( event, ui ) {
+		equal( event.originalEvent.type, "click" );
+		equal( ui.oldHeader.length, 1 );
+		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
+		equal( ui.oldPanel.length, 1 );
+		strictEqual( ui.oldPanel[ 0 ], content[ 0 ] );
+		equal( ui.newHeader.length, 1 );
+		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
+		equal( ui.newPanel.length, 1 );
+		strictEqual( ui.newPanel[ 0 ], content[ 1 ] );
+		state( element, 1, 0, 0 );
+	});
+	headers.eq( 1 ).click();
+	state( element, 0, 1, 0 );
+
+	element.one( "accordionbeforeactivate", function( event, ui ) {
+		ok( !( "originalEvent" in event ) );
+		equal( ui.oldHeader.length, 1 );
+		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
+		equal( ui.oldPanel.length, 1 );
+		strictEqual( ui.oldPanel[ 0 ], content[ 1 ] );
+		equal( ui.newHeader.length, 0 );
+		equal( ui.newPanel.length, 0 );
+		state( element, 0, 1, 0 );
+	});
+	element.accordion( "option", "active", false );
+	state( element, 0, 0, 0 );
+
+	element.one( "accordionbeforeactivate", function( event, ui ) {
+		ok( !( "originalEvent" in event ) );
+		equal( ui.oldHeader.length, 0 );
+		equal( ui.oldPanel.length, 0 );
+		equal( ui.newHeader.length, 1 );
+		strictEqual( ui.newHeader[ 0 ], headers[ 2 ] );
+		equal( ui.newPanel.length, 1 );
+		strictEqual( ui.newPanel[ 0 ], content[ 2 ] );
+		event.preventDefault();
+		state( element, 0, 0, 0 );
+	});
+	element.accordion( "option", "active", 2 );
+	state( element, 0, 0, 0 );
+});
+
+test( "activate", function() {
+	expect( 21 );
+	var element = $( "#list1" ).accordion({
+			active: false,
+			collapsible: true
+		}),
+		headers = element.find( ".ui-accordion-header" ),
+		content = element.find( ".ui-accordion-content" );
+
+	element.one( "accordionactivate", function( event, ui ) {
+		equal( ui.oldHeader.length, 0 );
+		equal( ui.oldPanel.length, 0 );
+		equal( ui.newHeader.length, 1 );
+		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
+		equal( ui.newPanel.length, 1 );
+		strictEqual( ui.newPanel[ 0 ], content[ 0 ] );
+	});
+	element.accordion( "option", "active", 0 );
+
+	element.one( "accordionactivate", function( event, ui ) {
+		equal( ui.oldHeader.length, 1 );
+		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
+		equal( ui.oldPanel.length, 1 );
+		strictEqual( ui.oldPanel[ 0 ], content[ 0 ] );
+		equal( ui.newHeader.length, 1 );
+		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
+		equal( ui.newPanel.length, 1 );
+		strictEqual( ui.newPanel[ 0 ], content[ 1 ] );
+	});
+	headers.eq( 1 ).click();
+
+	element.one( "accordionactivate", function( event, ui ) {
+		equal( ui.oldHeader.length, 1 );
+		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
+		equal( ui.oldPanel.length, 1 );
+		strictEqual( ui.oldPanel[ 0 ], content[ 1 ] );
+		equal( ui.newHeader.length, 0 );
+		equal( ui.newPanel.length, 0 );
+	});
+	element.accordion( "option", "active", false );
+
+	// prevent activation
+	element.one( "accordionbeforeactivate", function( event ) {
+		ok( true );
+		event.preventDefault();
+	});
+	element.one( "accordionactivate", function() {
+		ok( false );
+	});
+	element.accordion( "option", "active", 1 );
+});
+
+} );
diff --git a/tests/unit/accordion/helper.js b/tests/unit/accordion/helper.js
new file mode 100644
index 000000000..5eb3a4bc3
--- /dev/null
+++ b/tests/unit/accordion/helper.js
@@ -0,0 +1,35 @@
+define( [
+	"jquery",
+	"lib/helper",
+	"ui/accordion"
+], function( $, helper ) {
+
+return $.extend( helper, {
+	equalHeight: function( accordion, height ) {
+		accordion.find( ".ui-accordion-content" ).each(function() {
+			equal( $( this ).outerHeight(), height );
+		});
+	},
+
+	setupTeardown: function() {
+		var animate = $.ui.accordion.prototype.options.animate;
+		return {
+			setup: function() {
+				$.ui.accordion.prototype.options.animate = false;
+			},
+			teardown: function() {
+				$.ui.accordion.prototype.options.animate = animate;
+			}
+		};
+	},
+
+	state: function( accordion ) {
+		var expected = $.makeArray( arguments ).slice( 1 ),
+			actual = accordion.find( ".ui-accordion-content" ).map(function() {
+				return $( this ).css( "display" ) === "none" ? 0 : 1;
+			}).get();
+		QUnit.push( QUnit.equiv(actual, expected), actual, expected );
+	}
+} );
+
+} );
diff --git a/tests/unit/accordion/methods.js b/tests/unit/accordion/methods.js
new file mode 100644
index 000000000..efabfed10
--- /dev/null
+++ b/tests/unit/accordion/methods.js
@@ -0,0 +1,136 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/accordion"
+], function( $, testHelper ) {
+
+var equalHeight = testHelper.equalHeight,
+	setupTeardown = testHelper.setupTeardown,
+	state = testHelper.state;
+
+module( "accordion: methods", setupTeardown() );
+
+test( "destroy", function( assert ) {
+	expect( 1 );
+	assert.domEqual( "#list1", function() {
+		$( "#list1" ).accordion().accordion( "destroy" );
+	});
+});
+
+test( "enable/disable", function( assert ) {
+	expect( 7 );
+	var element = $( "#list1" ).accordion();
+	state( element, 1, 0, 0 );
+	element.accordion( "disable" );
+
+	assert.hasClasses( element, "ui-state-disabled" );
+
+	equal( element.attr( "aria-disabled" ), "true", "element gets aria-disabled" );
+	assert.hasClasses( element, "ui-accordion-disabled" );
+
+	// event does nothing
+	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" );
+	state( element, 1, 0, 0 );
+	// option still works
+	element.accordion( "option", "active", 1 );
+	state( element, 0, 1, 0 );
+	element.accordion( "enable" );
+	element.accordion( "option", "active", 2 );
+	state( element, 0, 0, 1 );
+});
+
+test( "refresh", function() {
+	expect( 19 );
+	var element = $( "#navigation" )
+		.parent()
+			.height( 300 )
+		.end()
+		.accordion({
+			heightStyle: "fill"
+		});
+	equalHeight( element, 255 );
+
+	element.parent().height( 500 );
+	element.accordion( "refresh" );
+	equalHeight( element, 455 );
+
+	element = $( "#list1" );
+	element.accordion();
+	state( element, 1, 0, 0 );
+
+	// disable panel via markup
+	element.find( "h3.bar" ).eq( 1 ).addClass( "ui-state-disabled" );
+	element.accordion( "refresh" );
+	state( element, 1, 0, 0 );
+
+	// don't add multiple icons
+	element.accordion( "refresh" );
+	equal( element.find( ".ui-accordion-header-icon" ).length, 3 );
+
+	// add a panel
+	element
+		.append("<h3 class='bar' id='new_1'>new 1</h3>")
+		.append("<div class='foo' id='new_1_panel'>new 1</div>");
+	element.accordion( "refresh" );
+	state( element, 1, 0, 0, 0 );
+
+	// remove all tabs
+	element.find( "h3.bar, div.foo" ).remove();
+	element.accordion( "refresh" );
+	state( element );
+	equal( element.accordion( "option", "active" ), false, "no active accordion panel" );
+
+	// add panels
+	element
+		.append("<h3 class='bar' id='new_2'>new 2</h3>")
+		.append("<div class='foo' id='new_2_panel'>new 2</div>")
+		.append("<h3 class='bar' id='new_3'>new 3</h3>")
+		.append("<div class='foo' id='new_3_panel'>new 3</div>")
+		.append("<h3 class='bar' id='new_4'>new 4</h3>")
+		.append("<div class='foo' id='new_4_panel'>new 4</div>")
+		.append("<h3 class='bar' id='new_5'>new 5</h3>")
+		.append("<div class='foo' id='new_5_panel'>new 5</div>");
+	element.accordion( "refresh" );
+	state( element, 1, 0, 0, 0 );
+
+	// activate third tab
+	element.accordion( "option", "active", 2 );
+	state( element, 0, 0, 1, 0 );
+
+	// remove fourth panel, third panel should stay active
+	element.find( "h3.bar" ).eq( 3 ).remove();
+	element.find( "div.foo" ).eq( 3 ).remove();
+	element.accordion( "refresh" );
+	state( element, 0, 0, 1 );
+
+	// remove third (active) panel, second panel should become active
+	element.find( "h3.bar" ).eq( 2 ).remove();
+	element.find( "div.foo" ).eq( 2 ).remove();
+	element.accordion( "refresh" );
+	state( element, 0, 1 );
+
+	// remove first panel, previously active panel (now first) should stay active
+	element.find( "h3.bar" ).eq( 0 ).remove();
+	element.find( "div.foo" ).eq( 0 ).remove();
+	element.accordion( "refresh" );
+	state( element, 1 );
+
+	// collapse all panels
+	element.accordion( "option", {
+		collapsible: true,
+		active: false
+	});
+	state( element, 0 );
+	element.accordion( "refresh" );
+	state( element, 0 );
+});
+
+test( "widget", function() {
+	expect( 2 );
+	var element = $( "#list1" ).accordion(),
+		widgetElement = element.accordion( "widget" );
+	equal( widgetElement.length, 1, "one element" );
+	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
+});
+
+} );
diff --git a/tests/unit/accordion/options.js b/tests/unit/accordion/options.js
new file mode 100644
index 000000000..c95738c43
--- /dev/null
+++ b/tests/unit/accordion/options.js
@@ -0,0 +1,467 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/accordion"
+], function( $, testHelper ) {
+
+var equalHeight = testHelper.equalHeight,
+	setupTeardown = testHelper.setupTeardown,
+	state = testHelper.state;
+
+module( "accordion: options", setupTeardown() );
+
+test( "{ active: default }", function() {
+	expect( 2 );
+	var element = $( "#list1" ).accordion();
+	equal( element.accordion( "option", "active" ), 0 );
+	state( element, 1, 0, 0 );
+});
+
+test( "{ active: null }", function() {
+	expect( 2 );
+	var element = $( "#list1" ).accordion({
+		active: null
+	});
+	equal( element.accordion( "option", "active" ), 0 );
+	state( element, 1, 0, 0 );
+});
+
+test( "{ active: false }", function() {
+	expect( 7 );
+	var element = $( "#list1" ).accordion({
+		active: false,
+		collapsible: true
+	});
+	state( element, 0, 0, 0 );
+	equal( element.find( ".ui-accordion-header.ui-state-active" ).length, 0, "no headers selected" );
+	equal( element.accordion( "option", "active" ), false );
+
+	element.accordion( "option", "collapsible", false );
+	state( element, 1, 0, 0 );
+	equal( element.accordion( "option", "active" ), 0 );
+
+	element.accordion( "destroy" );
+	element.accordion({
+		active: false
+	});
+	state( element, 1, 0, 0 );
+	strictEqual( element.accordion( "option", "active" ), 0 );
+});
+
+test( "{ active: Number }", function() {
+	expect( 8 );
+	var element = $( "#list1" ).accordion({
+		active: 2
+	});
+	equal( element.accordion( "option", "active" ), 2 );
+	state( element, 0, 0, 1 );
+
+	element.accordion( "option", "active", 0 );
+	equal( element.accordion( "option", "active" ), 0 );
+	state( element, 1, 0, 0 );
+
+	element.find( ".ui-accordion-header" ).eq( 1 ).click();
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.accordion( "option", "active", 10 );
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+});
+
+test( "{ active: -Number }", function() {
+	expect( 8 );
+	var element = $( "#list1" ).accordion({
+		active: -1
+	});
+	equal( element.accordion( "option", "active" ), 2 );
+	state( element, 0, 0, 1 );
+
+	element.accordion( "option", "active", -2 );
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.accordion( "option", "active", -10 );
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.accordion( "option", "active", -3 );
+	equal( element.accordion( "option", "active" ), 0 );
+	state( element, 1, 0, 0 );
+});
+
+test( "{ animate: false }", function() {
+	expect( 3 );
+	var element = $( "#list1" ).accordion({
+			animate: false
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
+	$.fn.animate = function() {
+		ok( false, ".animate() called" );
+	};
+
+	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
+	element.accordion( "option", "active", 1 );
+	ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
+	ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
+	$.fn.animate = animate;
+});
+
+asyncTest( "{ animate: Number }", function() {
+	expect( 7 );
+	var element = $( "#list1" ).accordion({
+			animate: 100
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
+	// called twice (both panels)
+	$.fn.animate = function( props, options ) {
+		equal( options.duration, 100, "correct duration" );
+		equal( options.easing, undefined, "default easing" );
+		animate.apply( this, arguments );
+	};
+
+	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
+	element.accordion( "option", "active", 1 );
+	panels.promise().done(function() {
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
+		ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
+		$.fn.animate = animate;
+		start();
+	});
+});
+
+asyncTest( "{ animate: String }", function() {
+	expect( 7 );
+	var element = $( "#list1" ).accordion({
+			animate: "linear"
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
+	// called twice (both panels)
+	$.fn.animate = function( props, options ) {
+		equal( options.duration, undefined, "default duration" );
+		equal( options.easing, "linear", "correct easing" );
+		animate.apply( this, arguments );
+	};
+
+	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
+	element.accordion( "option", "active", 1 );
+	panels.promise().done(function() {
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
+		ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
+		$.fn.animate = animate;
+		start();
+	});
+});
+
+asyncTest( "{ animate: {} }", function() {
+	expect( 7 );
+	var element = $( "#list1" ).accordion({
+			animate: {}
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
+	// called twice (both panels)
+	$.fn.animate = function( props, options ) {
+		equal( options.duration, undefined, "default duration" );
+		equal( options.easing, undefined, "default easing" );
+		animate.apply( this, arguments );
+	};
+
+	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
+	element.accordion( "option", "active", 1 );
+	panels.promise().done(function() {
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
+		ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
+		$.fn.animate = animate;
+		start();
+	});
+});
+
+asyncTest( "{ animate: { duration, easing } }", function() {
+	expect( 7 );
+	var element = $( "#list1" ).accordion({
+			animate: { duration: 100, easing: "linear" }
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
+	// called twice (both panels)
+	$.fn.animate = function( props, options ) {
+		equal( options.duration, 100, "correct duration" );
+		equal( options.easing, "linear", "correct easing" );
+		animate.apply( this, arguments );
+	};
+
+	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
+	element.accordion( "option", "active", 1 );
+	panels.promise().done(function() {
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
+		ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
+		$.fn.animate = animate;
+		start();
+	});
+});
+
+asyncTest( "{ animate: { duration, easing } }, animate down", function() {
+	expect( 7 );
+	var element = $( "#list1" ).accordion({
+			active: 1,
+			animate: { duration: 100, easing: "linear" }
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
+	// called twice (both panels)
+	$.fn.animate = function( props, options ) {
+		equal( options.duration, 100, "correct duration" );
+		equal( options.easing, "linear", "correct easing" );
+		animate.apply( this, arguments );
+	};
+
+	ok( panels.eq( 1 ).is( ":visible" ), "first panel visible" );
+	element.accordion( "option", "active", 0 );
+	panels.promise().done(function() {
+		ok( panels.eq( 1 ).is( ":hidden" ), "first panel hidden" );
+		ok( panels.eq( 0 ).is( ":visible" ), "second panel visible" );
+		$.fn.animate = animate;
+		start();
+	});
+});
+
+asyncTest( "{ animate: { duration, easing, down } }, animate down", function() {
+	expect( 7 );
+	var element = $( "#list1" ).accordion({
+			active: 1,
+			animate: {
+				duration: 100,
+				easing: "linear",
+				down: {
+					easing: "swing"
+				}
+			}
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
+	// called twice (both panels)
+	$.fn.animate = function( props, options ) {
+		equal( options.duration, 100, "correct duration" );
+		equal( options.easing, "swing", "correct easing" );
+		animate.apply( this, arguments );
+	};
+
+	ok( panels.eq( 1 ).is( ":visible" ), "first panel visible" );
+	element.accordion( "option", "active", 0 );
+	panels.promise().done(function() {
+		ok( panels.eq( 1 ).is( ":hidden" ), "first panel hidden" );
+		ok( panels.eq( 0 ).is( ":visible" ), "second panel visible" );
+		$.fn.animate = animate;
+		start();
+	});
+});
+
+test( "{ collapsible: false }", function() {
+	expect( 4 );
+	var element = $( "#list1" ).accordion({
+		active: 1
+	});
+	element.accordion( "option", "active", false );
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.find( ".ui-accordion-header" ).eq( 1 ).click();
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+});
+
+test( "{ collapsible: true }", function() {
+	expect( 6 );
+	var element = $( "#list1" ).accordion({
+		active: 1,
+		collapsible: true
+	});
+
+	element.accordion( "option", "active", false );
+	equal( element.accordion( "option", "active" ), false );
+	state( element, 0, 0, 0 );
+
+	element.accordion( "option", "active", 1 );
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.find( ".ui-accordion-header" ).eq( 1 ).click();
+	equal( element.accordion( "option", "active" ), false );
+	state( element, 0, 0, 0 );
+});
+
+test( "{ event: null }", function() {
+	expect( 5 );
+	var element = $( "#list1" ).accordion({
+		event: null
+	});
+	state( element, 1, 0, 0 );
+
+	element.accordion( "option", "active", 1 );
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	// ensure default click handler isn't bound
+	element.find( ".ui-accordion-header" ).eq( 2 ).click();
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+});
+
+test( "{ event: custom }", function() {
+	expect( 11 );
+	var element = $( "#list1" ).accordion({
+		event: "custom1 custom2"
+	});
+	state( element, 1, 0, 0 );
+
+	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom1" );
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	// ensure default click handler isn't bound
+	element.find( ".ui-accordion-header" ).eq( 2 ).trigger( "click" );
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.find( ".ui-accordion-header" ).eq( 2 ).trigger( "custom2" );
+	equal( element.accordion( "option", "active" ), 2 );
+	state( element, 0, 0, 1 );
+
+	element.accordion( "option", "event", "custom3" );
+
+	// ensure old event handlers are unbound
+	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom1" );
+	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom2" );
+	equal( element.accordion( "option", "active" ), 2 );
+	state( element, 0, 0, 1 );
+
+	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom3" );
+	equal( element.accordion( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+});
+
+test( "{ header: default }", function() {
+	expect( 2 );
+	// default: > li > :first-child,> :not(li):even
+	// > :not(li):even
+	state( $( "#list1" ).accordion(), 1, 0, 0);
+	// > li > :first-child
+	state( $( "#navigation" ).accordion(), 1, 0, 0);
+});
+
+test( "{ header: custom }", function( assert ) {
+	expect( 6 );
+	var element = $( "#navigationWrapper" ).accordion({
+		header: "h2"
+	});
+	element.find( "h2" ).each(function() {
+		assert.hasClasses( this, "ui-accordion-header" );
+	});
+	equal( element.find( ".ui-accordion-header" ).length, 3 );
+	state( element, 1, 0, 0 );
+	element.accordion( "option", "active", 2 );
+	state( element, 0, 0, 1 );
+});
+
+test( "{ heightStyle: 'auto' }", function() {
+	expect( 3 );
+	var element = $( "#navigation" ).accordion({ heightStyle: "auto" });
+	equalHeight( element, 105 );
+});
+
+test( "{ heightStyle: 'content' }", function() {
+	expect( 3 );
+	var element = $( "#navigation" ).accordion({ heightStyle: "content" }),
+		sizes = element.find( ".ui-accordion-content" ).map(function() {
+			return $( this ).height();
+		}).get();
+	equal( sizes[ 0 ], 75 );
+	equal( sizes[ 1 ], 105 );
+	equal( sizes[ 2 ], 45 );
+});
+
+test( "{ heightStyle: 'fill' }", function() {
+	expect( 3 );
+	$( "#navigationWrapper" ).height( 500 );
+	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
+	equalHeight( element, 455 );
+});
+
+test( "{ heightStyle: 'fill' } with sibling", function() {
+	expect( 3 );
+	$( "#navigationWrapper" ).height( 500 );
+	$( "<p>Lorem Ipsum</p>" )
+		.css({
+			height: 50,
+			marginTop: 20,
+			marginBottom: 30
+		})
+		.prependTo( "#navigationWrapper" );
+	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
+	equalHeight( element , 355 );
+});
+
+test( "{ heightStyle: 'fill' } with multiple siblings", function() {
+	expect( 3 );
+	$( "#navigationWrapper" ).height( 500 );
+	$( "<p>Lorem Ipsum</p>" )
+		.css({
+			height: 50,
+			marginTop: 20,
+			marginBottom: 30
+		})
+		.prependTo( "#navigationWrapper" );
+	$( "<p>Lorem Ipsum</p>" )
+		.css({
+			height: 50,
+			marginTop: 20,
+			marginBottom: 30,
+			position: "absolute"
+		})
+		.prependTo( "#navigationWrapper" );
+	$( "<p>Lorem Ipsum</p>" )
+		.css({
+			height: 25,
+			marginTop: 10,
+			marginBottom: 15
+		})
+		.prependTo( "#navigationWrapper" );
+	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
+	equalHeight( element, 305 );
+});
+
+test( "{ icons: false }", function() {
+	expect( 8 );
+	var element = $( "#list1" );
+	function icons( on ) {
+		deepEqual( element.find( "span.ui-icon").length, on ? 3 : 0 );
+		deepEqual( element.find( ".ui-accordion-header.ui-accordion-icons" ).length, on ? 3 : 0 );
+	}
+	element.accordion();
+	icons( true );
+	element.accordion( "destroy" ).accordion({
+		icons: false
+	});
+	icons( false );
+	element.accordion( "option", "icons", { header: "foo", activeHeader: "bar" } );
+	icons( true );
+	element.accordion( "option", "icons", false );
+	icons( false );
+});
+
+test( "{ icons: hash }", function( assert ) {
+	expect( 3 );
+	var element = $( "#list1" ).accordion({
+		icons: { activeHeader: "a1", header: "h1" }
+	});
+	assert.hasClasses( element.find( ".ui-accordion-header.ui-state-active span.ui-icon" ), "a1" );
+	element.accordion( "option", "icons", { activeHeader: "a2", header: "h2" } );
+	assert.lacksClasses( element.find( ".ui-accordion-header.ui-state-active span.ui-icon" ), "a1");
+	assert.hasClasses( element.find( ".ui-accordion-header.ui-state-active span.ui-icon" ), "a2" );
+});
+
+} );
diff --git a/tests/unit/autocomplete/autocomplete_common.js b/tests/unit/autocomplete/autocomplete_common.js
deleted file mode 100644
index 5ee7cdda0..000000000
--- a/tests/unit/autocomplete/autocomplete_common.js
+++ /dev/null
@@ -1,37 +0,0 @@
-define( [
-	"lib/common",
-	"ui/autocomplete"
-], function( common ) {
-
-common.testWidget( "autocomplete", {
-	defaults: {
-		appendTo: null,
-		autoFocus: false,
-		classes: {},
-		delay: 300,
-		disabled: false,
-		messages: {
-			noResults: "No search results.",
-			results: $.ui.autocomplete.prototype.options.messages.results
-		},
-		minLength: 1,
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		source: null,
-
-		// callbacks
-		change: null,
-		close: null,
-		create: null,
-		focus: null,
-		open: null,
-		response: null,
-		search: null,
-		select: null
-	}
-});
-
-} );
diff --git a/tests/unit/autocomplete/autocomplete_core.js b/tests/unit/autocomplete/autocomplete_core.js
deleted file mode 100644
index d25328dd5..000000000
--- a/tests/unit/autocomplete/autocomplete_core.js
+++ /dev/null
@@ -1,401 +0,0 @@
-define( [
-	"jquery",
-	"ui/autocomplete"
-], function( $ ) {
-
-module( "autocomplete: core" );
-
-test( "markup structure", function( assert ) {
-	expect( 2 );
-	var element = $( "#autocomplete" ).autocomplete(),
-		menu = element.autocomplete( "widget" );
-
-	assert.hasClasses( element, "ui-autocomplete-input" );
-	assert.hasClasses( menu, "ui-autocomplete ui-widget ui-widget-content" );
-});
-
-test( "prevent form submit on enter when menu is active", function() {
-	expect( 2 );
-	var event,
-		element = $( "#autocomplete" )
-			.autocomplete({
-				source: [ "java", "javascript" ]
-			})
-			.val( "ja" )
-			.autocomplete( "search" ),
-		menu = element.autocomplete( "widget" );
-
-	event = $.Event( "keydown" );
-	event.keyCode = $.ui.keyCode.DOWN;
-	element.trigger( event );
-	equal( menu.find( ".ui-menu-item-wrapper.ui-state-active" ).length, 1,
-		"menu item is active" );
-
-	event = $.Event( "keydown" );
-	event.keyCode = $.ui.keyCode.ENTER;
-	element.trigger( event );
-	ok( event.isDefaultPrevented(), "default action is prevented" );
-});
-
-test( "allow form submit on enter when menu is not active", function() {
-	expect( 1 );
-	var event,
-		element = $( "#autocomplete" )
-			.autocomplete({
-				autoFocus: false,
-				source: [ "java", "javascript" ]
-			})
-			.val( "ja" )
-			.autocomplete( "search" );
-
-	event = $.Event( "keydown" );
-	event.keyCode = $.ui.keyCode.ENTER;
-	element.trigger( event );
-	ok( !event.isDefaultPrevented(), "default action is prevented" );
-});
-
-(function() {
-	test( "up arrow invokes search - input", function() {
-		arrowsInvokeSearch( "#autocomplete", true, true );
-	});
-
-	test( "down arrow invokes search - input", function() {
-		arrowsInvokeSearch( "#autocomplete", false, true );
-	});
-
-	test( "up arrow invokes search - textarea", function() {
-		arrowsInvokeSearch( "#autocomplete-textarea", true, false );
-	});
-
-	test( "down arrow invokes search - textarea", function() {
-		arrowsInvokeSearch( "#autocomplete-textarea", false, false );
-	});
-
-	test( "up arrow invokes search - contenteditable", function() {
-		arrowsInvokeSearch( "#autocomplete-contenteditable", true, false );
-	});
-
-	test( "down arrow invokes search - contenteditable", function() {
-		arrowsInvokeSearch( "#autocomplete-contenteditable", false, false );
-	});
-
-	test( "up arrow moves focus - input", function() {
-		arrowsMoveFocus( "#autocomplete", true );
-	});
-
-	test( "down arrow moves focus - input", function() {
-		arrowsMoveFocus( "#autocomplete", false );
-	});
-
-	test( "up arrow moves focus - textarea", function() {
-		arrowsMoveFocus( "#autocomplete-textarea", true );
-	});
-
-	test( "down arrow moves focus - textarea", function() {
-		arrowsMoveFocus( "#autocomplete-textarea", false );
-	});
-
-	test( "up arrow moves focus - contenteditable", function() {
-		arrowsMoveFocus( "#autocomplete-contenteditable", true );
-	});
-
-	test( "down arrow moves focus - contenteditable", function() {
-		arrowsMoveFocus( "#autocomplete-contenteditable", false );
-	});
-
-	test( "up arrow moves cursor - input", function() {
-		arrowsNavigateElement( "#autocomplete", true, false );
-	});
-
-	test( "down arrow moves cursor - input", function() {
-		arrowsNavigateElement( "#autocomplete", false, false );
-	});
-
-	test( "up arrow moves cursor - textarea", function() {
-		arrowsNavigateElement( "#autocomplete-textarea", true, true );
-	});
-
-	test( "down arrow moves cursor - textarea", function() {
-		arrowsNavigateElement( "#autocomplete-textarea", false, true );
-	});
-
-	test( "up arrow moves cursor - contenteditable", function() {
-		arrowsNavigateElement( "#autocomplete-contenteditable", true, true );
-	});
-
-	test( "down arrow moves cursor - contenteditable", function() {
-		arrowsNavigateElement( "#autocomplete-contenteditable", false, true );
-	});
-
-	function arrowsInvokeSearch( id, isKeyUp, shouldMove ) {
-		expect( 1 );
-
-		var didMove = false,
-			element = $( id ).autocomplete({
-				source: [ "a" ],
-				delay: 0,
-				minLength: 0
-			});
-		element.autocomplete( "instance" )._move = function() {
-			didMove = true;
-		};
-		element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } );
-		equal( didMove, shouldMove, "respond to arrow" );
-	}
-
-	function arrowsMoveFocus( id, isKeyUp ) {
-		expect( 1 );
-
-		var element = $( id ).autocomplete({
-				source: [ "a" ],
-				delay: 0,
-				minLength: 0
-			});
-		element.autocomplete( "instance" )._move = function() {
-			ok( true, "repsond to arrow" );
-		};
-		element.autocomplete( "search" );
-		element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } );
-	}
-
-	function arrowsNavigateElement( id, isKeyUp, shouldMove ) {
-		expect( 1 );
-
-		var didMove = false,
-			element = $( id ).autocomplete({
-				source: [ "a" ],
-				delay: 0,
-				minLength: 0
-			});
-		element.bind( "keypress", function( e ) {
-			didMove = !e.isDefaultPrevented();
-		});
-		element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } );
-		element.simulate( "keypress" );
-		equal( didMove, shouldMove, "respond to arrow" );
-	}
-})();
-
-asyncTest( "past end of menu in multiline autocomplete", function() {
-	expect( 2 );
-
-	var customVal = "custom value",
-		element = $( "#autocomplete-contenteditable" ).autocomplete({
-			delay: 0,
-			source: [ "javascript" ],
-			focus: function( event, ui ) {
-				equal( ui.item.value, "javascript", "Item gained focus" );
-				$( this ).text( customVal );
-				event.preventDefault();
-			}
-		});
-
-	element
-		.simulate( "focus" )
-		.autocomplete( "search", "ja" );
-
-	setTimeout(function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( element.text(), customVal );
-		start();
-	});
-});
-
-asyncTest( "ESCAPE in multiline autocomplete", function() {
-	expect( 2 );
-
-	var customVal = "custom value",
-		element = $( "#autocomplete-contenteditable" ).autocomplete({
-			delay: 0,
-			source: [ "javascript" ],
-			focus: function( event, ui ) {
-				equal( ui.item.value, "javascript", "Item gained focus" );
-				$( this ).text( customVal );
-				event.preventDefault();
-			}
-		});
-
-	element
-		.simulate( "focus" )
-		.autocomplete( "search", "ja" );
-
-	setTimeout(function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( element.text(), customVal );
-		start();
-	});
-});
-
-asyncTest( "handle race condition", function() {
-	expect( 3 );
-	var count = 0,
-		element = $( "#autocomplete" ).autocomplete({
-		source: function( request, response ) {
-			count++;
-			if ( request.term.length === 1 ) {
-				equal( count, 1, "request with 1 character is first" );
-				setTimeout(function() {
-					response([ "one" ]);
-					setTimeout( checkResults );
-				});
-				return;
-			}
-			equal( count, 2, "request with 2 characters is second" );
-			response([ "two" ]);
-		}
-	});
-
-	element.autocomplete( "search", "a" );
-	element.autocomplete( "search", "ab" );
-
-	function checkResults() {
-		equal( element.autocomplete( "widget" ).find( ".ui-menu-item" ).text(), "two",
-			"correct results displayed" );
-		start();
-	}
-});
-
-asyncTest( "simultaneous searches (#9334)", function() {
-	expect( 2 );
-	var element = $( "#autocomplete" ).autocomplete({
-			source: function( request, response ) {
-				setTimeout(function() {
-					response([ request.term ]);
-				});
-			},
-			response: function() {
-				ok( true, "response from first instance" );
-			}
-		}),
-		element2 = $( "#autocomplete-textarea" ).autocomplete({
-			source: function( request, response ) {
-				setTimeout(function() {
-					response([ request.term ]);
-				});
-			},
-			response: function() {
-				ok( true, "response from second instance" );
-				start();
-			}
-		});
-
-	element.autocomplete( "search", "test" );
-	element2.autocomplete( "search", "test" );
-});
-
-test( "ARIA", function() {
-	expect( 13 );
-	var element = $( "#autocomplete" ).autocomplete({
-			source: [ "java", "javascript" ]
-		}),
-		liveRegion = element.autocomplete( "instance" ).liveRegion;
-
-	equal( liveRegion.children().length, 0, "Empty live region on create" );
-	equal( liveRegion.attr( "aria-live" ), "assertive",
-		"Live region's aria-live attribute must be assertive" );
-	equal( liveRegion.attr( "aria-relevant" ), "additions",
-		"Live region's aria-relevant attribute must be additions" );
-	equal( liveRegion.attr( "role" ), "status",
-		"Live region's role attribute must be status" );
-
-	element.autocomplete( "search", "j" );
-	equal( liveRegion.children().first().text(),
-		"2 results are available, use up and down arrow keys to navigate.",
-		"Live region for multiple values" );
-
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal( liveRegion.children().filter( ":visible" ).text(), "java",
-		"Live region changed on keydown to announce the highlighted value" );
-
-	element.one( "autocompletefocus", function( event ) {
-		event.preventDefault();
-	});
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal( liveRegion.children().filter( ":visible" ).text(), "javascript",
-		"Live region updated when default focus is prevented" );
-
-	element.autocomplete( "search", "javas" );
-	equal( liveRegion.children().filter( ":visible" ).text(),
-		"1 result is available, use up and down arrow keys to navigate.",
-		"Live region for one value" );
-
-	element.autocomplete( "search", "z" );
-	equal( liveRegion.children().filter( ":visible" ).text(), "No search results.",
-		"Live region for no values" );
-
-	equal( liveRegion.children().length, 5,
-		"Should be five children in the live region after the above" );
-	equal( liveRegion.children().filter( ":visible" ).length, 1,
-		"Only one should be still visible" );
-	ok( liveRegion.children().filter( ":visible" )[ 0 ] === liveRegion.children().last()[ 0 ],
-		"The last one should be the visible one" );
-
-	element.autocomplete( "destroy" );
-	equal( liveRegion.parent().length, 0,
-		"The liveRegion should be detached after destroy" );
-});
-
-test( "ARIA, aria-label announcement", function() {
-	expect( 1 );
-	$.widget( "custom.catcomplete", $.ui.autocomplete, {
-		_renderMenu: function( ul, items ) {
-			var that = this;
-			$.each( items, function( index, item ) {
-				that._renderItemData( ul, item )
-					.attr( "aria-label", item.category + " : " + item.label );
-			});
-		}
-	});
-	var element = $( "#autocomplete" ).catcomplete({
-			source: [ { label: "anders andersson", category: "People" } ]
-		}),
-		liveRegion = element.catcomplete( "instance" ).liveRegion;
-	element.catcomplete( "search", "a" );
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal( liveRegion.children().filter( ":visible" ).text(), "People : anders andersson",
-		"Live region changed on keydown to announce the highlighted value's aria-label attribute" );
-});
-
-test( "ARIA, init on detached input", function() {
-	expect( 1 );
-	var element = $( "<input>" ).autocomplete({
-			source: [ "java", "javascript" ]
-		}),
-		liveRegion = element.autocomplete( "instance" ).liveRegion;
-	equal( liveRegion.parent().length, 1, "liveRegion must have a parent" );
-});
-
-test( ".replaceWith() (#9172)", function() {
-	expect( 1 );
-
-	var element = $( "#autocomplete" ).autocomplete(),
-		replacement = "<div>test</div>",
-		parent = element.parent();
-	element.replaceWith( replacement );
-	equal( parent.html().toLowerCase(), replacement );
-});
-
-asyncTest( "Search if the user retypes the same value (#7434)", function() {
-	expect( 3 );
-	var element = $( "#autocomplete" ).autocomplete({
-			source: [ "java", "javascript" ],
-			delay: 0
-		}),
-		menu = element.autocomplete( "instance" ).menu.element;
-
-	element.val( "j" ).simulate( "keydown" );
-	setTimeout(function() {
-		ok( menu.is( ":visible" ), "menu displays initially" );
-		element.trigger( "blur" );
-		ok( !menu.is( ":visible" ), "menu hidden after blur" );
-		element.val( "j" ).simulate( "keydown" );
-		setTimeout(function() {
-			ok( menu.is( ":visible" ), "menu displays after typing the same value" );
-			start();
-		});
-	});
-});
-
-} );
diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js
deleted file mode 100644
index 606562aa9..000000000
--- a/tests/unit/autocomplete/autocomplete_events.js
+++ /dev/null
@@ -1,185 +0,0 @@
-define( [
-	"jquery",
-	"ui/autocomplete"
-], function( $ ) {
-
-module( "autocomplete: events" );
-
-var data = [ "Clojure", "COBOL", "ColdFusion", "Java", "JavaScript", "Scala", "Scheme" ];
-
-$.each([
-	{
-		type: "input",
-		selector: "#autocomplete",
-		valueMethod: "val"
-	},
-	{
-		type: "textarea",
-		selector: "#autocomplete-textarea",
-		valueMethod: "val"
-	},
-	{
-		type: "contenteditable",
-		selector: "#autocomplete-contenteditable",
-		valueMethod: "text"
-	}
-], function( i, settings ) {
-	asyncTest( "all events - " + settings.type, function() {
-		expect( 13 );
-		var element = $( settings.selector )
-				.autocomplete({
-					autoFocus: false,
-					delay: 0,
-					source: data,
-					search: function( event ) {
-						equal( event.originalEvent.type, "keydown", "search originalEvent" );
-					},
-					response: function( event, ui ) {
-						deepEqual( ui.content, [
-							{ label: "Clojure", value: "Clojure" },
-							{ label: "Java", value: "Java" },
-							{ label: "JavaScript", value: "JavaScript" }
-						], "response ui.content" );
-						ui.content.splice( 0, 1 );
-					},
-					open: function() {
-						ok( menu.is( ":visible" ), "menu open on open" );
-					},
-					focus: function( event, ui ) {
-						equal( event.originalEvent.type, "menufocus", "focus originalEvent" );
-						deepEqual( ui.item, { label: "Java", value: "Java" }, "focus ui.item" );
-					},
-					close: function( event ) {
-						equal( event.originalEvent.type, "menuselect", "close originalEvent" );
-						ok( menu.is( ":hidden" ), "menu closed on close" );
-					},
-					select: function( event, ui ) {
-						equal( event.originalEvent.type, "menuselect", "select originalEvent" );
-						deepEqual( ui.item, { label: "Java", value: "Java" }, "select ui.item" );
-					},
-					change: function( event, ui ) {
-						equal( event.originalEvent.type, "blur", "change originalEvent" );
-						deepEqual( ui.item, { label: "Java", value: "Java" }, "change ui.item" );
-						ok( menu.is( ":hidden" ), "menu closed on change" );
-						start();
-					}
-				}),
-			menu = element.autocomplete( "widget" );
-
-		element.simulate( "focus" )[ settings.valueMethod ]( "j" ).keydown();
-		setTimeout(function() {
-			ok( menu.is( ":visible" ), "menu is visible after delay" );
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-			// blur must be async for IE to handle it properly
-			setTimeout(function() {
-				element.simulate( "blur" );
-			});
-		});
-	});
-});
-
-asyncTest( "change without selection", function() {
-	expect( 1 );
-	var element = $( "#autocomplete" ).autocomplete({
-		delay: 0,
-		source: data,
-		change: function( event, ui ) {
-			strictEqual( ui.item, null );
-			start();
-		}
-	});
-	element.triggerHandler( "focus" );
-	element.val( "ja" ).triggerHandler( "blur" );
-});
-
-asyncTest( "cancel search", function() {
-	expect( 6 );
-	var first = true,
-		element = $( "#autocomplete" ).autocomplete({
-			delay: 0,
-			source: data,
-			search: function() {
-				if ( first ) {
-					equal( element.val(), "ja", "val on first search" );
-					first = false;
-					return false;
-				}
-				equal( element.val(), "java", "val on second search" );
-			},
-			open: function() {
-				ok( true, "menu opened" );
-			}
-		}),
-		menu = element.autocomplete( "widget" );
-	element.val( "ja" ).keydown();
-	setTimeout(function() {
-		ok( menu.is( ":hidden" ), "menu is hidden after first search" );
-		element.val( "java" ).keydown();
-		setTimeout(function() {
-			ok( menu.is( ":visible" ), "menu is visible after second search" );
-			equal( menu.find( ".ui-menu-item" ).length, 2, "# of menu items" );
-			start();
-		});
-	});
-});
-
-asyncTest( "cancel focus", function() {
-	expect( 1 );
-	var customVal = "custom value",
-		element = $( "#autocomplete" ).autocomplete({
-			delay: 0,
-			source: data,
-			focus: function() {
-				$( this ).val( customVal );
-				return false;
-			}
-		});
-	element.val( "ja" ).keydown();
-	setTimeout(function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( element.val(), customVal );
-		start();
-	});
-});
-
-asyncTest( "cancel select", function() {
-	expect( 1 );
-	var customVal = "custom value",
-		element = $( "#autocomplete" ).autocomplete({
-			delay: 0,
-			source: data,
-			select: function() {
-				$( this ).val( customVal );
-				return false;
-			}
-		});
-	element.val( "ja" ).keydown();
-	setTimeout(function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( element.val(), customVal );
-		start();
-	});
-});
-
-asyncTest( "blur during remote search", function() {
-	expect( 1 );
-	var ac = $( "#autocomplete" ).autocomplete({
-		delay: 0,
-		source: function( request, response ) {
-			ok( true, "trigger request" );
-			ac.simulate( "blur" );
-			setTimeout(function() {
-				response([ "result" ]);
-				start();
-			}, 25);
-		},
-		open: function() {
-			ok( false, "opened after a blur" );
-		}
-	});
-	ac.val( "ro" ).keydown();
-});
-
-} );
diff --git a/tests/unit/autocomplete/autocomplete_methods.js b/tests/unit/autocomplete/autocomplete_methods.js
deleted file mode 100644
index 32080207a..000000000
--- a/tests/unit/autocomplete/autocomplete_methods.js
+++ /dev/null
@@ -1,48 +0,0 @@
-define( [
-	"jquery",
-	"ui/autocomplete"
-], function( $ ) {
-
-module( "autocomplete: methods" );
-
-test( "destroy", function( assert ) {
-	expect( 1 );
-	assert.domEqual( "#autocomplete", function() {
-		$( "#autocomplete" ).autocomplete().autocomplete( "destroy" );
-	});
-});
-
-test( "search, close", function() {
-	expect( 6 );
-	var data = [ "c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl" ],
-		element = $( "#autocomplete" ).autocomplete({
-			source: data,
-			minLength: 0
-		}),
-		menu = element.autocomplete( "widget" );
-
-	ok( menu.is( ":hidden" ), "menu is hidden on init" );
-
-	element.autocomplete( "search" );
-	ok( menu.is( ":visible" ), "menu is visible after search" );
-	equal( menu.find( ".ui-menu-item" ).length, data.length, "all items for a blank search" );
-
-	element.val( "has" ).autocomplete( "search" );
-	equal( menu.find( ".ui-menu-item" ).text(), "haskell", "only one item for set input value" );
-
-	element.autocomplete( "search", "ja" );
-	equal( menu.find( ".ui-menu-item" ).length, 2, "only java and javascript for 'ja'" );
-
-	element.autocomplete( "close" );
-	ok( menu.is( ":hidden" ), "menu is hidden after close" );
-});
-
-test( "widget", function( assert ) {
-	expect( 2 );
-	var element = $( "#autocomplete" ).autocomplete(),
-		widgetElement = element.autocomplete( "widget" );
-	equal( widgetElement.length, 1, "one element" );
-	assert.hasClasses( widgetElement, "ui-menu" );
-});
-
-} );
diff --git a/tests/unit/autocomplete/autocomplete_options.js b/tests/unit/autocomplete/autocomplete_options.js
deleted file mode 100644
index a07a8d636..000000000
--- a/tests/unit/autocomplete/autocomplete_options.js
+++ /dev/null
@@ -1,317 +0,0 @@
-define( [
-	"jquery",
-	"ui/autocomplete"
-], function( $ ) {
-
-module( "autocomplete: options" );
-
-var data = [ "c++", "java", "php", "coldfusion", "javascript", "asp", "ruby",
-	"python", "c", "scala", "groovy", "haskell", "perl" ];
-
-test( "appendTo: null", function() {
-	expect( 1 );
-	var element = $( "#autocomplete" ).autocomplete();
-	equal( element.autocomplete( "widget" ).parent()[ 0 ], document.body,
-		"defaults to body" );
-	element.autocomplete( "destroy" );
-});
-
-test( "appendTo: explicit", function() {
-	expect( 6 );
-	var detached = $( "<div>" ),
-		element = $( "#autocomplete" );
-
-	element.autocomplete({
-		appendTo: ".autocomplete-wrap"
-	});
-	equal( element.autocomplete( "widget" ).parent()[ 0 ],
-		$( "#autocomplete-wrap1" )[ 0 ], "first found element" );
-	equal( $( "#autocomplete-wrap2 .ui-autocomplete" ).length, 0,
-		"only appends to one element" );
-	element.autocomplete( "destroy" );
-
-	element.autocomplete().autocomplete( "option", "appendTo", "#autocomplete-wrap1" );
-	equal( element.autocomplete( "widget" ).parent()[ 0 ],
-		$( "#autocomplete-wrap1" )[ 0 ], "modified after init" );
-	element.autocomplete( "destroy" );
-
-	element.autocomplete({
-		appendTo: detached
-	});
-	equal( element.autocomplete( "widget" ).parent()[ 0 ], detached[ 0 ],
-		"detached jQuery object" );
-	element.autocomplete( "destroy" );
-
-	element.autocomplete({
-		appendTo: detached[ 0 ]
-	});
-	equal( element.autocomplete( "widget" ).parent()[ 0 ], detached[ 0 ],
-		"detached DOM element" );
-	element.autocomplete( "destroy" );
-
-	element.autocomplete().autocomplete( "option", "appendTo", detached );
-	equal( element.autocomplete( "widget" ).parent()[ 0 ], detached[ 0 ],
-		"detached DOM element via option()" );
-	element.autocomplete( "destroy" );
-});
-
-test( "appendTo: ui-front", function() {
-	expect( 2 );
-	var element = $( "#autocomplete" );
-
-	$( "#autocomplete-wrap2" ).addClass( "ui-front" );
-	element.autocomplete();
-	equal( element.autocomplete( "widget" ).parent()[ 0 ],
-		$( "#autocomplete-wrap2" )[ 0 ], "null, inside .ui-front" );
-	element.autocomplete( "destroy" );
-
-	element.autocomplete({
-		appendTo: $()
-	});
-	equal( element.autocomplete( "widget" ).parent()[ 0 ],
-		$( "#autocomplete-wrap2" )[ 0 ], "empty jQuery object, inside .ui-front" );
-});
-
-function autoFocusTest( afValue, focusedLength ) {
-	var element = $( "#autocomplete" ).autocomplete({
-		autoFocus: afValue,
-		delay: 0,
-		source: data,
-		open: function() {
-			equal(
-				element.autocomplete( "widget" )
-					.find( ".ui-menu-item-wrapper.ui-state-active" )
-					.length,
-				focusedLength,
-				"first item is " + (afValue ? "" : "not") + " auto focused" );
-			start();
-		}
-	});
-	element.val( "ja" ).keydown();
-	stop();
-}
-
-test( "autoFocus: false", function() {
-	expect( 1 );
-	autoFocusTest( false, 0 );
-});
-
-test( "autoFocus: true", function() {
-	expect( 1 );
-	autoFocusTest( true, 1 );
-});
-
-asyncTest( "delay", function() {
-	expect( 2 );
-	var element = $( "#autocomplete" ).autocomplete({
-			source: data,
-			delay: 25
-		}),
-		menu = element.autocomplete( "widget" );
-	element.val( "ja" ).keydown();
-
-	ok( menu.is( ":hidden" ), "menu is closed immediately after search" );
-
-	setTimeout(function() {
-		ok( menu.is( ":visible" ), "menu is open after delay" );
-		start();
-	}, 50 );
-});
-
-asyncTest( "disabled", function( assert ) {
-	expect( 5 );
-	var element = $( "#autocomplete" ).autocomplete({
-			source: data,
-			delay: 0
-		}),
-		menu = element.autocomplete( "disable" ).autocomplete( "widget" );
-	element.val( "ja" ).keydown();
-
-	ok( menu.is( ":hidden" ) );
-
-	assert.lacksClasses( element, "ui-state-disabled" );
-	assert.hasClasses( menu, "ui-autocomplete-disabled" );
-	ok( !element.attr( "aria-disabled" ), "element doesn't get aria-disabled" );
-
-	setTimeout(function() {
-		ok( menu.is( ":hidden" ) );
-		start();
-	});
-});
-
-test( "minLength", function() {
-	expect( 2 );
-	var element = $( "#autocomplete" ).autocomplete({
-			source: data
-		}),
-		menu = element.autocomplete( "widget" );
-	element.autocomplete( "search", "" );
-	ok( menu.is( ":hidden" ), "blank not enough for minLength: 1" );
-
-	element.autocomplete( "option", "minLength", 0 );
-	element.autocomplete( "search", "" );
-	ok( menu.is( ":visible" ), "blank enough for minLength: 0" );
-});
-
-asyncTest( "minLength, exceed then drop below", function() {
-	expect( 4 );
-	var element = $( "#autocomplete" ).autocomplete({
-			minLength: 2,
-			source: function( req, res ) {
-				equal( req.term, "12", "correct search term" );
-				setTimeout(function() {
-					res([ "item" ]);
-				});
-			}
-		}),
-		menu = element.autocomplete( "widget" );
-
-	ok( menu.is( ":hidden" ), "menu is hidden before first search" );
-	element.autocomplete( "search", "12" );
-
-	ok( menu.is( ":hidden" ), "menu is hidden before second search" );
-	element.autocomplete( "search", "1" );
-
-	setTimeout(function() {
-		ok( menu.is( ":hidden" ), "menu is hidden after searches" );
-		start();
-	});
-});
-
-test( "minLength, exceed then drop below then exceed", function() {
-	expect( 3 );
-	var _res = [],
-		element = $( "#autocomplete" ).autocomplete({
-			minLength: 2,
-			source: function( req, res ) {
-				_res.push( res );
-			}
-		}),
-		menu = element.autocomplete( "widget" );
-
-	// trigger a valid search
-	ok( menu.is( ":hidden" ), "menu is hidden before first search" );
-	element.autocomplete( "search", "12" );
-
-	// trigger a search below the minLength, to turn on cancelSearch flag
-	ok( menu.is( ":hidden" ), "menu is hidden before second search" );
-	element.autocomplete( "search", "1" );
-
-	// trigger a valid search
-	element.autocomplete( "search", "13" );
-	// react as if the first search was cancelled (default ajax behavior)
-	_res[ 0 ]([]);
-	// react to second search
-	_res[ 1 ]([ "13" ]);
-
-	ok( menu.is( ":visible" ), "menu is visible after searches" );
-});
-
-test( "source, local string array", function() {
-	expect( 1 );
-	var element = $( "#autocomplete" ).autocomplete({
-			source: data
-		}),
-		menu = element.autocomplete( "widget" );
-	element.val( "ja" ).autocomplete( "search" );
-	equal( menu.find( ".ui-menu-item" ).text(), "javajavascript" );
-});
-
-function sourceTest( source, async ) {
-	var element = $( "#autocomplete" ).autocomplete({
-			source: source
-		}),
-		menu = element.autocomplete( "widget" );
-	function result() {
-		var items = menu.find( ".ui-menu-item" );
-		equal( items.length, 3, "Should find three results." );
-		deepEqual( items.eq( 0 ).data( "ui-autocomplete-item" ), {
-			label: "java",
-			value: "java"
-		});
-		deepEqual( items.eq( 1 ).data( "ui-autocomplete-item" ), {
-			label: "javascript",
-			value: "javascript"
-		});
-		deepEqual( items.eq( 2 ).data( "ui-autocomplete-item" ), {
-			label: "clojure",
-			value: "clojure"
-		});
-		element.autocomplete( "destroy" );
-		if ( async ) {
-			start();
-		}
-	}
-	if ( async ) {
-		stop();
-		$( document ).one( "ajaxStop", result );
-	}
-	element.val( "j" ).autocomplete( "search" );
-	if ( !async ) {
-		result();
-	}
-}
-
-test( "source, local object array, only labels", function() {
-	expect( 4 );
-	sourceTest([
-		{ label: "java", value: null },
-		{ label: "php", value: null },
-		{ label: "coldfusion", value: "" },
-		{ label: "javascript", value: "" },
-		{ label: "clojure" }
-	]);
-});
-
-test( "source, local object array, only values", function() {
-	expect( 4 );
-	sourceTest([
-		{ value: "java", label: null },
-		{ value: "php", label: null },
-		{ value: "coldfusion", label: "" },
-		{ value: "javascript", label: "" },
-		{ value: "clojure" }
-	]);
-});
-
-test( "source, url string with remote json string array", function() {
-	expect( 4 );
-	sourceTest( "remote_string_array.txt", true );
-});
-
-test( "source, url string with remote json object array, only value properties", function() {
-	expect( 4 );
-	sourceTest( "remote_object_array_values.txt", true );
-});
-
-test( "source, url string with remote json object array, only label properties", function() {
-	expect( 4 );
-	sourceTest( "remote_object_array_labels.txt", true );
-});
-
-test( "source, custom", function() {
-	expect( 5 );
-	sourceTest(function( request, response ) {
-		equal( request.term, "j" );
-		response([
-			"java",
-			{ label: "javascript", value: null },
-			{ value: "clojure", label: null }
-		]);
-	});
-});
-
-test( "source, update after init", function() {
-	expect( 2 );
-	var element = $( "#autocomplete" ).autocomplete({
-			source: [ "java", "javascript", "haskell" ]
-		}),
-		menu = element.autocomplete( "widget" );
-	element.val( "ja" ).autocomplete( "search" );
-	equal( menu.find( ".ui-menu-item" ).text(), "javajavascript" );
-	element.autocomplete( "option", "source", [ "php", "asp" ] );
-	element.val( "ph" ).autocomplete( "search" );
-	equal( menu.find( ".ui-menu-item" ).text(), "php" );
-});
-
-} );
diff --git a/tests/unit/autocomplete/common.js b/tests/unit/autocomplete/common.js
new file mode 100644
index 000000000..5ee7cdda0
--- /dev/null
+++ b/tests/unit/autocomplete/common.js
@@ -0,0 +1,37 @@
+define( [
+	"lib/common",
+	"ui/autocomplete"
+], function( common ) {
+
+common.testWidget( "autocomplete", {
+	defaults: {
+		appendTo: null,
+		autoFocus: false,
+		classes: {},
+		delay: 300,
+		disabled: false,
+		messages: {
+			noResults: "No search results.",
+			results: $.ui.autocomplete.prototype.options.messages.results
+		},
+		minLength: 1,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null,
+
+		// callbacks
+		change: null,
+		close: null,
+		create: null,
+		focus: null,
+		open: null,
+		response: null,
+		search: null,
+		select: null
+	}
+});
+
+} );
diff --git a/tests/unit/autocomplete/core.js b/tests/unit/autocomplete/core.js
new file mode 100644
index 000000000..d25328dd5
--- /dev/null
+++ b/tests/unit/autocomplete/core.js
@@ -0,0 +1,401 @@
+define( [
+	"jquery",
+	"ui/autocomplete"
+], function( $ ) {
+
+module( "autocomplete: core" );
+
+test( "markup structure", function( assert ) {
+	expect( 2 );
+	var element = $( "#autocomplete" ).autocomplete(),
+		menu = element.autocomplete( "widget" );
+
+	assert.hasClasses( element, "ui-autocomplete-input" );
+	assert.hasClasses( menu, "ui-autocomplete ui-widget ui-widget-content" );
+});
+
+test( "prevent form submit on enter when menu is active", function() {
+	expect( 2 );
+	var event,
+		element = $( "#autocomplete" )
+			.autocomplete({
+				source: [ "java", "javascript" ]
+			})
+			.val( "ja" )
+			.autocomplete( "search" ),
+		menu = element.autocomplete( "widget" );
+
+	event = $.Event( "keydown" );
+	event.keyCode = $.ui.keyCode.DOWN;
+	element.trigger( event );
+	equal( menu.find( ".ui-menu-item-wrapper.ui-state-active" ).length, 1,
+		"menu item is active" );
+
+	event = $.Event( "keydown" );
+	event.keyCode = $.ui.keyCode.ENTER;
+	element.trigger( event );
+	ok( event.isDefaultPrevented(), "default action is prevented" );
+});
+
+test( "allow form submit on enter when menu is not active", function() {
+	expect( 1 );
+	var event,
+		element = $( "#autocomplete" )
+			.autocomplete({
+				autoFocus: false,
+				source: [ "java", "javascript" ]
+			})
+			.val( "ja" )
+			.autocomplete( "search" );
+
+	event = $.Event( "keydown" );
+	event.keyCode = $.ui.keyCode.ENTER;
+	element.trigger( event );
+	ok( !event.isDefaultPrevented(), "default action is prevented" );
+});
+
+(function() {
+	test( "up arrow invokes search - input", function() {
+		arrowsInvokeSearch( "#autocomplete", true, true );
+	});
+
+	test( "down arrow invokes search - input", function() {
+		arrowsInvokeSearch( "#autocomplete", false, true );
+	});
+
+	test( "up arrow invokes search - textarea", function() {
+		arrowsInvokeSearch( "#autocomplete-textarea", true, false );
+	});
+
+	test( "down arrow invokes search - textarea", function() {
+		arrowsInvokeSearch( "#autocomplete-textarea", false, false );
+	});
+
+	test( "up arrow invokes search - contenteditable", function() {
+		arrowsInvokeSearch( "#autocomplete-contenteditable", true, false );
+	});
+
+	test( "down arrow invokes search - contenteditable", function() {
+		arrowsInvokeSearch( "#autocomplete-contenteditable", false, false );
+	});
+
+	test( "up arrow moves focus - input", function() {
+		arrowsMoveFocus( "#autocomplete", true );
+	});
+
+	test( "down arrow moves focus - input", function() {
+		arrowsMoveFocus( "#autocomplete", false );
+	});
+
+	test( "up arrow moves focus - textarea", function() {
+		arrowsMoveFocus( "#autocomplete-textarea", true );
+	});
+
+	test( "down arrow moves focus - textarea", function() {
+		arrowsMoveFocus( "#autocomplete-textarea", false );
+	});
+
+	test( "up arrow moves focus - contenteditable", function() {
+		arrowsMoveFocus( "#autocomplete-contenteditable", true );
+	});
+
+	test( "down arrow moves focus - contenteditable", function() {
+		arrowsMoveFocus( "#autocomplete-contenteditable", false );
+	});
+
+	test( "up arrow moves cursor - input", function() {
+		arrowsNavigateElement( "#autocomplete", true, false );
+	});
+
+	test( "down arrow moves cursor - input", function() {
+		arrowsNavigateElement( "#autocomplete", false, false );
+	});
+
+	test( "up arrow moves cursor - textarea", function() {
+		arrowsNavigateElement( "#autocomplete-textarea", true, true );
+	});
+
+	test( "down arrow moves cursor - textarea", function() {
+		arrowsNavigateElement( "#autocomplete-textarea", false, true );
+	});
+
+	test( "up arrow moves cursor - contenteditable", function() {
+		arrowsNavigateElement( "#autocomplete-contenteditable", true, true );
+	});
+
+	test( "down arrow moves cursor - contenteditable", function() {
+		arrowsNavigateElement( "#autocomplete-contenteditable", false, true );
+	});
+
+	function arrowsInvokeSearch( id, isKeyUp, shouldMove ) {
+		expect( 1 );
+
+		var didMove = false,
+			element = $( id ).autocomplete({
+				source: [ "a" ],
+				delay: 0,
+				minLength: 0
+			});
+		element.autocomplete( "instance" )._move = function() {
+			didMove = true;
+		};
+		element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } );
+		equal( didMove, shouldMove, "respond to arrow" );
+	}
+
+	function arrowsMoveFocus( id, isKeyUp ) {
+		expect( 1 );
+
+		var element = $( id ).autocomplete({
+				source: [ "a" ],
+				delay: 0,
+				minLength: 0
+			});
+		element.autocomplete( "instance" )._move = function() {
+			ok( true, "repsond to arrow" );
+		};
+		element.autocomplete( "search" );
+		element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } );
+	}
+
+	function arrowsNavigateElement( id, isKeyUp, shouldMove ) {
+		expect( 1 );
+
+		var didMove = false,
+			element = $( id ).autocomplete({
+				source: [ "a" ],
+				delay: 0,
+				minLength: 0
+			});
+		element.bind( "keypress", function( e ) {
+			didMove = !e.isDefaultPrevented();
+		});
+		element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } );
+		element.simulate( "keypress" );
+		equal( didMove, shouldMove, "respond to arrow" );
+	}
+})();
+
+asyncTest( "past end of menu in multiline autocomplete", function() {
+	expect( 2 );
+
+	var customVal = "custom value",
+		element = $( "#autocomplete-contenteditable" ).autocomplete({
+			delay: 0,
+			source: [ "javascript" ],
+			focus: function( event, ui ) {
+				equal( ui.item.value, "javascript", "Item gained focus" );
+				$( this ).text( customVal );
+				event.preventDefault();
+			}
+		});
+
+	element
+		.simulate( "focus" )
+		.autocomplete( "search", "ja" );
+
+	setTimeout(function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equal( element.text(), customVal );
+		start();
+	});
+});
+
+asyncTest( "ESCAPE in multiline autocomplete", function() {
+	expect( 2 );
+
+	var customVal = "custom value",
+		element = $( "#autocomplete-contenteditable" ).autocomplete({
+			delay: 0,
+			source: [ "javascript" ],
+			focus: function( event, ui ) {
+				equal( ui.item.value, "javascript", "Item gained focus" );
+				$( this ).text( customVal );
+				event.preventDefault();
+			}
+		});
+
+	element
+		.simulate( "focus" )
+		.autocomplete( "search", "ja" );
+
+	setTimeout(function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+		equal( element.text(), customVal );
+		start();
+	});
+});
+
+asyncTest( "handle race condition", function() {
+	expect( 3 );
+	var count = 0,
+		element = $( "#autocomplete" ).autocomplete({
+		source: function( request, response ) {
+			count++;
+			if ( request.term.length === 1 ) {
+				equal( count, 1, "request with 1 character is first" );
+				setTimeout(function() {
+					response([ "one" ]);
+					setTimeout( checkResults );
+				});
+				return;
+			}
+			equal( count, 2, "request with 2 characters is second" );
+			response([ "two" ]);
+		}
+	});
+
+	element.autocomplete( "search", "a" );
+	element.autocomplete( "search", "ab" );
+
+	function checkResults() {
+		equal( element.autocomplete( "widget" ).find( ".ui-menu-item" ).text(), "two",
+			"correct results displayed" );
+		start();
+	}
+});
+
+asyncTest( "simultaneous searches (#9334)", function() {
+	expect( 2 );
+	var element = $( "#autocomplete" ).autocomplete({
+			source: function( request, response ) {
+				setTimeout(function() {
+					response([ request.term ]);
+				});
+			},
+			response: function() {
+				ok( true, "response from first instance" );
+			}
+		}),
+		element2 = $( "#autocomplete-textarea" ).autocomplete({
+			source: function( request, response ) {
+				setTimeout(function() {
+					response([ request.term ]);
+				});
+			},
+			response: function() {
+				ok( true, "response from second instance" );
+				start();
+			}
+		});
+
+	element.autocomplete( "search", "test" );
+	element2.autocomplete( "search", "test" );
+});
+
+test( "ARIA", function() {
+	expect( 13 );
+	var element = $( "#autocomplete" ).autocomplete({
+			source: [ "java", "javascript" ]
+		}),
+		liveRegion = element.autocomplete( "instance" ).liveRegion;
+
+	equal( liveRegion.children().length, 0, "Empty live region on create" );
+	equal( liveRegion.attr( "aria-live" ), "assertive",
+		"Live region's aria-live attribute must be assertive" );
+	equal( liveRegion.attr( "aria-relevant" ), "additions",
+		"Live region's aria-relevant attribute must be additions" );
+	equal( liveRegion.attr( "role" ), "status",
+		"Live region's role attribute must be status" );
+
+	element.autocomplete( "search", "j" );
+	equal( liveRegion.children().first().text(),
+		"2 results are available, use up and down arrow keys to navigate.",
+		"Live region for multiple values" );
+
+	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+	equal( liveRegion.children().filter( ":visible" ).text(), "java",
+		"Live region changed on keydown to announce the highlighted value" );
+
+	element.one( "autocompletefocus", function( event ) {
+		event.preventDefault();
+	});
+	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+	equal( liveRegion.children().filter( ":visible" ).text(), "javascript",
+		"Live region updated when default focus is prevented" );
+
+	element.autocomplete( "search", "javas" );
+	equal( liveRegion.children().filter( ":visible" ).text(),
+		"1 result is available, use up and down arrow keys to navigate.",
+		"Live region for one value" );
+
+	element.autocomplete( "search", "z" );
+	equal( liveRegion.children().filter( ":visible" ).text(), "No search results.",
+		"Live region for no values" );
+
+	equal( liveRegion.children().length, 5,
+		"Should be five children in the live region after the above" );
+	equal( liveRegion.children().filter( ":visible" ).length, 1,
+		"Only one should be still visible" );
+	ok( liveRegion.children().filter( ":visible" )[ 0 ] === liveRegion.children().last()[ 0 ],
+		"The last one should be the visible one" );
+
+	element.autocomplete( "destroy" );
+	equal( liveRegion.parent().length, 0,
+		"The liveRegion should be detached after destroy" );
+});
+
+test( "ARIA, aria-label announcement", function() {
+	expect( 1 );
+	$.widget( "custom.catcomplete", $.ui.autocomplete, {
+		_renderMenu: function( ul, items ) {
+			var that = this;
+			$.each( items, function( index, item ) {
+				that._renderItemData( ul, item )
+					.attr( "aria-label", item.category + " : " + item.label );
+			});
+		}
+	});
+	var element = $( "#autocomplete" ).catcomplete({
+			source: [ { label: "anders andersson", category: "People" } ]
+		}),
+		liveRegion = element.catcomplete( "instance" ).liveRegion;
+	element.catcomplete( "search", "a" );
+	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+	equal( liveRegion.children().filter( ":visible" ).text(), "People : anders andersson",
+		"Live region changed on keydown to announce the highlighted value's aria-label attribute" );
+});
+
+test( "ARIA, init on detached input", function() {
+	expect( 1 );
+	var element = $( "<input>" ).autocomplete({
+			source: [ "java", "javascript" ]
+		}),
+		liveRegion = element.autocomplete( "instance" ).liveRegion;
+	equal( liveRegion.parent().length, 1, "liveRegion must have a parent" );
+});
+
+test( ".replaceWith() (#9172)", function() {
+	expect( 1 );
+
+	var element = $( "#autocomplete" ).autocomplete(),
+		replacement = "<div>test</div>",
+		parent = element.parent();
+	element.replaceWith( replacement );
+	equal( parent.html().toLowerCase(), replacement );
+});
+
+asyncTest( "Search if the user retypes the same value (#7434)", function() {
+	expect( 3 );
+	var element = $( "#autocomplete" ).autocomplete({
+			source: [ "java", "javascript" ],
+			delay: 0
+		}),
+		menu = element.autocomplete( "instance" ).menu.element;
+
+	element.val( "j" ).simulate( "keydown" );
+	setTimeout(function() {
+		ok( menu.is( ":visible" ), "menu displays initially" );
+		element.trigger( "blur" );
+		ok( !menu.is( ":visible" ), "menu hidden after blur" );
+		element.val( "j" ).simulate( "keydown" );
+		setTimeout(function() {
+			ok( menu.is( ":visible" ), "menu displays after typing the same value" );
+			start();
+		});
+	});
+});
+
+} );
diff --git a/tests/unit/autocomplete/events.js b/tests/unit/autocomplete/events.js
new file mode 100644
index 000000000..606562aa9
--- /dev/null
+++ b/tests/unit/autocomplete/events.js
@@ -0,0 +1,185 @@
+define( [
+	"jquery",
+	"ui/autocomplete"
+], function( $ ) {
+
+module( "autocomplete: events" );
+
+var data = [ "Clojure", "COBOL", "ColdFusion", "Java", "JavaScript", "Scala", "Scheme" ];
+
+$.each([
+	{
+		type: "input",
+		selector: "#autocomplete",
+		valueMethod: "val"
+	},
+	{
+		type: "textarea",
+		selector: "#autocomplete-textarea",
+		valueMethod: "val"
+	},
+	{
+		type: "contenteditable",
+		selector: "#autocomplete-contenteditable",
+		valueMethod: "text"
+	}
+], function( i, settings ) {
+	asyncTest( "all events - " + settings.type, function() {
+		expect( 13 );
+		var element = $( settings.selector )
+				.autocomplete({
+					autoFocus: false,
+					delay: 0,
+					source: data,
+					search: function( event ) {
+						equal( event.originalEvent.type, "keydown", "search originalEvent" );
+					},
+					response: function( event, ui ) {
+						deepEqual( ui.content, [
+							{ label: "Clojure", value: "Clojure" },
+							{ label: "Java", value: "Java" },
+							{ label: "JavaScript", value: "JavaScript" }
+						], "response ui.content" );
+						ui.content.splice( 0, 1 );
+					},
+					open: function() {
+						ok( menu.is( ":visible" ), "menu open on open" );
+					},
+					focus: function( event, ui ) {
+						equal( event.originalEvent.type, "menufocus", "focus originalEvent" );
+						deepEqual( ui.item, { label: "Java", value: "Java" }, "focus ui.item" );
+					},
+					close: function( event ) {
+						equal( event.originalEvent.type, "menuselect", "close originalEvent" );
+						ok( menu.is( ":hidden" ), "menu closed on close" );
+					},
+					select: function( event, ui ) {
+						equal( event.originalEvent.type, "menuselect", "select originalEvent" );
+						deepEqual( ui.item, { label: "Java", value: "Java" }, "select ui.item" );
+					},
+					change: function( event, ui ) {
+						equal( event.originalEvent.type, "blur", "change originalEvent" );
+						deepEqual( ui.item, { label: "Java", value: "Java" }, "change ui.item" );
+						ok( menu.is( ":hidden" ), "menu closed on change" );
+						start();
+					}
+				}),
+			menu = element.autocomplete( "widget" );
+
+		element.simulate( "focus" )[ settings.valueMethod ]( "j" ).keydown();
+		setTimeout(function() {
+			ok( menu.is( ":visible" ), "menu is visible after delay" );
+			element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+			// blur must be async for IE to handle it properly
+			setTimeout(function() {
+				element.simulate( "blur" );
+			});
+		});
+	});
+});
+
+asyncTest( "change without selection", function() {
+	expect( 1 );
+	var element = $( "#autocomplete" ).autocomplete({
+		delay: 0,
+		source: data,
+		change: function( event, ui ) {
+			strictEqual( ui.item, null );
+			start();
+		}
+	});
+	element.triggerHandler( "focus" );
+	element.val( "ja" ).triggerHandler( "blur" );
+});
+
+asyncTest( "cancel search", function() {
+	expect( 6 );
+	var first = true,
+		element = $( "#autocomplete" ).autocomplete({
+			delay: 0,
+			source: data,
+			search: function() {
+				if ( first ) {
+					equal( element.val(), "ja", "val on first search" );
+					first = false;
+					return false;
+				}
+				equal( element.val(), "java", "val on second search" );
+			},
+			open: function() {
+				ok( true, "menu opened" );
+			}
+		}),
+		menu = element.autocomplete( "widget" );
+	element.val( "ja" ).keydown();
+	setTimeout(function() {
+		ok( menu.is( ":hidden" ), "menu is hidden after first search" );
+		element.val( "java" ).keydown();
+		setTimeout(function() {
+			ok( menu.is( ":visible" ), "menu is visible after second search" );
+			equal( menu.find( ".ui-menu-item" ).length, 2, "# of menu items" );
+			start();
+		});
+	});
+});
+
+asyncTest( "cancel focus", function() {
+	expect( 1 );
+	var customVal = "custom value",
+		element = $( "#autocomplete" ).autocomplete({
+			delay: 0,
+			source: data,
+			focus: function() {
+				$( this ).val( customVal );
+				return false;
+			}
+		});
+	element.val( "ja" ).keydown();
+	setTimeout(function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equal( element.val(), customVal );
+		start();
+	});
+});
+
+asyncTest( "cancel select", function() {
+	expect( 1 );
+	var customVal = "custom value",
+		element = $( "#autocomplete" ).autocomplete({
+			delay: 0,
+			source: data,
+			select: function() {
+				$( this ).val( customVal );
+				return false;
+			}
+		});
+	element.val( "ja" ).keydown();
+	setTimeout(function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		equal( element.val(), customVal );
+		start();
+	});
+});
+
+asyncTest( "blur during remote search", function() {
+	expect( 1 );
+	var ac = $( "#autocomplete" ).autocomplete({
+		delay: 0,
+		source: function( request, response ) {
+			ok( true, "trigger request" );
+			ac.simulate( "blur" );
+			setTimeout(function() {
+				response([ "result" ]);
+				start();
+			}, 25);
+		},
+		open: function() {
+			ok( false, "opened after a blur" );
+		}
+	});
+	ac.val( "ro" ).keydown();
+});
+
+} );
diff --git a/tests/unit/autocomplete/methods.js b/tests/unit/autocomplete/methods.js
new file mode 100644
index 000000000..32080207a
--- /dev/null
+++ b/tests/unit/autocomplete/methods.js
@@ -0,0 +1,48 @@
+define( [
+	"jquery",
+	"ui/autocomplete"
+], function( $ ) {
+
+module( "autocomplete: methods" );
+
+test( "destroy", function( assert ) {
+	expect( 1 );
+	assert.domEqual( "#autocomplete", function() {
+		$( "#autocomplete" ).autocomplete().autocomplete( "destroy" );
+	});
+});
+
+test( "search, close", function() {
+	expect( 6 );
+	var data = [ "c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl" ],
+		element = $( "#autocomplete" ).autocomplete({
+			source: data,
+			minLength: 0
+		}),
+		menu = element.autocomplete( "widget" );
+
+	ok( menu.is( ":hidden" ), "menu is hidden on init" );
+
+	element.autocomplete( "search" );
+	ok( menu.is( ":visible" ), "menu is visible after search" );
+	equal( menu.find( ".ui-menu-item" ).length, data.length, "all items for a blank search" );
+
+	element.val( "has" ).autocomplete( "search" );
+	equal( menu.find( ".ui-menu-item" ).text(), "haskell", "only one item for set input value" );
+
+	element.autocomplete( "search", "ja" );
+	equal( menu.find( ".ui-menu-item" ).length, 2, "only java and javascript for 'ja'" );
+
+	element.autocomplete( "close" );
+	ok( menu.is( ":hidden" ), "menu is hidden after close" );
+});
+
+test( "widget", function( assert ) {
+	expect( 2 );
+	var element = $( "#autocomplete" ).autocomplete(),
+		widgetElement = element.autocomplete( "widget" );
+	equal( widgetElement.length, 1, "one element" );
+	assert.hasClasses( widgetElement, "ui-menu" );
+});
+
+} );
diff --git a/tests/unit/autocomplete/options.js b/tests/unit/autocomplete/options.js
new file mode 100644
index 000000000..a07a8d636
--- /dev/null
+++ b/tests/unit/autocomplete/options.js
@@ -0,0 +1,317 @@
+define( [
+	"jquery",
+	"ui/autocomplete"
+], function( $ ) {
+
+module( "autocomplete: options" );
+
+var data = [ "c++", "java", "php", "coldfusion", "javascript", "asp", "ruby",
+	"python", "c", "scala", "groovy", "haskell", "perl" ];
+
+test( "appendTo: null", function() {
+	expect( 1 );
+	var element = $( "#autocomplete" ).autocomplete();
+	equal( element.autocomplete( "widget" ).parent()[ 0 ], document.body,
+		"defaults to body" );
+	element.autocomplete( "destroy" );
+});
+
+test( "appendTo: explicit", function() {
+	expect( 6 );
+	var detached = $( "<div>" ),
+		element = $( "#autocomplete" );
+
+	element.autocomplete({
+		appendTo: ".autocomplete-wrap"
+	});
+	equal( element.autocomplete( "widget" ).parent()[ 0 ],
+		$( "#autocomplete-wrap1" )[ 0 ], "first found element" );
+	equal( $( "#autocomplete-wrap2 .ui-autocomplete" ).length, 0,
+		"only appends to one element" );
+	element.autocomplete( "destroy" );
+
+	element.autocomplete().autocomplete( "option", "appendTo", "#autocomplete-wrap1" );
+	equal( element.autocomplete( "widget" ).parent()[ 0 ],
+		$( "#autocomplete-wrap1" )[ 0 ], "modified after init" );
+	element.autocomplete( "destroy" );
+
+	element.autocomplete({
+		appendTo: detached
+	});
+	equal( element.autocomplete( "widget" ).parent()[ 0 ], detached[ 0 ],
+		"detached jQuery object" );
+	element.autocomplete( "destroy" );
+
+	element.autocomplete({
+		appendTo: detached[ 0 ]
+	});
+	equal( element.autocomplete( "widget" ).parent()[ 0 ], detached[ 0 ],
+		"detached DOM element" );
+	element.autocomplete( "destroy" );
+
+	element.autocomplete().autocomplete( "option", "appendTo", detached );
+	equal( element.autocomplete( "widget" ).parent()[ 0 ], detached[ 0 ],
+		"detached DOM element via option()" );
+	element.autocomplete( "destroy" );
+});
+
+test( "appendTo: ui-front", function() {
+	expect( 2 );
+	var element = $( "#autocomplete" );
+
+	$( "#autocomplete-wrap2" ).addClass( "ui-front" );
+	element.autocomplete();
+	equal( element.autocomplete( "widget" ).parent()[ 0 ],
+		$( "#autocomplete-wrap2" )[ 0 ], "null, inside .ui-front" );
+	element.autocomplete( "destroy" );
+
+	element.autocomplete({
+		appendTo: $()
+	});
+	equal( element.autocomplete( "widget" ).parent()[ 0 ],
+		$( "#autocomplete-wrap2" )[ 0 ], "empty jQuery object, inside .ui-front" );
+});
+
+function autoFocusTest( afValue, focusedLength ) {
+	var element = $( "#autocomplete" ).autocomplete({
+		autoFocus: afValue,
+		delay: 0,
+		source: data,
+		open: function() {
+			equal(
+				element.autocomplete( "widget" )
+					.find( ".ui-menu-item-wrapper.ui-state-active" )
+					.length,
+				focusedLength,
+				"first item is " + (afValue ? "" : "not") + " auto focused" );
+			start();
+		}
+	});
+	element.val( "ja" ).keydown();
+	stop();
+}
+
+test( "autoFocus: false", function() {
+	expect( 1 );
+	autoFocusTest( false, 0 );
+});
+
+test( "autoFocus: true", function() {
+	expect( 1 );
+	autoFocusTest( true, 1 );
+});
+
+asyncTest( "delay", function() {
+	expect( 2 );
+	var element = $( "#autocomplete" ).autocomplete({
+			source: data,
+			delay: 25
+		}),
+		menu = element.autocomplete( "widget" );
+	element.val( "ja" ).keydown();
+
+	ok( menu.is( ":hidden" ), "menu is closed immediately after search" );
+
+	setTimeout(function() {
+		ok( menu.is( ":visible" ), "menu is open after delay" );
+		start();
+	}, 50 );
+});
+
+asyncTest( "disabled", function( assert ) {
+	expect( 5 );
+	var element = $( "#autocomplete" ).autocomplete({
+			source: data,
+			delay: 0
+		}),
+		menu = element.autocomplete( "disable" ).autocomplete( "widget" );
+	element.val( "ja" ).keydown();
+
+	ok( menu.is( ":hidden" ) );
+
+	assert.lacksClasses( element, "ui-state-disabled" );
+	assert.hasClasses( menu, "ui-autocomplete-disabled" );
+	ok( !element.attr( "aria-disabled" ), "element doesn't get aria-disabled" );
+
+	setTimeout(function() {
+		ok( menu.is( ":hidden" ) );
+		start();
+	});
+});
+
+test( "minLength", function() {
+	expect( 2 );
+	var element = $( "#autocomplete" ).autocomplete({
+			source: data
+		}),
+		menu = element.autocomplete( "widget" );
+	element.autocomplete( "search", "" );
+	ok( menu.is( ":hidden" ), "blank not enough for minLength: 1" );
+
+	element.autocomplete( "option", "minLength", 0 );
+	element.autocomplete( "search", "" );
+	ok( menu.is( ":visible" ), "blank enough for minLength: 0" );
+});
+
+asyncTest( "minLength, exceed then drop below", function() {
+	expect( 4 );
+	var element = $( "#autocomplete" ).autocomplete({
+			minLength: 2,
+			source: function( req, res ) {
+				equal( req.term, "12", "correct search term" );
+				setTimeout(function() {
+					res([ "item" ]);
+				});
+			}
+		}),
+		menu = element.autocomplete( "widget" );
+
+	ok( menu.is( ":hidden" ), "menu is hidden before first search" );
+	element.autocomplete( "search", "12" );
+
+	ok( menu.is( ":hidden" ), "menu is hidden before second search" );
+	element.autocomplete( "search", "1" );
+
+	setTimeout(function() {
+		ok( menu.is( ":hidden" ), "menu is hidden after searches" );
+		start();
+	});
+});
+
+test( "minLength, exceed then drop below then exceed", function() {
+	expect( 3 );
+	var _res = [],
+		element = $( "#autocomplete" ).autocomplete({
+			minLength: 2,
+			source: function( req, res ) {
+				_res.push( res );
+			}
+		}),
+		menu = element.autocomplete( "widget" );
+
+	// trigger a valid search
+	ok( menu.is( ":hidden" ), "menu is hidden before first search" );
+	element.autocomplete( "search", "12" );
+
+	// trigger a search below the minLength, to turn on cancelSearch flag
+	ok( menu.is( ":hidden" ), "menu is hidden before second search" );
+	element.autocomplete( "search", "1" );
+
+	// trigger a valid search
+	element.autocomplete( "search", "13" );
+	// react as if the first search was cancelled (default ajax behavior)
+	_res[ 0 ]([]);
+	// react to second search
+	_res[ 1 ]([ "13" ]);
+
+	ok( menu.is( ":visible" ), "menu is visible after searches" );
+});
+
+test( "source, local string array", function() {
+	expect( 1 );
+	var element = $( "#autocomplete" ).autocomplete({
+			source: data
+		}),
+		menu = element.autocomplete( "widget" );
+	element.val( "ja" ).autocomplete( "search" );
+	equal( menu.find( ".ui-menu-item" ).text(), "javajavascript" );
+});
+
+function sourceTest( source, async ) {
+	var element = $( "#autocomplete" ).autocomplete({
+			source: source
+		}),
+		menu = element.autocomplete( "widget" );
+	function result() {
+		var items = menu.find( ".ui-menu-item" );
+		equal( items.length, 3, "Should find three results." );
+		deepEqual( items.eq( 0 ).data( "ui-autocomplete-item" ), {
+			label: "java",
+			value: "java"
+		});
+		deepEqual( items.eq( 1 ).data( "ui-autocomplete-item" ), {
+			label: "javascript",
+			value: "javascript"
+		});
+		deepEqual( items.eq( 2 ).data( "ui-autocomplete-item" ), {
+			label: "clojure",
+			value: "clojure"
+		});
+		element.autocomplete( "destroy" );
+		if ( async ) {
+			start();
+		}
+	}
+	if ( async ) {
+		stop();
+		$( document ).one( "ajaxStop", result );
+	}
+	element.val( "j" ).autocomplete( "search" );
+	if ( !async ) {
+		result();
+	}
+}
+
+test( "source, local object array, only labels", function() {
+	expect( 4 );
+	sourceTest([
+		{ label: "java", value: null },
+		{ label: "php", value: null },
+		{ label: "coldfusion", value: "" },
+		{ label: "javascript", value: "" },
+		{ label: "clojure" }
+	]);
+});
+
+test( "source, local object array, only values", function() {
+	expect( 4 );
+	sourceTest([
+		{ value: "java", label: null },
+		{ value: "php", label: null },
+		{ value: "coldfusion", label: "" },
+		{ value: "javascript", label: "" },
+		{ value: "clojure" }
+	]);
+});
+
+test( "source, url string with remote json string array", function() {
+	expect( 4 );
+	sourceTest( "remote_string_array.txt", true );
+});
+
+test( "source, url string with remote json object array, only value properties", function() {
+	expect( 4 );
+	sourceTest( "remote_object_array_values.txt", true );
+});
+
+test( "source, url string with remote json object array, only label properties", function() {
+	expect( 4 );
+	sourceTest( "remote_object_array_labels.txt", true );
+});
+
+test( "source, custom", function() {
+	expect( 5 );
+	sourceTest(function( request, response ) {
+		equal( request.term, "j" );
+		response([
+			"java",
+			{ label: "javascript", value: null },
+			{ value: "clojure", label: null }
+		]);
+	});
+});
+
+test( "source, update after init", function() {
+	expect( 2 );
+	var element = $( "#autocomplete" ).autocomplete({
+			source: [ "java", "javascript", "haskell" ]
+		}),
+		menu = element.autocomplete( "widget" );
+	element.val( "ja" ).autocomplete( "search" );
+	equal( menu.find( ".ui-menu-item" ).text(), "javajavascript" );
+	element.autocomplete( "option", "source", [ "php", "asp" ] );
+	element.val( "ph" ).autocomplete( "search" );
+	equal( menu.find( ".ui-menu-item" ).text(), "php" );
+});
+
+} );
diff --git a/tests/unit/button/button_common.js b/tests/unit/button/button_common.js
deleted file mode 100644
index d376f4f05..000000000
--- a/tests/unit/button/button_common.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define( [
-	"lib/common",
-	"ui/button"
-], function( common ) {
-
-common.testWidget( "button", {
-	defaults: {
-		classes: {},
-		disabled: null,
-		icons: {
-			primary: null,
-			secondary: null
-		},
-		label: null,
-		text: true,
-
-		// callbacks
-		create: null
-	}
-});
-
-} );
diff --git a/tests/unit/button/button_core.js b/tests/unit/button/button_core.js
deleted file mode 100644
index 4bc8d9fe5..000000000
--- a/tests/unit/button/button_core.js
+++ /dev/null
@@ -1,230 +0,0 @@
-define( [
-	"jquery",
-	"ui/button"
-], function( $ ) {
-
-module("button: core");
-
-test("checkbox", function( assert ) {
-	expect( 4 );
-	var input = $("#check"),
-		label = $("label[for=check]");
-	ok( input.is(":visible") );
-	ok( label.is(":not(.ui-button)") );
-	input.button();
-	assert.hasClasses( input, "ui-helper-hidden-accessible" );
-	assert.hasClasses( label, "ui-button" );
-});
-
-test("radios", function( assert ) {
-	expect( 8 );
-	var inputs = $("#radio0 input"),
-		labels = $("#radio0 label");
-	ok( inputs.is(":visible") );
-	ok( labels.is(":not(.ui-button)") );
-	inputs.button();
-	inputs.each(function() {
-		assert.hasClasses( this, "ui-helper-hidden-accessible" );
-	});
-	labels.each(function() {
-		assert.hasClasses( this, "ui-button" );
-	});
-});
-
-test("radio groups", function( assert ) {
-	expect( 12 );
-
-	function assertClasses(noForm, form1, form2) {
-		assert.hasClasses( $("#radio0 .ui-button" + noForm ), "ui-state-active" );
-		assert.hasClasses( $("#radio1 .ui-button" + form1 ), "ui-state-active" );
-		assert.hasClasses( $("#radio2 .ui-button" + form2 ), "ui-state-active" );
-	}
-
-	$("input[type=radio]").button();
-	assertClasses(":eq(0)", ":eq(1)", ":eq(2)");
-
-	// click outside of forms
-	$("#radio0 .ui-button:eq(1)").click();
-	assertClasses(":eq(1)", ":eq(1)", ":eq(2)");
-
-	// click in first form
-	$("#radio1 .ui-button:eq(0)").click();
-	assertClasses(":eq(1)", ":eq(0)", ":eq(2)");
-
-	// click in second form
-	$("#radio2 .ui-button:eq(0)").click();
-	assertClasses(":eq(1)", ":eq(0)", ":eq(0)");
-});
-
-test( "radio groups - ignore elements with same name", function() {
-	expect( 1 );
-	var form = $( "form:first" ),
-		radios = form.find( "[type=radio]" ).button(),
-		checkbox = $( "<input>", {
-			type: "checkbox",
-			name: radios.attr( "name" )
-		});
-
-	form.append( checkbox );
-	radios.button( "refresh" );
-	ok( true, "no exception from accessing button instance of checkbox" );
-});
-
-test("input type submit, don't create child elements", function() {
-	expect( 2 );
-	var input = $("#submit");
-	deepEqual( input.children().length, 0 );
-	input.button();
-	deepEqual( input.children().length, 0 );
-});
-
-test("buttonset", function( assert ) {
-	expect( 6 );
-	var set = $("#radio1").buttonset();
-	assert.hasClasses( set, "ui-buttonset" );
-	deepEqual( set.children(".ui-button").length, 3 );
-	deepEqual( set.children("input[type=radio].ui-helper-hidden-accessible").length, 3 );
-	ok( set.children("label:eq(0)").is(".ui-button.ui-corner-left:not(.ui-corner-all)") );
-	ok( set.children("label:eq(1)").is(".ui-button:not(.ui-corner-all)") );
-	ok( set.children("label:eq(2)").is(".ui-button.ui-corner-right:not(.ui-corner-all)") );
-});
-
-test("buttonset (rtl)", function( assert ) {
-	expect( 6 );
-	var set,
-		parent = $("#radio1").parent();
-	// Set to rtl
-	parent.attr("dir", "rtl");
-
-	set = $("#radio1").buttonset();
-	assert.hasClasses( set, "ui-buttonset" );
-	deepEqual( set.children(".ui-button").length, 3 );
-	deepEqual( set.children("input[type=radio].ui-helper-hidden-accessible").length, 3 );
-	ok( set.children("label:eq(0)").is(".ui-button.ui-corner-right:not(.ui-corner-all)") );
-	ok( set.children("label:eq(1)").is(".ui-button:not(.ui-corner-all)") );
-	ok( set.children("label:eq(2)").is(".ui-button.ui-corner-left:not(.ui-corner-all)") );
-});
-
-// TODO: simulated click events don't behave like real click events in IE
-// remove this when simulate properly simulates this
-// see http://yuilibrary.com/projects/yui2/ticket/2528826 fore more info
-if ( !$.ui.ie || ( document.documentMode && document.documentMode > 8 ) ) {
-	asyncTest( "ensure checked and aria after single click on checkbox label button, see #5518", function( assert ) {
-		expect( 3 );
-
-		$("#check2").button().change( function() {
-			var lbl = $( this ).button("widget");
-			ok( this.checked, "checked ok" );
-			ok( lbl.attr("aria-pressed") === "true", "aria ok" );
-			assert.hasClasses( lbl, "ui-state-active" );
-		});
-
-		// support: Opera
-		// Opera doesn't trigger a change event when this is done synchronously.
-		// This seems to be a side effect of another test, but until that can be
-		// tracked down, this delay will have to do.
-		setTimeout(function() {
-			$("#check2").button("widget").simulate("click");
-			start();
-		}, 1 );
-	});
-}
-
-test( "#7092 - button creation that requires a matching label does not find label in all cases", function( assert ) {
-	expect( 5 );
-	var group = $( "<span><label for='t7092a'></label><input type='checkbox' id='t7092a'></span>" );
-	group.find( "input[type=checkbox]" ).button();
-	assert.hasClasses( group.find( "label" ), "ui-button" );
-
-	group = $( "<input type='checkbox' id='t7092b'><label for='t7092b'></label>" );
-	group.filter( "input[type=checkbox]" ).button();
-	assert.hasClasses( group.filter( "label" ), "ui-button" );
-
-	group = $( "<span><input type='checkbox' id='t7092c'></span><label for='t7092c'></label>" );
-	group.find( "input[type=checkbox]" ).button();
-	assert.hasClasses( group.filter( "label" ), "ui-button" );
-
-	group = $( "<span><input type='checkbox' id='t7092d'></span><span><label for='t7092d'></label></span>" );
-	group.find( "input[type=checkbox]" ).button();
-	assert.hasClasses( group.find( "label" ), "ui-button" );
-
-	group = $( "<input type='checkbox' id='t7092e'><span><label for='t7092e'></label></span>" );
-	group.filter( "input[type=checkbox]" ).button();
-	assert.hasClasses( group.find( "label" ), "ui-button" );
-});
-
-test( "#5946 - buttonset should ignore buttons that are not :visible", function( assert ) {
-	expect( 2 );
-	$( "#radio01" ).next().addBack().hide();
-	var set = $( "#radio0" ).buttonset({ items: "input[type=radio]:visible" });
-	ok( set.find( "label:eq(0)" ).is( ":not(.ui-button):not(.ui-corner-left)" ) );
-	assert.hasClasses( set.find( "label:eq(1)" ), "ui-button ui-corner-left" );
-});
-
-test( "#6262 - buttonset not applying ui-corner to invisible elements", function( assert ) {
-	expect( 3 );
-	$( "#radio0" ).hide();
-	var set = $( "#radio0" ).buttonset();
-	assert.hasClasses( set.find( "label:eq(0)" ), "ui-button ui-corner-left" );
-	assert.hasClasses( set.find( "label:eq(1)" ), "ui-button" );
-	assert.hasClasses( set.find( "label:eq(2)" ), "ui-button ui-corner-right" );
-
-});
-
-asyncTest( "Resetting a button's form should refresh the visual state of the button widget to match.", function( assert ) {
-	expect( 2 );
-	var form = $( "<form>" +
-		"<button></button>" +
-		"<label for='c1'></label><input id='c1' type='checkbox' checked>" +
-		"</form>" ),
-		button = form.find( "button" ).button(),
-		checkbox = form.find( "input[type=checkbox]" ).button();
-
-	checkbox.prop( "checked", false ).button( "refresh" );
-	assert.lacksClasses( checkbox.button( "widget" ), "ui-state-active" );
-
-	form.get( 0 ).reset();
-
-	// #9213: If a button has been removed, refresh should not be called on it when
-	// its corresponding form is reset.
-	button.remove();
-
-	setTimeout(function() {
-		assert.hasClasses( checkbox.button( "widget" ), "ui-state-active" );
-		start();
-	}, 1 );
-});
-
-asyncTest( "#6711 Checkbox/Radiobutton do not Show Focused State when using Keyboard Navigation", function( assert ) {
-	expect( 2 );
-	var check = $( "#check" ).button(),
-		label = $( "label[for='check']" );
-	assert.lacksClasses( label, "ui-state-focus" );
-	check.focus();
-	setTimeout(function() {
-		assert.hasClasses( label, "ui-state-focus" );
-		start();
-	});
-});
-
-test( "#7534 - Button label selector works for ids with \":\"", function( assert ) {
-	expect( 1 );
-	var group = $( "<span><input type='checkbox' id='check:7534'><label for='check:7534'>Label</label></span>" );
-	group.find( "input" ).button();
-	assert.hasClasses( group.find( "label" ), "ui-button" , "Found an id with a :" );
-});
-
-asyncTest( "#9169 - Disabled button maintains ui-state-focus", function( assert ) {
-	expect( 2 );
-	var element = $( "#button1" ).button();
-	element[ 0 ].focus();
-	setTimeout(function() {
-		assert.hasClasses( element, "ui-state-focus" );
-		element.button( "disable" );
-		assert.lacksClasses( element, "ui-state-focus",
-			"button does not have ui-state-focus when disabled" );
-		start();
-	});
-});
-
-} );
diff --git a/tests/unit/button/button_events.js b/tests/unit/button/button_events.js
deleted file mode 100644
index ec930077c..000000000
--- a/tests/unit/button/button_events.js
+++ /dev/null
@@ -1,36 +0,0 @@
-define( [
-	"jquery",
-	"ui/button"
-], function( $ ) {
-
-module("button: events");
-
-test("buttonset works with single-quote named elements (#7505)", function() {
-	expect( 1 );
-	$("#radio3").buttonset();
-	$("#radio33").click( function(){
-		ok( true, "button clicks work with single-quote named elements" );
-	}).click();
-});
-
-asyncTest( "when button loses focus, ensure active state is removed (#8559)", function( assert ) {
-	expect( 1 );
-
-	var element = $( "#button" ).button();
-
-	element.one( "keypress", function() {
-		element.one( "blur", function() {
-			assert.lacksClasses( element, "ui-state-active", "button loses active state appropriately" );
-			start();
-		}).blur();
-	});
-
-	element.focus();
-	setTimeout(function() {
-		element
-			.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } )
-			.simulate( "keypress", { keyCode: $.ui.keyCode.ENTER } );
-	});
-});
-
-} );
diff --git a/tests/unit/button/button_methods.js b/tests/unit/button/button_methods.js
deleted file mode 100644
index be36096b2..000000000
--- a/tests/unit/button/button_methods.js
+++ /dev/null
@@ -1,73 +0,0 @@
-define( [
-	"jquery",
-	"ui/button"
-], function( $ ) {
-
-module("button: methods");
-
-test("destroy", function( assert ) {
-	expect( 1 );
-	assert.domEqual( "#button", function() {
-		$( "#button" ).button().button( "destroy" );
-	});
-});
-
-test( "refresh: Ensure disabled state is preserved correctly.", function() {
-	expect( 8 );
-
-	var element = $( "<a href='#'></a>" );
-	element.button({ disabled: true }).button( "refresh" );
-	ok( element.button( "option", "disabled" ), "Anchor button should remain disabled after refresh" ); //See #8237
-
-	element = $( "<div></div>" );
-	element.button({ disabled: true }).button( "refresh" );
-	ok( element.button( "option", "disabled" ), "<div> buttons should remain disabled after refresh" );
-
-	element = $( "<button></button>" );
-	element.button( { disabled: true} ).button( "refresh" );
-	ok( element.button( "option", "disabled" ), "<button> should remain disabled after refresh");
-
-	element = $( "<input type='checkbox'>" );
-	element.button( { disabled: true} ).button( "refresh" );
-	ok( element.button( "option", "disabled" ), "Checkboxes should remain disabled after refresh");
-
-	element = $( "<input type='radio'>" );
-	element.button( { disabled: true} ).button( "refresh" );
-	ok( element.button( "option", "disabled" ), "Radio buttons should remain disabled after refresh");
-
-	element = $( "<button></button>" );
-	element.button( { disabled: true} ).prop( "disabled", false ).button( "refresh" );
-	ok( !element.button( "option", "disabled" ), "Changing a <button>'s disabled property should update the state after refresh."); //See #8828
-
-	element = $( "<input type='checkbox'>" );
-	element.button( { disabled: true} ).prop( "disabled", false ).button( "refresh" );
-	ok( !element.button( "option", "disabled" ), "Changing a checkbox's disabled property should update the state after refresh.");
-
-	element = $( "<input type='radio'>" );
-	element.button( { disabled: true} ).prop( "disabled", false ).button( "refresh" );
-	ok( !element.button( "option", "disabled" ), "Changing a radio button's disabled property should update the state after refresh.");
-});
-
-// #8975
-test( "refresh: buttonset should turn added elements into button widgets", function() {
-	expect( 2 );
-	var radioButtonset = $( "#radio0" ).buttonset(),
-		checkboxButtonset = $( "#checkbox0" ).buttonset();
-
-	radioButtonset.append(
-		"<input type='radio' name='radio' id='radio04'>" +
-		"<label for='radio04'>Choice 4</label>"
-	);
-	checkboxButtonset.append(
-		"<input type='checkbox' name='checkbox' id='checkbox04'>" +
-		"<label for='checkbox04'>Choice 4</label>"
-	);
-
-	radioButtonset.buttonset( "refresh" );
-	checkboxButtonset.buttonset( "refresh" );
-
-	equal( radioButtonset.find( ":ui-button" ).length, 4, "radio" );
-	equal( checkboxButtonset.find( ":ui-button" ).length, 4, "checkbox" );
-});
-
-} );
diff --git a/tests/unit/button/button_options.js b/tests/unit/button/button_options.js
deleted file mode 100644
index 70470e671..000000000
--- a/tests/unit/button/button_options.js
+++ /dev/null
@@ -1,157 +0,0 @@
-define( [
-	"jquery",
-	"ui/button"
-], function( $ ) {
-
-module( "button: options" );
-
-test( "disabled, explicit value", function( assert ) {
-	expect( 7 );
-
-	var element = $( "#radio01" ).button({ disabled: false });
-	deepEqual( element.button( "option", "disabled" ), false, "disabled option set to false" );
-	deepEqual( element.prop( "disabled" ), false, "element is disabled" );
-
-	assert.lacksClasses( element.button( "widget" ), "ui-state-disabled ui-button-disabled" );
-
-	element = $( "#radio02" ).button({ disabled: true });
-
-	ok( !element.button( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
-	assert.hasClasses( element.button( "widget" ), "ui-button-disabled ui-state-disabled" );
-
-	deepEqual( element.button( "option", "disabled" ), true, "disabled option set to true" );
-	deepEqual( element.prop( "disabled" ), true, "element is not disabled" );
-});
-
-test("disabled, null", function() {
-	expect( 4 );
-	$("#radio01").button({ disabled: null });
-	deepEqual(false, $("#radio01").button("option", "disabled"),
-		"disabled option set to false");
-	deepEqual(false, $("#radio01").prop("disabled"), "element is disabled");
-
-	$("#radio02").prop("disabled", true).button({ disabled: null });
-	deepEqual(true, $("#radio02").button("option", "disabled"),
-		"disabled option set to true");
-	deepEqual(true, $("#radio02").prop("disabled"), "element is not disabled");
-});
-
-test( "disabled, ui-state-active is removed unless checkbox or radio", function( assert ) {
-	expect( 12 );
-	var elements = [
-		$( "<input type='button'>" ),
-		$( "<button></button>" ),
-		$( "<a></a>" ),
-		$( "<div></div>" ),
-		$( "<input type='checkbox' id='checkbox' checked><label for='checkbox'></label>" ),
-		$( "<input type='radio' id='radio' checked><label for='radio'></label>" )
-	];
-
-	$.each( elements, function() {
-		var element = $( this ).first().button(),
-			buttonElement = element.button( "widget" ),
-			elementType = element.prop( "nodeName" ).toLowerCase();
-
-		if ( element.is( "input" ) ) {
-			elementType += ":" + element.attr( "type" );
-		}
-
-		element.trigger( "mousedown" );
-		assert.hasClasses( buttonElement, "ui-state-active",
-			"[" + elementType + "] has ui-state-active class after mousedown." );
-
-		element.button( "disable" );
-		if ( element.is( "[type=checkbox], [type=radio]" ) ) {
-		assert.hasClasses( buttonElement, "ui-state-active",
-				"Disabled [" + elementType + "] has ui-state-active class." );
-		} else {
-			assert.lacksClasses( buttonElement, "ui-state-active",
-				"Disabled [" + elementType + "] does not have ui-state-active class." );
-		}
-	});
-});
-
-test("text false without icon", function() {
-	expect( 1 );
-	$("#button").button({
-		text: false
-	});
-	ok( $("#button").is(".ui-button-text-only:not(.ui-button-icon-only)") );
-
-	$("#button").button("destroy");
-});
-
-test("text false with icon", function() {
-	expect( 1 );
-	$("#button").button({
-		text: false,
-		icons: {
-			primary: "iconclass"
-		}
-	});
-	ok( $("#button").is(".ui-button-icon-only:not(.ui-button-text):has(span.ui-icon.iconclass)") );
-
-	$("#button").button("destroy");
-});
-
-test("label, default", function() {
-	expect( 2 );
-	$("#button").button();
-	deepEqual( $("#button").text(), "Label" );
-	deepEqual( $( "#button").button( "option", "label" ), "Label" );
-
-	$("#button").button("destroy");
-});
-
-test("label", function() {
-	expect( 2 );
-	$("#button").button({
-		label: "xxx"
-	});
-	deepEqual( $("#button").text(), "xxx" );
-	deepEqual( $("#button").button( "option", "label" ), "xxx" );
-
-	$("#button").button("destroy");
-});
-
-test("label default with input type submit", function() {
-	expect( 2 );
-	deepEqual( $("#submit").button().val(), "Label" );
-	deepEqual( $("#submit").button( "option", "label" ), "Label" );
-});
-
-test("label with input type submit", function() {
-	expect( 2 );
-	var label = $("#submit").button({
-		label: "xxx"
-	}).val();
-	deepEqual( label, "xxx" );
-	deepEqual( $("#submit").button( "option", "label" ), "xxx" );
-});
-
-test("icons", function() {
-	expect( 1 );
-	$("#button").button({
-		text: false,
-		icons: {
-			primary: "iconclass",
-			secondary: "iconclass2"
-		}
-	});
-	ok( $("#button").is(":has(span.ui-icon.ui-button-icon-primary.iconclass):has(span.ui-icon.ui-button-icon-secondary.iconclass2)") );
-
-	$("#button").button("destroy");
-});
-
-test( "#5295 - button does not remove hoverstate if disabled" , function( assert ) {
-	expect( 1 );
-	var btn = $("#button").button();
-	btn.hover( function() {
-		btn.button( "disable" );
-	});
-	btn.trigger( "mouseenter" );
-	btn.trigger( "mouseleave" );
-	assert.lacksClasses( btn, "ui-state-hover" );
-});
-
-} );
diff --git a/tests/unit/button/common.js b/tests/unit/button/common.js
new file mode 100644
index 000000000..d376f4f05
--- /dev/null
+++ b/tests/unit/button/common.js
@@ -0,0 +1,22 @@
+define( [
+	"lib/common",
+	"ui/button"
+], function( common ) {
+
+common.testWidget( "button", {
+	defaults: {
+		classes: {},
+		disabled: null,
+		icons: {
+			primary: null,
+			secondary: null
+		},
+		label: null,
+		text: true,
+
+		// callbacks
+		create: null
+	}
+});
+
+} );
diff --git a/tests/unit/button/core.js b/tests/unit/button/core.js
new file mode 100644
index 000000000..4bc8d9fe5
--- /dev/null
+++ b/tests/unit/button/core.js
@@ -0,0 +1,230 @@
+define( [
+	"jquery",
+	"ui/button"
+], function( $ ) {
+
+module("button: core");
+
+test("checkbox", function( assert ) {
+	expect( 4 );
+	var input = $("#check"),
+		label = $("label[for=check]");
+	ok( input.is(":visible") );
+	ok( label.is(":not(.ui-button)") );
+	input.button();
+	assert.hasClasses( input, "ui-helper-hidden-accessible" );
+	assert.hasClasses( label, "ui-button" );
+});
+
+test("radios", function( assert ) {
+	expect( 8 );
+	var inputs = $("#radio0 input"),
+		labels = $("#radio0 label");
+	ok( inputs.is(":visible") );
+	ok( labels.is(":not(.ui-button)") );
+	inputs.button();
+	inputs.each(function() {
+		assert.hasClasses( this, "ui-helper-hidden-accessible" );
+	});
+	labels.each(function() {
+		assert.hasClasses( this, "ui-button" );
+	});
+});
+
+test("radio groups", function( assert ) {
+	expect( 12 );
+
+	function assertClasses(noForm, form1, form2) {
+		assert.hasClasses( $("#radio0 .ui-button" + noForm ), "ui-state-active" );
+		assert.hasClasses( $("#radio1 .ui-button" + form1 ), "ui-state-active" );
+		assert.hasClasses( $("#radio2 .ui-button" + form2 ), "ui-state-active" );
+	}
+
+	$("input[type=radio]").button();
+	assertClasses(":eq(0)", ":eq(1)", ":eq(2)");
+
+	// click outside of forms
+	$("#radio0 .ui-button:eq(1)").click();
+	assertClasses(":eq(1)", ":eq(1)", ":eq(2)");
+
+	// click in first form
+	$("#radio1 .ui-button:eq(0)").click();
+	assertClasses(":eq(1)", ":eq(0)", ":eq(2)");
+
+	// click in second form
+	$("#radio2 .ui-button:eq(0)").click();
+	assertClasses(":eq(1)", ":eq(0)", ":eq(0)");
+});
+
+test( "radio groups - ignore elements with same name", function() {
+	expect( 1 );
+	var form = $( "form:first" ),
+		radios = form.find( "[type=radio]" ).button(),
+		checkbox = $( "<input>", {
+			type: "checkbox",
+			name: radios.attr( "name" )
+		});
+
+	form.append( checkbox );
+	radios.button( "refresh" );
+	ok( true, "no exception from accessing button instance of checkbox" );
+});
+
+test("input type submit, don't create child elements", function() {
+	expect( 2 );
+	var input = $("#submit");
+	deepEqual( input.children().length, 0 );
+	input.button();
+	deepEqual( input.children().length, 0 );
+});
+
+test("buttonset", function( assert ) {
+	expect( 6 );
+	var set = $("#radio1").buttonset();
+	assert.hasClasses( set, "ui-buttonset" );
+	deepEqual( set.children(".ui-button").length, 3 );
+	deepEqual( set.children("input[type=radio].ui-helper-hidden-accessible").length, 3 );
+	ok( set.children("label:eq(0)").is(".ui-button.ui-corner-left:not(.ui-corner-all)") );
+	ok( set.children("label:eq(1)").is(".ui-button:not(.ui-corner-all)") );
+	ok( set.children("label:eq(2)").is(".ui-button.ui-corner-right:not(.ui-corner-all)") );
+});
+
+test("buttonset (rtl)", function( assert ) {
+	expect( 6 );
+	var set,
+		parent = $("#radio1").parent();
+	// Set to rtl
+	parent.attr("dir", "rtl");
+
+	set = $("#radio1").buttonset();
+	assert.hasClasses( set, "ui-buttonset" );
+	deepEqual( set.children(".ui-button").length, 3 );
+	deepEqual( set.children("input[type=radio].ui-helper-hidden-accessible").length, 3 );
+	ok( set.children("label:eq(0)").is(".ui-button.ui-corner-right:not(.ui-corner-all)") );
+	ok( set.children("label:eq(1)").is(".ui-button:not(.ui-corner-all)") );
+	ok( set.children("label:eq(2)").is(".ui-button.ui-corner-left:not(.ui-corner-all)") );
+});
+
+// TODO: simulated click events don't behave like real click events in IE
+// remove this when simulate properly simulates this
+// see http://yuilibrary.com/projects/yui2/ticket/2528826 fore more info
+if ( !$.ui.ie || ( document.documentMode && document.documentMode > 8 ) ) {
+	asyncTest( "ensure checked and aria after single click on checkbox label button, see #5518", function( assert ) {
+		expect( 3 );
+
+		$("#check2").button().change( function() {
+			var lbl = $( this ).button("widget");
+			ok( this.checked, "checked ok" );
+			ok( lbl.attr("aria-pressed") === "true", "aria ok" );
+			assert.hasClasses( lbl, "ui-state-active" );
+		});
+
+		// support: Opera
+		// Opera doesn't trigger a change event when this is done synchronously.
+		// This seems to be a side effect of another test, but until that can be
+		// tracked down, this delay will have to do.
+		setTimeout(function() {
+			$("#check2").button("widget").simulate("click");
+			start();
+		}, 1 );
+	});
+}
+
+test( "#7092 - button creation that requires a matching label does not find label in all cases", function( assert ) {
+	expect( 5 );
+	var group = $( "<span><label for='t7092a'></label><input type='checkbox' id='t7092a'></span>" );
+	group.find( "input[type=checkbox]" ).button();
+	assert.hasClasses( group.find( "label" ), "ui-button" );
+
+	group = $( "<input type='checkbox' id='t7092b'><label for='t7092b'></label>" );
+	group.filter( "input[type=checkbox]" ).button();
+	assert.hasClasses( group.filter( "label" ), "ui-button" );
+
+	group = $( "<span><input type='checkbox' id='t7092c'></span><label for='t7092c'></label>" );
+	group.find( "input[type=checkbox]" ).button();
+	assert.hasClasses( group.filter( "label" ), "ui-button" );
+
+	group = $( "<span><input type='checkbox' id='t7092d'></span><span><label for='t7092d'></label></span>" );
+	group.find( "input[type=checkbox]" ).button();
+	assert.hasClasses( group.find( "label" ), "ui-button" );
+
+	group = $( "<input type='checkbox' id='t7092e'><span><label for='t7092e'></label></span>" );
+	group.filter( "input[type=checkbox]" ).button();
+	assert.hasClasses( group.find( "label" ), "ui-button" );
+});
+
+test( "#5946 - buttonset should ignore buttons that are not :visible", function( assert ) {
+	expect( 2 );
+	$( "#radio01" ).next().addBack().hide();
+	var set = $( "#radio0" ).buttonset({ items: "input[type=radio]:visible" });
+	ok( set.find( "label:eq(0)" ).is( ":not(.ui-button):not(.ui-corner-left)" ) );
+	assert.hasClasses( set.find( "label:eq(1)" ), "ui-button ui-corner-left" );
+});
+
+test( "#6262 - buttonset not applying ui-corner to invisible elements", function( assert ) {
+	expect( 3 );
+	$( "#radio0" ).hide();
+	var set = $( "#radio0" ).buttonset();
+	assert.hasClasses( set.find( "label:eq(0)" ), "ui-button ui-corner-left" );
+	assert.hasClasses( set.find( "label:eq(1)" ), "ui-button" );
+	assert.hasClasses( set.find( "label:eq(2)" ), "ui-button ui-corner-right" );
+
+});
+
+asyncTest( "Resetting a button's form should refresh the visual state of the button widget to match.", function( assert ) {
+	expect( 2 );
+	var form = $( "<form>" +
+		"<button></button>" +
+		"<label for='c1'></label><input id='c1' type='checkbox' checked>" +
+		"</form>" ),
+		button = form.find( "button" ).button(),
+		checkbox = form.find( "input[type=checkbox]" ).button();
+
+	checkbox.prop( "checked", false ).button( "refresh" );
+	assert.lacksClasses( checkbox.button( "widget" ), "ui-state-active" );
+
+	form.get( 0 ).reset();
+
+	// #9213: If a button has been removed, refresh should not be called on it when
+	// its corresponding form is reset.
+	button.remove();
+
+	setTimeout(function() {
+		assert.hasClasses( checkbox.button( "widget" ), "ui-state-active" );
+		start();
+	}, 1 );
+});
+
+asyncTest( "#6711 Checkbox/Radiobutton do not Show Focused State when using Keyboard Navigation", function( assert ) {
+	expect( 2 );
+	var check = $( "#check" ).button(),
+		label = $( "label[for='check']" );
+	assert.lacksClasses( label, "ui-state-focus" );
+	check.focus();
+	setTimeout(function() {
+		assert.hasClasses( label, "ui-state-focus" );
+		start();
+	});
+});
+
+test( "#7534 - Button label selector works for ids with \":\"", function( assert ) {
+	expect( 1 );
+	var group = $( "<span><input type='checkbox' id='check:7534'><label for='check:7534'>Label</label></span>" );
+	group.find( "input" ).button();
+	assert.hasClasses( group.find( "label" ), "ui-button" , "Found an id with a :" );
+});
+
+asyncTest( "#9169 - Disabled button maintains ui-state-focus", function( assert ) {
+	expect( 2 );
+	var element = $( "#button1" ).button();
+	element[ 0 ].focus();
+	setTimeout(function() {
+		assert.hasClasses( element, "ui-state-focus" );
+		element.button( "disable" );
+		assert.lacksClasses( element, "ui-state-focus",
+			"button does not have ui-state-focus when disabled" );
+		start();
+	});
+});
+
+} );
diff --git a/tests/unit/button/events.js b/tests/unit/button/events.js
new file mode 100644
index 000000000..ec930077c
--- /dev/null
+++ b/tests/unit/button/events.js
@@ -0,0 +1,36 @@
+define( [
+	"jquery",
+	"ui/button"
+], function( $ ) {
+
+module("button: events");
+
+test("buttonset works with single-quote named elements (#7505)", function() {
+	expect( 1 );
+	$("#radio3").buttonset();
+	$("#radio33").click( function(){
+		ok( true, "button clicks work with single-quote named elements" );
+	}).click();
+});
+
+asyncTest( "when button loses focus, ensure active state is removed (#8559)", function( assert ) {
+	expect( 1 );
+
+	var element = $( "#button" ).button();
+
+	element.one( "keypress", function() {
+		element.one( "blur", function() {
+			assert.lacksClasses( element, "ui-state-active", "button loses active state appropriately" );
+			start();
+		}).blur();
+	});
+
+	element.focus();
+	setTimeout(function() {
+		element
+			.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } )
+			.simulate( "keypress", { keyCode: $.ui.keyCode.ENTER } );
+	});
+});
+
+} );
diff --git a/tests/unit/button/methods.js b/tests/unit/button/methods.js
new file mode 100644
index 000000000..be36096b2
--- /dev/null
+++ b/tests/unit/button/methods.js
@@ -0,0 +1,73 @@
+define( [
+	"jquery",
+	"ui/button"
+], function( $ ) {
+
+module("button: methods");
+
+test("destroy", function( assert ) {
+	expect( 1 );
+	assert.domEqual( "#button", function() {
+		$( "#button" ).button().button( "destroy" );
+	});
+});
+
+test( "refresh: Ensure disabled state is preserved correctly.", function() {
+	expect( 8 );
+
+	var element = $( "<a href='#'></a>" );
+	element.button({ disabled: true }).button( "refresh" );
+	ok( element.button( "option", "disabled" ), "Anchor button should remain disabled after refresh" ); //See #8237
+
+	element = $( "<div></div>" );
+	element.button({ disabled: true }).button( "refresh" );
+	ok( element.button( "option", "disabled" ), "<div> buttons should remain disabled after refresh" );
+
+	element = $( "<button></button>" );
+	element.button( { disabled: true} ).button( "refresh" );
+	ok( element.button( "option", "disabled" ), "<button> should remain disabled after refresh");
+
+	element = $( "<input type='checkbox'>" );
+	element.button( { disabled: true} ).button( "refresh" );
+	ok( element.button( "option", "disabled" ), "Checkboxes should remain disabled after refresh");
+
+	element = $( "<input type='radio'>" );
+	element.button( { disabled: true} ).button( "refresh" );
+	ok( element.button( "option", "disabled" ), "Radio buttons should remain disabled after refresh");
+
+	element = $( "<button></button>" );
+	element.button( { disabled: true} ).prop( "disabled", false ).button( "refresh" );
+	ok( !element.button( "option", "disabled" ), "Changing a <button>'s disabled property should update the state after refresh."); //See #8828
+
+	element = $( "<input type='checkbox'>" );
+	element.button( { disabled: true} ).prop( "disabled", false ).button( "refresh" );
+	ok( !element.button( "option", "disabled" ), "Changing a checkbox's disabled property should update the state after refresh.");
+
+	element = $( "<input type='radio'>" );
+	element.button( { disabled: true} ).prop( "disabled", false ).button( "refresh" );
+	ok( !element.button( "option", "disabled" ), "Changing a radio button's disabled property should update the state after refresh.");
+});
+
+// #8975
+test( "refresh: buttonset should turn added elements into button widgets", function() {
+	expect( 2 );
+	var radioButtonset = $( "#radio0" ).buttonset(),
+		checkboxButtonset = $( "#checkbox0" ).buttonset();
+
+	radioButtonset.append(
+		"<input type='radio' name='radio' id='radio04'>" +
+		"<label for='radio04'>Choice 4</label>"
+	);
+	checkboxButtonset.append(
+		"<input type='checkbox' name='checkbox' id='checkbox04'>" +
+		"<label for='checkbox04'>Choice 4</label>"
+	);
+
+	radioButtonset.buttonset( "refresh" );
+	checkboxButtonset.buttonset( "refresh" );
+
+	equal( radioButtonset.find( ":ui-button" ).length, 4, "radio" );
+	equal( checkboxButtonset.find( ":ui-button" ).length, 4, "checkbox" );
+});
+
+} );
diff --git a/tests/unit/button/options.js b/tests/unit/button/options.js
new file mode 100644
index 000000000..70470e671
--- /dev/null
+++ b/tests/unit/button/options.js
@@ -0,0 +1,157 @@
+define( [
+	"jquery",
+	"ui/button"
+], function( $ ) {
+
+module( "button: options" );
+
+test( "disabled, explicit value", function( assert ) {
+	expect( 7 );
+
+	var element = $( "#radio01" ).button({ disabled: false });
+	deepEqual( element.button( "option", "disabled" ), false, "disabled option set to false" );
+	deepEqual( element.prop( "disabled" ), false, "element is disabled" );
+
+	assert.lacksClasses( element.button( "widget" ), "ui-state-disabled ui-button-disabled" );
+
+	element = $( "#radio02" ).button({ disabled: true });
+
+	ok( !element.button( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
+	assert.hasClasses( element.button( "widget" ), "ui-button-disabled ui-state-disabled" );
+
+	deepEqual( element.button( "option", "disabled" ), true, "disabled option set to true" );
+	deepEqual( element.prop( "disabled" ), true, "element is not disabled" );
+});
+
+test("disabled, null", function() {
+	expect( 4 );
+	$("#radio01").button({ disabled: null });
+	deepEqual(false, $("#radio01").button("option", "disabled"),
+		"disabled option set to false");
+	deepEqual(false, $("#radio01").prop("disabled"), "element is disabled");
+
+	$("#radio02").prop("disabled", true).button({ disabled: null });
+	deepEqual(true, $("#radio02").button("option", "disabled"),
+		"disabled option set to true");
+	deepEqual(true, $("#radio02").prop("disabled"), "element is not disabled");
+});
+
+test( "disabled, ui-state-active is removed unless checkbox or radio", function( assert ) {
+	expect( 12 );
+	var elements = [
+		$( "<input type='button'>" ),
+		$( "<button></button>" ),
+		$( "<a></a>" ),
+		$( "<div></div>" ),
+		$( "<input type='checkbox' id='checkbox' checked><label for='checkbox'></label>" ),
+		$( "<input type='radio' id='radio' checked><label for='radio'></label>" )
+	];
+
+	$.each( elements, function() {
+		var element = $( this ).first().button(),
+			buttonElement = element.button( "widget" ),
+			elementType = element.prop( "nodeName" ).toLowerCase();
+
+		if ( element.is( "input" ) ) {
+			elementType += ":" + element.attr( "type" );
+		}
+
+		element.trigger( "mousedown" );
+		assert.hasClasses( buttonElement, "ui-state-active",
+			"[" + elementType + "] has ui-state-active class after mousedown." );
+
+		element.button( "disable" );
+		if ( element.is( "[type=checkbox], [type=radio]" ) ) {
+		assert.hasClasses( buttonElement, "ui-state-active",
+				"Disabled [" + elementType + "] has ui-state-active class." );
+		} else {
+			assert.lacksClasses( buttonElement, "ui-state-active",
+				"Disabled [" + elementType + "] does not have ui-state-active class." );
+		}
+	});
+});
+
+test("text false without icon", function() {
+	expect( 1 );
+	$("#button").button({
+		text: false
+	});
+	ok( $("#button").is(".ui-button-text-only:not(.ui-button-icon-only)") );
+
+	$("#button").button("destroy");
+});
+
+test("text false with icon", function() {
+	expect( 1 );
+	$("#button").button({
+		text: false,
+		icons: {
+			primary: "iconclass"
+		}
+	});
+	ok( $("#button").is(".ui-button-icon-only:not(.ui-button-text):has(span.ui-icon.iconclass)") );
+
+	$("#button").button("destroy");
+});
+
+test("label, default", function() {
+	expect( 2 );
+	$("#button").button();
+	deepEqual( $("#button").text(), "Label" );
+	deepEqual( $( "#button").button( "option", "label" ), "Label" );
+
+	$("#button").button("destroy");
+});
+
+test("label", function() {
+	expect( 2 );
+	$("#button").button({
+		label: "xxx"
+	});
+	deepEqual( $("#button").text(), "xxx" );
+	deepEqual( $("#button").button( "option", "label" ), "xxx" );
+
+	$("#button").button("destroy");
+});
+
+test("label default with input type submit", function() {
+	expect( 2 );
+	deepEqual( $("#submit").button().val(), "Label" );
+	deepEqual( $("#submit").button( "option", "label" ), "Label" );
+});
+
+test("label with input type submit", function() {
+	expect( 2 );
+	var label = $("#submit").button({
+		label: "xxx"
+	}).val();
+	deepEqual( label, "xxx" );
+	deepEqual( $("#submit").button( "option", "label" ), "xxx" );
+});
+
+test("icons", function() {
+	expect( 1 );
+	$("#button").button({
+		text: false,
+		icons: {
+			primary: "iconclass",
+			secondary: "iconclass2"
+		}
+	});
+	ok( $("#button").is(":has(span.ui-icon.ui-button-icon-primary.iconclass):has(span.ui-icon.ui-button-icon-secondary.iconclass2)") );
+
+	$("#button").button("destroy");
+});
+
+test( "#5295 - button does not remove hoverstate if disabled" , function( assert ) {
+	expect( 1 );
+	var btn = $("#button").button();
+	btn.hover( function() {
+		btn.button( "disable" );
+	});
+	btn.trigger( "mouseenter" );
+	btn.trigger( "mouseleave" );
+	assert.lacksClasses( btn, "ui-state-hover" );
+});
+
+} );
diff --git a/tests/unit/datepicker/common.js b/tests/unit/datepicker/common.js
new file mode 100644
index 000000000..1eecc85cb
--- /dev/null
+++ b/tests/unit/datepicker/common.js
@@ -0,0 +1,7 @@
+/*
+TestHelpers.commonWidgetTests( "datepicker", {
+	defaults: {
+		disabled: false
+	}
+});
+*/
diff --git a/tests/unit/datepicker/core.js b/tests/unit/datepicker/core.js
new file mode 100644
index 000000000..f6e0dd58f
--- /dev/null
+++ b/tests/unit/datepicker/core.js
@@ -0,0 +1,530 @@
+define( [
+	"jquery",
+	"lib/common",
+	"./helper",
+	"ui/datepicker",
+	"ui/i18n/datepicker-he"
+], function( $, common, testHelper ) {
+
+module( "datepicker: core", {
+	setup: function() {
+		$( "body" ).focus();
+	}
+});
+
+common.testJshint( "datepicker" );
+
+test("initialization - Reinitialization after body had been emptied.", function() {
+	expect( 1 );
+	var bodyContent = $("body").children(), inp = $("#inp");
+	$("#inp").datepicker();
+	$("body").empty().append(inp);
+	$("#inp").datepicker();
+	ok( $("#"+$.datepicker._mainDivId).length===1, "Datepicker container added" );
+	$("body").empty().append(bodyContent); // Returning to initial state for later tests
+});
+
+test( "widget method - empty collection", function() {
+	expect( 1 );
+	$( "#nonExist" ).datepicker(); // should create nothing
+	ok( !$( "#ui-datepicker-div" ).length, "Non init on empty collection" );
+});
+
+test("widget method", function() {
+	expect( 1 );
+	var actual = $("#inp").datepicker().datepicker("widget")[0];
+	deepEqual($("body > #ui-datepicker-div:last-child")[0], actual);
+});
+
+asyncTest( "baseStructure", function() {
+	expect( 58 );
+	var header, title, table, thead, week, panel, inl, child,
+		inp = testHelper.initNewInput(),
+		dp = $( "#ui-datepicker-div" );
+
+	function step1() {
+		testHelper.onFocus( inp, function() {
+			ok( dp.is( ":visible" ), "Structure - datepicker visible" );
+			ok( !dp.is( ".ui-datepicker-rtl" ), "Structure - not right-to-left" );
+			ok( !dp.is( ".ui-datepicker-multi" ), "Structure - not multi-month" );
+			equal( dp.children().length, 2, "Structure - child count" );
+
+			header = dp.children( ":first" );
+			ok( header.is( "div.ui-datepicker-header" ), "Structure - header division" );
+			equal( header.children().length, 3, "Structure - header child count" );
+			ok( header.children( ":first" ).is( "a.ui-datepicker-prev" ) && header.children( ":first" ).html() !== "", "Structure - prev link" );
+			ok( header.children( ":eq(1)" ).is( "a.ui-datepicker-next" ) && header.children( ":eq(1)" ).html() !== "", "Structure - next link" );
+
+			title = header.children( ":last" );
+			ok( title.is( "div.ui-datepicker-title" ) && title.html() !== "","Structure - title division" );
+			equal( title.children().length, 2, "Structure - title child count" );
+			ok( title.children( ":first" ).is( "span.ui-datepicker-month" ) && title.children( ":first" ).text() !== "", "Structure - month text" );
+			ok( title.children( ":last" ).is( "span.ui-datepicker-year" ) && title.children( ":last" ).text() !== "", "Structure - year text" );
+
+			table = dp.children( ":eq(1)" );
+			ok( table.is( "table.ui-datepicker-calendar" ), "Structure - month table" );
+			ok( table.children( ":first" ).is( "thead" ), "Structure - month table thead" );
+
+			thead = table.children( ":first" ).children( ":first" );
+			ok( thead.is( "tr" ), "Structure - month table title row" );
+			equal( thead.find( "th" ).length, 7, "Structure - month table title cells" );
+			ok( table.children( ":eq(1)" ).is( "tbody" ), "Structure - month table body" );
+			ok( table.children( ":eq(1)" ).children( "tr" ).length >= 4, "Structure - month table week count" );
+
+			week = table.children( ":eq(1)" ).children( ":first" );
+			ok( week.is( "tr" ), "Structure - month table week row" );
+			equal( week.children().length, 7, "Structure - week child count" );
+			ok( week.children( ":first" ).is( "td.ui-datepicker-week-end" ), "Structure - month table first day cell" );
+			ok( week.children( ":last" ).is( "td.ui-datepicker-week-end" ), "Structure - month table second day cell" );
+
+			inp.datepicker( "hide" ).datepicker( "destroy" );
+			step2();
+		});
+	}
+
+	function step2() {
+		// Editable month/year and button panel
+		inp = testHelper.initNewInput({
+			changeMonth: true,
+			changeYear: true,
+			showButtonPanel: true
+		});
+		testHelper.onFocus( inp, function() {
+			title = dp.find( "div.ui-datepicker-title" );
+			ok( title.children( ":first" ).is( "select.ui-datepicker-month" ), "Structure - month selector" );
+			ok( title.children( ":last" ).is( "select.ui-datepicker-year" ), "Structure - year selector" );
+
+			panel = dp.children( ":last" );
+			ok( panel.is( "div.ui-datepicker-buttonpane" ), "Structure - button panel division" );
+			equal( panel.children().length, 2, "Structure - button panel child count" );
+			ok( panel.children( ":first" ).is( "button.ui-datepicker-current" ), "Structure - today button" );
+			ok( panel.children( ":last" ).is( "button.ui-datepicker-close" ), "Structure - close button" );
+
+			inp.datepicker( "hide" ).datepicker( "destroy" );
+			step3();
+		});
+	}
+
+	function step3() {
+		// Multi-month 2
+		inp = testHelper.initNewInput({ numberOfMonths: 2 });
+		testHelper.onFocus( inp, function() {
+			ok( dp.is( ".ui-datepicker-multi" ), "Structure multi [2] - multi-month" );
+			equal( dp.children().length, 3, "Structure multi [2] - child count" );
+
+			child = dp.children( ":first" );
+			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure multi [2] - first month division" );
+
+			child = dp.children( ":eq(1)" );
+			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure multi [2] - second month division" );
+
+			child = dp.children( ":eq(2)" );
+			ok( child.is( "div.ui-datepicker-row-break" ), "Structure multi [2] - row break" );
+			ok( dp.is( ".ui-datepicker-multi-2" ), "Structure multi [2] - multi-2" );
+
+			inp.datepicker( "hide" ).datepicker( "destroy" );
+			step4();
+		});
+	}
+
+	function step4() {
+		// Multi-month 3
+		inp = testHelper.initNewInput({ numberOfMonths: 3 });
+		testHelper.onFocus( inp, function() {
+			ok( dp.is( ".ui-datepicker-multi-3" ), "Structure multi [3] - multi-3" );
+			ok( !dp.is( ".ui-datepicker-multi-2" ), "Structure multi [3] - Trac #6704" );
+
+			inp.datepicker( "hide" ).datepicker( "destroy" );
+			step5();
+		});
+	}
+
+	function step5() {
+		// Multi-month [2, 2]
+		inp = testHelper.initNewInput({ numberOfMonths: [ 2, 2 ] });
+		testHelper.onFocus( inp, function() {
+			ok( dp.is( ".ui-datepicker-multi" ), "Structure multi - multi-month" );
+			equal( dp.children().length, 6, "Structure multi [2,2] - child count" );
+
+			child = dp.children( ":first" );
+			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure multi [2,2] - first month division" );
+
+			child = dp.children( ":eq(1)" );
+			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure multi [2,2] - second month division" );
+
+			child = dp.children( ":eq(2)" );
+			ok( child.is( "div.ui-datepicker-row-break" ), "Structure multi [2,2] - row break" );
+
+			child = dp.children( ":eq(3)" );
+			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure multi [2,2] - third month division" );
+
+			child = dp.children( ":eq(4)" );
+			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure multi [2,2] - fourth month division" );
+
+			child = dp.children( ":eq(5)" );
+			ok( child.is( "div.ui-datepicker-row-break" ), "Structure multi [2,2] - row break" );
+
+			inp.datepicker( "hide" ).datepicker( "destroy" );
+
+			// Inline
+			inl = testHelper.init( "#inl" );
+			dp = inl.children();
+
+			ok( dp.is( ".ui-datepicker-inline" ), "Structure inline - main div" );
+			ok( !dp.is( ".ui-datepicker-rtl" ), "Structure inline - not right-to-left" );
+			ok( !dp.is( ".ui-datepicker-multi" ), "Structure inline - not multi-month" );
+			equal( dp.children().length, 2, "Structure inline - child count" );
+
+			header = dp.children( ":first" );
+			ok( header.is( "div.ui-datepicker-header" ), "Structure inline - header division" );
+			equal( header.children().length, 3, "Structure inline - header child count" );
+
+			table = dp.children( ":eq(1)" );
+			ok( table.is( "table.ui-datepicker-calendar" ), "Structure inline - month table" );
+			ok( table.children( ":first" ).is( "thead" ), "Structure inline - month table thead" );
+			ok( table.children( ":eq(1)" ).is( "tbody" ), "Structure inline - month table body" );
+
+			inl.datepicker( "destroy" );
+
+			// Inline multi-month
+			inl = testHelper.init( "#inl", { numberOfMonths: 2 } );
+			dp = inl.children();
+
+			ok( dp.is( ".ui-datepicker-inline" ) && dp.is( ".ui-datepicker-multi" ), "Structure inline multi - main div" );
+			equal( dp.children().length, 3, "Structure inline multi - child count" );
+
+			child = dp.children( ":first" );
+			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure inline multi - first month division" );
+
+			child = dp.children( ":eq(1)" );
+			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure inline multi - second month division" );
+
+			child = dp.children( ":eq(2)" );
+			ok( child.is( "div.ui-datepicker-row-break" ), "Structure inline multi - row break" );
+
+			inl.datepicker( "destroy" );
+			start();
+		});
+	}
+
+	step1();
+});
+
+asyncTest( "customStructure", function() {
+	expect( 20 );
+	var header, panel, title, thead,
+		inp = testHelper.initNewInput( $.datepicker.regional.he ),
+		dp = $( "#ui-datepicker-div" );
+
+	function step1() {
+		inp.datepicker( "option", "showButtonPanel", true );
+
+		testHelper.onFocus( inp, function() {
+			ok( dp.is( ".ui-datepicker-rtl" ), "Structure RTL - right-to-left" );
+
+			header = dp.children( ":first" );
+			ok( header.is( "div.ui-datepicker-header" ), "Structure RTL - header division" );
+			equal( header.children().length, 3, "Structure RTL - header child count" );
+			ok( header.children( ":first" ).is( "a.ui-datepicker-next" ), "Structure RTL - prev link" );
+			ok( header.children( ":eq(1)" ).is( "a.ui-datepicker-prev" ), "Structure RTL - next link" );
+
+			panel = dp.children( ":last" );
+			ok( panel.is( "div.ui-datepicker-buttonpane" ), "Structure RTL - button division" );
+			equal( panel.children().length, 2, "Structure RTL - button panel child count" );
+			ok( panel.children( ":first" ).is( "button.ui-datepicker-close" ), "Structure RTL - close button" );
+			ok( panel.children( ":last" ).is( "button.ui-datepicker-current" ), "Structure RTL - today button" );
+
+			inp.datepicker( "hide" ).datepicker( "destroy" );
+			step2();
+		});
+	}
+
+	// Hide prev/next
+	function step2() {
+		inp = testHelper.initNewInput({
+			hideIfNoPrevNext: true,
+			minDate: new Date( 2008, 2 - 1, 4 ),
+			maxDate: new Date( 2008, 2 - 1, 14 )
+		});
+		inp.val( "02/10/2008" );
+
+		testHelper.onFocus( inp, function() {
+			header = dp.children( ":first" );
+			ok( header.is( "div.ui-datepicker-header" ), "Structure hide prev/next - header division" );
+			equal( header.children().length, 1, "Structure hide prev/next - links child count" );
+			ok( header.children( ":first" ).is( "div.ui-datepicker-title" ), "Structure hide prev/next - title division" );
+
+			inp.datepicker( "hide" ).datepicker( "destroy" );
+			step3();
+		});
+	}
+
+	// Changeable Month with read-only year
+	function step3() {
+		inp = testHelper.initNewInput({ changeMonth: true });
+
+		testHelper.onFocus( inp, function() {
+			title = dp.children( ":first" ).children( ":last" );
+			equal( title.children().length, 2, "Structure changeable month - title child count" );
+			ok( title.children( ":first" ).is( "select.ui-datepicker-month" ), "Structure changeable month - month selector" );
+			ok( title.children( ":last" ).is( "span.ui-datepicker-year" ), "Structure changeable month - read-only year" );
+
+			inp.datepicker( "hide" ).datepicker( "destroy" );
+			step4();
+		});
+	}
+
+	// Changeable year with read-only month
+	function step4() {
+		inp = testHelper.initNewInput({ changeYear: true });
+
+		testHelper.onFocus( inp, function() {
+			title = dp.children( ":first" ).children( ":last" );
+			equal( title.children().length, 2, "Structure changeable year - title child count" );
+			ok( title.children( ":first" ).is( "span.ui-datepicker-month" ), "Structure changeable year - read-only month" );
+			ok( title.children( ":last" ).is( "select.ui-datepicker-year" ), "Structure changeable year - year selector" );
+
+			inp.datepicker( "hide" ).datepicker( "destroy" );
+			step5();
+		});
+	}
+
+	// Read-only first day of week
+	function step5() {
+		inp = testHelper.initNewInput({ changeFirstDay: false });
+
+		testHelper.onFocus( inp, function() {
+			thead = dp.find( ".ui-datepicker-calendar thead tr" );
+			equal( thead.children().length, 7, "Structure read-only first day - thead child count" );
+			equal( thead.find( "a" ).length, 0, "Structure read-only first day - thead links count" );
+
+			inp.datepicker( "hide" ).datepicker( "destroy" );
+			start();
+		});
+	}
+
+	// TODO: figure out why this setTimeout is needed in IE,
+	// it only is necessary when the previous baseStructure tests runs first
+	// Support: IE
+	setTimeout( step1 );
+});
+
+test("keystrokes", function() {
+	expect( 26 );
+	var inp = testHelper.init("#inp"),
+		date = new Date();
+	inp.val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke enter");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
+		"Keystroke enter - preset");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+home");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
+	ok(inp.datepicker("getDate") == null, "Keystroke ctrl+end");
+	inp.val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+	ok(inp.datepicker("getDate") == null, "Keystroke esc");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
+		"Keystroke esc - preset");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
+		"Keystroke esc - abandoned");
+	// Moving by day or week
+	inp.val("").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.LEFT}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() - 1);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+left");
+	inp.val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.LEFT}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() + 1);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke left");
+	inp.val("").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.RIGHT}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() + 1);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+right");
+	inp.val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.RIGHT}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() - 1);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke right");
+	inp.val("").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() - 7);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+up");
+	inp.val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() + 7);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke up");
+	inp.val("").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() + 7);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+down");
+	inp.val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() - 7);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke down");
+	// Moving by month or year
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 1 - 1, 4),
+		"Keystroke pgup");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 3 - 1, 4),
+		"Keystroke pgdn");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 2 - 1, 4),
+		"Keystroke ctrl+pgup");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2009, 2 - 1, 4),
+		"Keystroke ctrl+pgdn");
+	// Check for moving to short months
+	inp.val("03/31/2008").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 29),
+		"Keystroke pgup - Feb");
+	inp.val("01/30/2008").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 29),
+		"Keystroke pgdn - Feb");
+	inp.val("02/29/2008").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 2 - 1, 28),
+		"Keystroke ctrl+pgup - Feb");
+	inp.val("02/29/2008").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2009, 2 - 1, 28),
+		"Keystroke ctrl+pgdn - Feb");
+	// Goto current
+	inp.datepicker("option", {gotoCurrent: true}).
+		datepicker("hide").val("02/04/2008").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
+		"Keystroke ctrl+home");
+	// Change steps
+	inp.datepicker("option", {stepMonths: 2, gotoCurrent: false}).
+		datepicker("hide").val("02/04/2008").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 12 - 1, 4),
+		"Keystroke pgup step 2");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 4 - 1, 4),
+		"Keystroke pgdn step 2");
+});
+
+test("mouse", function() {
+	expect( 15 );
+	var inl,
+		inp = testHelper.init("#inp"),
+		dp = $("#ui-datepicker-div"),
+		date = new Date();
+	inp.val("").datepicker("show");
+	$(".ui-datepicker-calendar tbody a:contains(10)", dp).simulate("click", {});
+	date.setDate(10);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Mouse click");
+	inp.val("02/04/2008").datepicker("show");
+	$(".ui-datepicker-calendar tbody a:contains(12)", dp).simulate("click", {});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 12),
+		"Mouse click - preset");
+	inp.val("02/04/2008").datepicker("show");
+	inp.val("").datepicker("show");
+	$("button.ui-datepicker-close", dp).simulate("click", {});
+	ok(inp.datepicker("getDate") == null, "Mouse click - close");
+	inp.val("02/04/2008").datepicker("show");
+	$("button.ui-datepicker-close", dp).simulate("click", {});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
+		"Mouse click - close + preset");
+	inp.val("02/04/2008").datepicker("show");
+	$("a.ui-datepicker-prev", dp).simulate("click", {});
+	$("button.ui-datepicker-close", dp).simulate("click", {});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
+		"Mouse click - abandoned");
+	// Current/previous/next
+	inp.val("02/04/2008").datepicker("option", {showButtonPanel: true}).datepicker("show");
+	$(".ui-datepicker-current", dp).simulate("click", {});
+	$(".ui-datepicker-calendar tbody a:contains(14)", dp).simulate("click", {});
+	date.setDate(14);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Mouse click - current");
+	inp.val("02/04/2008").datepicker("show");
+	$(".ui-datepicker-prev", dp).simulate("click");
+	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 1 - 1, 16),
+		"Mouse click - previous");
+	inp.val("02/04/2008").datepicker("show");
+	$(".ui-datepicker-next", dp).simulate("click");
+	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 3 - 1, 18),
+		"Mouse click - next");
+	// Previous/next with minimum/maximum
+	inp.datepicker("option", {minDate: new Date(2008, 2 - 1, 2),
+		maxDate: new Date(2008, 2 - 1, 26)}).val("02/04/2008").datepicker("show");
+	$(".ui-datepicker-prev", dp).simulate("click");
+	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 16),
+		"Mouse click - previous + min/max");
+	inp.val("02/04/2008").datepicker("show");
+	$(".ui-datepicker-next", dp).simulate("click");
+	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 18),
+		"Mouse click - next + min/max");
+	// Inline
+	inl = testHelper.init("#inl");
+	dp = $(".ui-datepicker-inline", inl);
+	date = new Date();
+	inl.datepicker("setDate", date);
+	$(".ui-datepicker-calendar tbody a:contains(10)", dp).simulate("click", {});
+	date.setDate(10);
+	testHelper.equalsDate(inl.datepicker("getDate"), date, "Mouse click inline");
+	inl.datepicker("option", {showButtonPanel: true}).datepicker("setDate", new Date(2008, 2 - 1, 4));
+	$(".ui-datepicker-calendar tbody a:contains(12)", dp).simulate("click", {});
+	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 2 - 1, 12), "Mouse click inline - preset");
+	inl.datepicker("option", {showButtonPanel: true});
+	$(".ui-datepicker-current", dp).simulate("click", {});
+	$(".ui-datepicker-calendar tbody a:contains(14)", dp).simulate("click", {});
+	date.setDate(14);
+	testHelper.equalsDate(inl.datepicker("getDate"), date, "Mouse click inline - current");
+	inl.datepicker("setDate", new Date(2008, 2 - 1, 4));
+	$(".ui-datepicker-prev", dp).simulate("click");
+	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
+	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 1 - 1, 16),
+		"Mouse click inline - previous");
+	inl.datepicker("setDate", new Date(2008, 2 - 1, 4));
+	$(".ui-datepicker-next", dp).simulate("click");
+	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
+	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 3 - 1, 18),
+		"Mouse click inline - next");
+});
+
+} );
diff --git a/tests/unit/datepicker/datepicker_common.js b/tests/unit/datepicker/datepicker_common.js
deleted file mode 100644
index 1eecc85cb..000000000
--- a/tests/unit/datepicker/datepicker_common.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-TestHelpers.commonWidgetTests( "datepicker", {
-	defaults: {
-		disabled: false
-	}
-});
-*/
diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js
deleted file mode 100644
index a1e75848a..000000000
--- a/tests/unit/datepicker/datepicker_core.js
+++ /dev/null
@@ -1,530 +0,0 @@
-define( [
-	"jquery",
-	"lib/common",
-	"./datepicker_test_helpers",
-	"ui/datepicker",
-	"ui/i18n/datepicker-he"
-], function( $, common, testHelper ) {
-
-module( "datepicker: core", {
-	setup: function() {
-		$( "body" ).focus();
-	}
-});
-
-common.testJshint( "datepicker" );
-
-test("initialization - Reinitialization after body had been emptied.", function() {
-	expect( 1 );
-	var bodyContent = $("body").children(), inp = $("#inp");
-	$("#inp").datepicker();
-	$("body").empty().append(inp);
-	$("#inp").datepicker();
-	ok( $("#"+$.datepicker._mainDivId).length===1, "Datepicker container added" );
-	$("body").empty().append(bodyContent); // Returning to initial state for later tests
-});
-
-test( "widget method - empty collection", function() {
-	expect( 1 );
-	$( "#nonExist" ).datepicker(); // should create nothing
-	ok( !$( "#ui-datepicker-div" ).length, "Non init on empty collection" );
-});
-
-test("widget method", function() {
-	expect( 1 );
-	var actual = $("#inp").datepicker().datepicker("widget")[0];
-	deepEqual($("body > #ui-datepicker-div:last-child")[0], actual);
-});
-
-asyncTest( "baseStructure", function() {
-	expect( 58 );
-	var header, title, table, thead, week, panel, inl, child,
-		inp = testHelper.initNewInput(),
-		dp = $( "#ui-datepicker-div" );
-
-	function step1() {
-		testHelper.onFocus( inp, function() {
-			ok( dp.is( ":visible" ), "Structure - datepicker visible" );
-			ok( !dp.is( ".ui-datepicker-rtl" ), "Structure - not right-to-left" );
-			ok( !dp.is( ".ui-datepicker-multi" ), "Structure - not multi-month" );
-			equal( dp.children().length, 2, "Structure - child count" );
-
-			header = dp.children( ":first" );
-			ok( header.is( "div.ui-datepicker-header" ), "Structure - header division" );
-			equal( header.children().length, 3, "Structure - header child count" );
-			ok( header.children( ":first" ).is( "a.ui-datepicker-prev" ) && header.children( ":first" ).html() !== "", "Structure - prev link" );
-			ok( header.children( ":eq(1)" ).is( "a.ui-datepicker-next" ) && header.children( ":eq(1)" ).html() !== "", "Structure - next link" );
-
-			title = header.children( ":last" );
-			ok( title.is( "div.ui-datepicker-title" ) && title.html() !== "","Structure - title division" );
-			equal( title.children().length, 2, "Structure - title child count" );
-			ok( title.children( ":first" ).is( "span.ui-datepicker-month" ) && title.children( ":first" ).text() !== "", "Structure - month text" );
-			ok( title.children( ":last" ).is( "span.ui-datepicker-year" ) && title.children( ":last" ).text() !== "", "Structure - year text" );
-
-			table = dp.children( ":eq(1)" );
-			ok( table.is( "table.ui-datepicker-calendar" ), "Structure - month table" );
-			ok( table.children( ":first" ).is( "thead" ), "Structure - month table thead" );
-
-			thead = table.children( ":first" ).children( ":first" );
-			ok( thead.is( "tr" ), "Structure - month table title row" );
-			equal( thead.find( "th" ).length, 7, "Structure - month table title cells" );
-			ok( table.children( ":eq(1)" ).is( "tbody" ), "Structure - month table body" );
-			ok( table.children( ":eq(1)" ).children( "tr" ).length >= 4, "Structure - month table week count" );
-
-			week = table.children( ":eq(1)" ).children( ":first" );
-			ok( week.is( "tr" ), "Structure - month table week row" );
-			equal( week.children().length, 7, "Structure - week child count" );
-			ok( week.children( ":first" ).is( "td.ui-datepicker-week-end" ), "Structure - month table first day cell" );
-			ok( week.children( ":last" ).is( "td.ui-datepicker-week-end" ), "Structure - month table second day cell" );
-
-			inp.datepicker( "hide" ).datepicker( "destroy" );
-			step2();
-		});
-	}
-
-	function step2() {
-		// Editable month/year and button panel
-		inp = testHelper.initNewInput({
-			changeMonth: true,
-			changeYear: true,
-			showButtonPanel: true
-		});
-		testHelper.onFocus( inp, function() {
-			title = dp.find( "div.ui-datepicker-title" );
-			ok( title.children( ":first" ).is( "select.ui-datepicker-month" ), "Structure - month selector" );
-			ok( title.children( ":last" ).is( "select.ui-datepicker-year" ), "Structure - year selector" );
-
-			panel = dp.children( ":last" );
-			ok( panel.is( "div.ui-datepicker-buttonpane" ), "Structure - button panel division" );
-			equal( panel.children().length, 2, "Structure - button panel child count" );
-			ok( panel.children( ":first" ).is( "button.ui-datepicker-current" ), "Structure - today button" );
-			ok( panel.children( ":last" ).is( "button.ui-datepicker-close" ), "Structure - close button" );
-
-			inp.datepicker( "hide" ).datepicker( "destroy" );
-			step3();
-		});
-	}
-
-	function step3() {
-		// Multi-month 2
-		inp = testHelper.initNewInput({ numberOfMonths: 2 });
-		testHelper.onFocus( inp, function() {
-			ok( dp.is( ".ui-datepicker-multi" ), "Structure multi [2] - multi-month" );
-			equal( dp.children().length, 3, "Structure multi [2] - child count" );
-
-			child = dp.children( ":first" );
-			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure multi [2] - first month division" );
-
-			child = dp.children( ":eq(1)" );
-			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure multi [2] - second month division" );
-
-			child = dp.children( ":eq(2)" );
-			ok( child.is( "div.ui-datepicker-row-break" ), "Structure multi [2] - row break" );
-			ok( dp.is( ".ui-datepicker-multi-2" ), "Structure multi [2] - multi-2" );
-
-			inp.datepicker( "hide" ).datepicker( "destroy" );
-			step4();
-		});
-	}
-
-	function step4() {
-		// Multi-month 3
-		inp = testHelper.initNewInput({ numberOfMonths: 3 });
-		testHelper.onFocus( inp, function() {
-			ok( dp.is( ".ui-datepicker-multi-3" ), "Structure multi [3] - multi-3" );
-			ok( !dp.is( ".ui-datepicker-multi-2" ), "Structure multi [3] - Trac #6704" );
-
-			inp.datepicker( "hide" ).datepicker( "destroy" );
-			step5();
-		});
-	}
-
-	function step5() {
-		// Multi-month [2, 2]
-		inp = testHelper.initNewInput({ numberOfMonths: [ 2, 2 ] });
-		testHelper.onFocus( inp, function() {
-			ok( dp.is( ".ui-datepicker-multi" ), "Structure multi - multi-month" );
-			equal( dp.children().length, 6, "Structure multi [2,2] - child count" );
-
-			child = dp.children( ":first" );
-			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure multi [2,2] - first month division" );
-
-			child = dp.children( ":eq(1)" );
-			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure multi [2,2] - second month division" );
-
-			child = dp.children( ":eq(2)" );
-			ok( child.is( "div.ui-datepicker-row-break" ), "Structure multi [2,2] - row break" );
-
-			child = dp.children( ":eq(3)" );
-			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure multi [2,2] - third month division" );
-
-			child = dp.children( ":eq(4)" );
-			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure multi [2,2] - fourth month division" );
-
-			child = dp.children( ":eq(5)" );
-			ok( child.is( "div.ui-datepicker-row-break" ), "Structure multi [2,2] - row break" );
-
-			inp.datepicker( "hide" ).datepicker( "destroy" );
-
-			// Inline
-			inl = testHelper.init( "#inl" );
-			dp = inl.children();
-
-			ok( dp.is( ".ui-datepicker-inline" ), "Structure inline - main div" );
-			ok( !dp.is( ".ui-datepicker-rtl" ), "Structure inline - not right-to-left" );
-			ok( !dp.is( ".ui-datepicker-multi" ), "Structure inline - not multi-month" );
-			equal( dp.children().length, 2, "Structure inline - child count" );
-
-			header = dp.children( ":first" );
-			ok( header.is( "div.ui-datepicker-header" ), "Structure inline - header division" );
-			equal( header.children().length, 3, "Structure inline - header child count" );
-
-			table = dp.children( ":eq(1)" );
-			ok( table.is( "table.ui-datepicker-calendar" ), "Structure inline - month table" );
-			ok( table.children( ":first" ).is( "thead" ), "Structure inline - month table thead" );
-			ok( table.children( ":eq(1)" ).is( "tbody" ), "Structure inline - month table body" );
-
-			inl.datepicker( "destroy" );
-
-			// Inline multi-month
-			inl = testHelper.init( "#inl", { numberOfMonths: 2 } );
-			dp = inl.children();
-
-			ok( dp.is( ".ui-datepicker-inline" ) && dp.is( ".ui-datepicker-multi" ), "Structure inline multi - main div" );
-			equal( dp.children().length, 3, "Structure inline multi - child count" );
-
-			child = dp.children( ":first" );
-			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure inline multi - first month division" );
-
-			child = dp.children( ":eq(1)" );
-			ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure inline multi - second month division" );
-
-			child = dp.children( ":eq(2)" );
-			ok( child.is( "div.ui-datepicker-row-break" ), "Structure inline multi - row break" );
-
-			inl.datepicker( "destroy" );
-			start();
-		});
-	}
-
-	step1();
-});
-
-asyncTest( "customStructure", function() {
-	expect( 20 );
-	var header, panel, title, thead,
-		inp = testHelper.initNewInput( $.datepicker.regional.he ),
-		dp = $( "#ui-datepicker-div" );
-
-	function step1() {
-		inp.datepicker( "option", "showButtonPanel", true );
-
-		testHelper.onFocus( inp, function() {
-			ok( dp.is( ".ui-datepicker-rtl" ), "Structure RTL - right-to-left" );
-
-			header = dp.children( ":first" );
-			ok( header.is( "div.ui-datepicker-header" ), "Structure RTL - header division" );
-			equal( header.children().length, 3, "Structure RTL - header child count" );
-			ok( header.children( ":first" ).is( "a.ui-datepicker-next" ), "Structure RTL - prev link" );
-			ok( header.children( ":eq(1)" ).is( "a.ui-datepicker-prev" ), "Structure RTL - next link" );
-
-			panel = dp.children( ":last" );
-			ok( panel.is( "div.ui-datepicker-buttonpane" ), "Structure RTL - button division" );
-			equal( panel.children().length, 2, "Structure RTL - button panel child count" );
-			ok( panel.children( ":first" ).is( "button.ui-datepicker-close" ), "Structure RTL - close button" );
-			ok( panel.children( ":last" ).is( "button.ui-datepicker-current" ), "Structure RTL - today button" );
-
-			inp.datepicker( "hide" ).datepicker( "destroy" );
-			step2();
-		});
-	}
-
-	// Hide prev/next
-	function step2() {
-		inp = testHelper.initNewInput({
-			hideIfNoPrevNext: true,
-			minDate: new Date( 2008, 2 - 1, 4 ),
-			maxDate: new Date( 2008, 2 - 1, 14 )
-		});
-		inp.val( "02/10/2008" );
-
-		testHelper.onFocus( inp, function() {
-			header = dp.children( ":first" );
-			ok( header.is( "div.ui-datepicker-header" ), "Structure hide prev/next - header division" );
-			equal( header.children().length, 1, "Structure hide prev/next - links child count" );
-			ok( header.children( ":first" ).is( "div.ui-datepicker-title" ), "Structure hide prev/next - title division" );
-
-			inp.datepicker( "hide" ).datepicker( "destroy" );
-			step3();
-		});
-	}
-
-	// Changeable Month with read-only year
-	function step3() {
-		inp = testHelper.initNewInput({ changeMonth: true });
-
-		testHelper.onFocus( inp, function() {
-			title = dp.children( ":first" ).children( ":last" );
-			equal( title.children().length, 2, "Structure changeable month - title child count" );
-			ok( title.children( ":first" ).is( "select.ui-datepicker-month" ), "Structure changeable month - month selector" );
-			ok( title.children( ":last" ).is( "span.ui-datepicker-year" ), "Structure changeable month - read-only year" );
-
-			inp.datepicker( "hide" ).datepicker( "destroy" );
-			step4();
-		});
-	}
-
-	// Changeable year with read-only month
-	function step4() {
-		inp = testHelper.initNewInput({ changeYear: true });
-
-		testHelper.onFocus( inp, function() {
-			title = dp.children( ":first" ).children( ":last" );
-			equal( title.children().length, 2, "Structure changeable year - title child count" );
-			ok( title.children( ":first" ).is( "span.ui-datepicker-month" ), "Structure changeable year - read-only month" );
-			ok( title.children( ":last" ).is( "select.ui-datepicker-year" ), "Structure changeable year - year selector" );
-
-			inp.datepicker( "hide" ).datepicker( "destroy" );
-			step5();
-		});
-	}
-
-	// Read-only first day of week
-	function step5() {
-		inp = testHelper.initNewInput({ changeFirstDay: false });
-
-		testHelper.onFocus( inp, function() {
-			thead = dp.find( ".ui-datepicker-calendar thead tr" );
-			equal( thead.children().length, 7, "Structure read-only first day - thead child count" );
-			equal( thead.find( "a" ).length, 0, "Structure read-only first day - thead links count" );
-
-			inp.datepicker( "hide" ).datepicker( "destroy" );
-			start();
-		});
-	}
-
-	// TODO: figure out why this setTimeout is needed in IE,
-	// it only is necessary when the previous baseStructure tests runs first
-	// Support: IE
-	setTimeout( step1 );
-});
-
-test("keystrokes", function() {
-	expect( 26 );
-	var inp = testHelper.init("#inp"),
-		date = new Date();
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke enter");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke enter - preset");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+home");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
-	ok(inp.datepicker("getDate") == null, "Keystroke ctrl+end");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	ok(inp.datepicker("getDate") == null, "Keystroke esc");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke esc - preset");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke esc - abandoned");
-	// Moving by day or week
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.LEFT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+left");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.LEFT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke left");
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.RIGHT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+right");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.RIGHT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke right");
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+up");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke up");
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+down");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke down");
-	// Moving by month or year
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 1 - 1, 4),
-		"Keystroke pgup");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 3 - 1, 4),
-		"Keystroke pgdn");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 2 - 1, 4),
-		"Keystroke ctrl+pgup");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2009, 2 - 1, 4),
-		"Keystroke ctrl+pgdn");
-	// Check for moving to short months
-	inp.val("03/31/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 29),
-		"Keystroke pgup - Feb");
-	inp.val("01/30/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 29),
-		"Keystroke pgdn - Feb");
-	inp.val("02/29/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 2 - 1, 28),
-		"Keystroke ctrl+pgup - Feb");
-	inp.val("02/29/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2009, 2 - 1, 28),
-		"Keystroke ctrl+pgdn - Feb");
-	// Goto current
-	inp.datepicker("option", {gotoCurrent: true}).
-		datepicker("hide").val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke ctrl+home");
-	// Change steps
-	inp.datepicker("option", {stepMonths: 2, gotoCurrent: false}).
-		datepicker("hide").val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 12 - 1, 4),
-		"Keystroke pgup step 2");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 4 - 1, 4),
-		"Keystroke pgdn step 2");
-});
-
-test("mouse", function() {
-	expect( 15 );
-	var inl,
-		inp = testHelper.init("#inp"),
-		dp = $("#ui-datepicker-div"),
-		date = new Date();
-	inp.val("").datepicker("show");
-	$(".ui-datepicker-calendar tbody a:contains(10)", dp).simulate("click", {});
-	date.setDate(10);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Mouse click");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-calendar tbody a:contains(12)", dp).simulate("click", {});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 12),
-		"Mouse click - preset");
-	inp.val("02/04/2008").datepicker("show");
-	inp.val("").datepicker("show");
-	$("button.ui-datepicker-close", dp).simulate("click", {});
-	ok(inp.datepicker("getDate") == null, "Mouse click - close");
-	inp.val("02/04/2008").datepicker("show");
-	$("button.ui-datepicker-close", dp).simulate("click", {});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Mouse click - close + preset");
-	inp.val("02/04/2008").datepicker("show");
-	$("a.ui-datepicker-prev", dp).simulate("click", {});
-	$("button.ui-datepicker-close", dp).simulate("click", {});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Mouse click - abandoned");
-	// Current/previous/next
-	inp.val("02/04/2008").datepicker("option", {showButtonPanel: true}).datepicker("show");
-	$(".ui-datepicker-current", dp).simulate("click", {});
-	$(".ui-datepicker-calendar tbody a:contains(14)", dp).simulate("click", {});
-	date.setDate(14);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Mouse click - current");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-prev", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 1 - 1, 16),
-		"Mouse click - previous");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-next", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 3 - 1, 18),
-		"Mouse click - next");
-	// Previous/next with minimum/maximum
-	inp.datepicker("option", {minDate: new Date(2008, 2 - 1, 2),
-		maxDate: new Date(2008, 2 - 1, 26)}).val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-prev", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 16),
-		"Mouse click - previous + min/max");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-next", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 18),
-		"Mouse click - next + min/max");
-	// Inline
-	inl = testHelper.init("#inl");
-	dp = $(".ui-datepicker-inline", inl);
-	date = new Date();
-	inl.datepicker("setDate", date);
-	$(".ui-datepicker-calendar tbody a:contains(10)", dp).simulate("click", {});
-	date.setDate(10);
-	testHelper.equalsDate(inl.datepicker("getDate"), date, "Mouse click inline");
-	inl.datepicker("option", {showButtonPanel: true}).datepicker("setDate", new Date(2008, 2 - 1, 4));
-	$(".ui-datepicker-calendar tbody a:contains(12)", dp).simulate("click", {});
-	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 2 - 1, 12), "Mouse click inline - preset");
-	inl.datepicker("option", {showButtonPanel: true});
-	$(".ui-datepicker-current", dp).simulate("click", {});
-	$(".ui-datepicker-calendar tbody a:contains(14)", dp).simulate("click", {});
-	date.setDate(14);
-	testHelper.equalsDate(inl.datepicker("getDate"), date, "Mouse click inline - current");
-	inl.datepicker("setDate", new Date(2008, 2 - 1, 4));
-	$(".ui-datepicker-prev", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 1 - 1, 16),
-		"Mouse click inline - previous");
-	inl.datepicker("setDate", new Date(2008, 2 - 1, 4));
-	$(".ui-datepicker-next", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 3 - 1, 18),
-		"Mouse click inline - next");
-});
-
-} );
diff --git a/tests/unit/datepicker/datepicker_events.js b/tests/unit/datepicker/datepicker_events.js
deleted file mode 100644
index 04a4cbfe8..000000000
--- a/tests/unit/datepicker/datepicker_events.js
+++ /dev/null
@@ -1,154 +0,0 @@
-define( [
-	"jquery",
-	"./datepicker_test_helpers",
-	"ui/datepicker"
-], function( $, testHelper ) {
-
-module("datepicker: events");
-
-var selectedThis = null,
-selectedDate = null,
-selectedInst = null;
-
-function callback(date, inst) {
-	selectedThis = this;
-	selectedDate = date;
-	selectedInst = inst;
-}
-
-function callback2(year, month, inst) {
-	selectedThis = this;
-	selectedDate = year + "/" + month;
-	selectedInst = inst;
-}
-
-test("events", function() {
-	expect( 26 );
-	var dateStr, newMonthYear, inp2,
-		inp = testHelper.init("#inp", {onSelect: callback}),
-	date = new Date();
-	// onSelect
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(selectedThis, inp[0], "Callback selected this");
-	equal(selectedInst, $.data(inp[0], testHelper.PROP_NAME), "Callback selected inst");
-	equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", date),
-		"Callback selected date");
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 7);
-	equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", date),
-		"Callback selected date - ctrl+down");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", date),
-		"Callback selected date - esc");
-    dateStr = "02/04/2008";
-    inp.val(dateStr).datepicker("show").
-        simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-    equal(dateStr, selectedDate,
-        "onSelect is called after enter keydown");
-	// onChangeMonthYear
-	inp.datepicker("option", {onChangeMonthYear: callback2, onSelect: null}).
-		val("").datepicker("show");
-	newMonthYear = function(date) {
-		return date.getFullYear() + "/" + (date.getMonth() + 1);
-	};
-	date = new Date();
-	date.setDate(1);
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP});
-	date.setMonth(date.getMonth() - 1);
-	equal(selectedThis, inp[0], "Callback change month/year this");
-	equal(selectedInst, $.data(inp[0], testHelper.PROP_NAME), "Callback change month/year inst");
-	equal(selectedDate, newMonthYear(date),
-		"Callback change month/year date - pgup");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN});
-	date.setMonth(date.getMonth() + 1);
-	equal(selectedDate, newMonthYear(date),
-		"Callback change month/year date - pgdn");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP});
-	date.setFullYear(date.getFullYear() - 1);
-	equal(selectedDate, newMonthYear(date),
-		"Callback change month/year date - ctrl+pgup");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME});
-	date.setFullYear(date.getFullYear() + 1);
-	equal(selectedDate, newMonthYear(date),
-		"Callback change month/year date - ctrl+home");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN});
-	date.setFullYear(date.getFullYear() + 1);
-	equal(selectedDate, newMonthYear(date),
-		"Callback change month/year date - ctrl+pgdn");
-	inp.datepicker("setDate", new Date(2007, 1 - 1, 26));
-	equal(selectedDate, "2007/1", "Callback change month/year date - setDate");
-	selectedDate = null;
-	inp.datepicker("setDate", new Date(2007, 1 - 1, 12));
-	ok(selectedDate == null, "Callback change month/year date - setDate no change");
-	// onChangeMonthYear step by 2
-	inp.datepicker("option", {stepMonths: 2}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP});
-	date.setMonth(date.getMonth() - 14);
-	equal(selectedDate, newMonthYear(date),
-		"Callback change month/year by 2 date - pgup");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP});
-	date.setMonth(date.getMonth() - 12);
-	equal(selectedDate, newMonthYear(date),
-		"Callback change month/year by 2 date - ctrl+pgup");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN});
-	date.setMonth(date.getMonth() + 2);
-	equal(selectedDate, newMonthYear(date),
-		"Callback change month/year by 2 date - pgdn");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN});
-	date.setMonth(date.getMonth() + 12);
-	equal(selectedDate, newMonthYear(date),
-		"Callback change month/year by 2 date - ctrl+pgdn");
-	// onClose
-	inp.datepicker("option", {onClose: callback, onChangeMonthYear: null, stepMonths: 1}).
-		val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	equal(selectedThis, inp[0], "Callback close this");
-	equal(selectedInst, $.data(inp[0], testHelper.PROP_NAME), "Callback close inst");
-	equal(selectedDate, "", "Callback close date - esc");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", new Date()),
-		"Callback close date - enter");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	equal(selectedDate, "02/04/2008", "Callback close date - preset");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
-	equal(selectedDate, "", "Callback close date - ctrl+end");
-
-	inp2 = testHelper.init("#inp2");
-	inp2.datepicker().datepicker("option", {onClose: callback}).datepicker("show");
-	inp.datepicker("show");
-	equal(selectedThis, inp2[0], "Callback close this");
-});
-
-test("beforeShowDay-getDate", function() {
-	expect( 3 );
-	var inp = testHelper.init("#inp", {beforeShowDay: function() { inp.datepicker("getDate"); return [true, ""]; }}),
-		dp = $("#ui-datepicker-div");
-	inp.val("01/01/2010").datepicker("show");
-	// contains non-breaking space
-	equal($("div.ui-datepicker-title").text(),
-		// support: IE <9, jQuery <1.8
-		// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
-		$( "<span>January&#xa0;2010</span>" ).text(), "Initial month");
-	$("a.ui-datepicker-next", dp).click();
-	$("a.ui-datepicker-next", dp).click();
-	// contains non-breaking space
-	equal($("div.ui-datepicker-title").text(),
-		$( "<span>March&#xa0;2010</span>" ).text(), "After next clicks");
-	inp.datepicker("hide").datepicker("show");
-	$("a.ui-datepicker-prev", dp).click();
-	$("a.ui-datepicker-prev", dp).click();
-	// contains non-breaking space
-	equal($("div.ui-datepicker-title").text(),
-		$( "<span>November&#xa0;2009</span>" ).text(), "After prev clicks");
-	inp.datepicker("hide");
-});
-
-} );
diff --git a/tests/unit/datepicker/datepicker_methods.js b/tests/unit/datepicker/datepicker_methods.js
deleted file mode 100644
index 3899779a9..000000000
--- a/tests/unit/datepicker/datepicker_methods.js
+++ /dev/null
@@ -1,126 +0,0 @@
-define( [
-	"jquery",
-	"./datepicker_test_helpers",
-	"ui/datepicker"
-], function( $, testHelper ) {
-
-module("datepicker: methods");
-
-test("destroy", function() {
-	expect( 33 );
-	var inl,
-		inp = testHelper.init("#inp");
-	ok(inp.is(".hasDatepicker"), "Default - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Default - instance present");
-	ok(inp.next().is("#alt"), "Default - button absent");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Default - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Default - instance absent");
-	ok(inp.next().is("#alt"), "Default - button absent");
-	// With button
-	inp= testHelper.init("#inp", {showOn: "both"});
-	ok(inp.is(".hasDatepicker"), "Button - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Button - instance present");
-	ok(inp.next().text() === "...", "Button - button added");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Button - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Button - instance absent");
-	ok(inp.next().is("#alt"), "Button - button removed");
-	// With append text
-	inp = testHelper.init("#inp", {appendText: "Testing"});
-	ok(inp.is(".hasDatepicker"), "Append - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Append - instance present");
-	ok(inp.next().text() === "Testing", "Append - append text added");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Append - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Append - instance absent");
-	ok(inp.next().is("#alt"), "Append - append text removed");
-	// With both
-	inp= testHelper.init("#inp", {showOn: "both", buttonImageOnly: true,
-		buttonImage: "images/calendar.gif", appendText: "Testing"});
-	ok(inp.is(".hasDatepicker"), "Both - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Both - instance present");
-	ok(inp.next()[0].nodeName.toLowerCase() === "img", "Both - button added");
-	ok(inp.next().next().text() === "Testing", "Both - append text added");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Both - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Both - instance absent");
-	ok(inp.next().is("#alt"), "Both - button and append text absent");
-	// Inline
-	inl = testHelper.init("#inl");
-	ok(inl.is(".hasDatepicker"), "Inline - marker class set");
-	ok(inl.html() !== "", "Inline - datepicker present");
-	ok($.data(inl[0], testHelper.PROP_NAME), "Inline - instance present");
-	ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
-	inl.datepicker("destroy");
-	inl = $("#inl");
-	ok(!inl.is(".hasDatepicker"), "Inline - marker class cleared");
-	ok(inl.html() === "", "Inline - datepicker absent");
-	ok(!$.data(inl[0], testHelper.PROP_NAME), "Inline - instance absent");
-	ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
-});
-
-test("enableDisable", function() {
-	expect( 33 );
-	var inl, dp,
-		inp = testHelper.init("#inp");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable - initially marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable - field initially enabled");
-	inp.datepicker("disable");
-	ok(inp.datepicker("isDisabled"), "Enable/disable - now marked as disabled");
-	ok(inp[0].disabled, "Enable/disable - field now disabled");
-	inp.datepicker("enable");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable - now marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable - field now enabled");
-	inp.datepicker("destroy");
-	// With a button
-	inp = testHelper.init("#inp", {showOn: "button"});
-	ok(!inp.datepicker("isDisabled"), "Enable/disable button - initially marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable button - field initially enabled");
-	ok(!inp.next("button")[0].disabled, "Enable/disable button - button initially enabled");
-	inp.datepicker("disable");
-	ok(inp.datepicker("isDisabled"), "Enable/disable button - now marked as disabled");
-	ok(inp[0].disabled, "Enable/disable button - field now disabled");
-	ok(inp.next("button")[0].disabled, "Enable/disable button - button now disabled");
-	inp.datepicker("enable");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable button - now marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable button - field now enabled");
-	ok(!inp.next("button")[0].disabled, "Enable/disable button - button now enabled");
-	inp.datepicker("destroy");
-	// With an image button
-	inp = testHelper.init("#inp", {showOn: "button", buttonImageOnly: true,
-		buttonImage: "images/calendar.gif"});
-	ok(!inp.datepicker("isDisabled"), "Enable/disable image - initially marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable image - field initially enabled");
-	ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image initially enabled");
-	inp.datepicker("disable");
-	ok(inp.datepicker("isDisabled"), "Enable/disable image - now marked as disabled");
-	ok(inp[0].disabled, "Enable/disable image - field now disabled");
-	ok(parseFloat(inp.next("img").css("opacity")) !== 1, "Enable/disable image - image now disabled");
-	inp.datepicker("enable");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable image - now marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable image - field now enabled");
-	ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image now enabled");
-	inp.datepicker("destroy");
-	// Inline
-	inl = testHelper.init("#inl", {changeYear: true});
-	dp = $(".ui-datepicker-inline", inl);
-	ok(!inl.datepicker("isDisabled"), "Enable/disable inline - initially marked as enabled");
-	ok(!dp.children().is(".ui-state-disabled"), "Enable/disable inline - not visually disabled initially");
-	ok(!dp.find("select").prop("disabled"), "Enable/disable inline - form element enabled initially");
-	inl.datepicker("disable");
-	ok(inl.datepicker("isDisabled"), "Enable/disable inline - now marked as disabled");
-	ok(dp.children().is(".ui-state-disabled"), "Enable/disable inline - visually disabled");
-	ok(dp.find("select").prop("disabled"), "Enable/disable inline - form element disabled");
-	inl.datepicker("enable");
-	ok(!inl.datepicker("isDisabled"), "Enable/disable inline - now marked as enabled");
-	ok(!dp.children().is(".ui-state-disabled"), "Enable/disable inline - not visiually disabled");
-	ok(!dp.find("select").prop("disabled"), "Enable/disable inline - form element enabled");
-	inl.datepicker("destroy");
-});
-
-} );
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
deleted file mode 100644
index ee4a3bae4..000000000
--- a/tests/unit/datepicker/datepicker_options.js
+++ /dev/null
@@ -1,1127 +0,0 @@
-define( [
-	"jquery",
-	"./datepicker_test_helpers",
-	"ui/datepicker",
-	"ui/i18n/datepicker-fr",
-	"ui/i18n/datepicker-he",
-	"ui/i18n/datepicker-zh-CN"
-], function( $, testHelper ) {
-
-module("datepicker: options");
-
-test("setDefaults", function() {
-	expect( 3 );
-	testHelper.init("#inp");
-	equal($.datepicker._defaults.showOn, "focus", "Initial showOn");
-	$.datepicker.setDefaults({showOn: "button"});
-	equal($.datepicker._defaults.showOn, "button", "Change default showOn");
-	$.datepicker.setDefaults({showOn: "focus"});
-	equal($.datepicker._defaults.showOn, "focus", "Restore showOn");
-});
-
-test("option", function() {
-	expect( 17 );
-	var inp = testHelper.init("#inp"),
-	inst = $.data(inp[0], testHelper.PROP_NAME);
-	// Set option
-	equal(inst.settings.showOn, null, "Initial setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Initial instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Initial default showOn");
-	inp.datepicker("option", "showOn", "button");
-	equal(inst.settings.showOn, "button", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "button", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("option", {showOn: "both"});
-	equal(inst.settings.showOn, "both", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "both", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("option", "showOn", undefined);
-	equal(inst.settings.showOn, null, "Clear setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Restore instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	// Get option
-	inp = testHelper.init("#inp");
-	equal(inp.datepicker("option", "showOn"), "focus", "Initial setting showOn");
-	inp.datepicker("option", "showOn", "button");
-	equal(inp.datepicker("option", "showOn"), "button", "Change instance showOn");
-	inp.datepicker("option", "showOn", undefined);
-	equal(inp.datepicker("option", "showOn"), "focus", "Reset instance showOn");
-	deepEqual(inp.datepicker("option", "all"), {showAnim: ""}, "Get instance settings");
-	deepEqual(inp.datepicker("option", "defaults"), $.datepicker._defaults,
-		"Get default settings");
-});
-
-test( "disabled", function() {
-	expect(8);
-	var inp = testHelper.init("#inp");
-	ok(!inp.datepicker("isDisabled"), "Initially marked as enabled");
-	ok(!inp[0].disabled, "Field initially enabled");
-	inp.datepicker("option", "disabled", true);
-	ok(inp.datepicker("isDisabled"), "Marked as disabled");
-	ok(inp[0].disabled, "Field now disabled");
-	inp.datepicker("option", "disabled", false);
-	ok(!inp.datepicker("isDisabled"), "Marked as enabled");
-	ok(!inp[0].disabled, "Field now enabled");
-	inp.datepicker("destroy");
-
-	inp = testHelper.init("#inp", { disabled: true });
-	ok(inp.datepicker("isDisabled"), "Initially marked as disabled");
-	ok(inp[0].disabled, "Field initially disabled");
-});
-
-test("change", function() {
-	expect( 12 );
-	var inp = testHelper.init("#inp"),
-	inst = $.data(inp[0], testHelper.PROP_NAME);
-	equal(inst.settings.showOn, null, "Initial setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Initial instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Initial default showOn");
-	inp.datepicker("change", "showOn", "button");
-	equal(inst.settings.showOn, "button", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "button", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("change", {showOn: "both"});
-	equal(inst.settings.showOn, "both", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "both", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("change", "showOn", undefined);
-	equal(inst.settings.showOn, null, "Clear setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Restore instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-});
-
-(function() {
-	var url = window.location.search;
-	url = decodeURIComponent( url.slice( url.indexOf( "swarmURL=" ) + 9 ) );
-
-	// TODO: This test occassionally fails in IE in TestSwarm
-	if ( $.ui.ie && url && url.indexOf( "http" ) === 0 ) {
-		return;
-	}
-
-	asyncTest( "invocation", function() {
-		var button, image,
-			isOldIE = $.ui.ie && ( !document.documentMode || document.documentMode < 9 ),
-			body = $( "body" );
-
-		expect( isOldIE ? 25 : 29 );
-
-		function step0() {
-			var inp = testHelper.initNewInput(),
-				dp = $( "#ui-datepicker-div" );
-
-			button = inp.siblings( "button" );
-			ok( button.length === 0, "Focus - button absent" );
-			image = inp.siblings( "img" );
-			ok( image.length === 0, "Focus - image absent" );
-
-			testHelper.onFocus( inp, function() {
-				ok( dp.is( ":visible" ), "Focus - rendered on focus" );
-				inp.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-				ok( !dp.is( ":visible" ), "Focus - hidden on exit" );
-				step1();
-			});
-		}
-
-		function step1() {
-
-			var inp = testHelper.initNewInput(),
-				dp = $( "#ui-datepicker-div" );
-
-			testHelper.onFocus( inp, function() {
-				ok( dp.is( ":visible" ), "Focus - rendered on focus" );
-				body.simulate( "mousedown", {} );
-				ok( !dp.is( ":visible" ), "Focus - hidden on external click" );
-				inp.datepicker( "hide" ).datepicker( "destroy" );
-
-				step2();
-			});
-		}
-
-		function step2() {
-			var inp = testHelper.initNewInput({
-					showOn: "button",
-					buttonText: "Popup"
-				}),
-				dp = $( "#ui-datepicker-div" );
-
-			ok( !dp.is( ":visible" ), "Button - initially hidden" );
-			button = inp.siblings( "button" );
-			image = inp.siblings( "img" );
-			ok( button.length === 1, "Button - button present" );
-			ok( image.length === 0, "Button - image absent" );
-			equal( button.text(), "Popup", "Button - button text" );
-
-			testHelper.onFocus( inp, function() {
-				ok( !dp.is( ":visible" ), "Button - not rendered on focus" );
-				button.click();
-				ok( dp.is( ":visible" ), "Button - rendered on button click" );
-				button.click();
-				ok( !dp.is( ":visible" ), "Button - hidden on second button click" );
-				inp.datepicker( "hide" ).datepicker( "destroy" );
-
-				step3();
-			});
-		}
-
-		function step3() {
-			var inp = testHelper.initNewInput({
-					showOn: "button",
-					buttonImageOnly: true,
-					buttonImage: "images/calendar.gif",
-					buttonText: "Cal"
-				}),
-				dp = $( "#ui-datepicker-div" );
-
-			ok( !dp.is( ":visible" ), "Image button - initially hidden" );
-			button = inp.siblings( "button" );
-			ok( button.length === 0, "Image button - button absent" );
-			image = inp.siblings( "img" );
-			ok( image.length === 1, "Image button - image present" );
-			ok( /images\/calendar\.gif$/.test( image.attr( "src" ) ), "Image button - image source" );
-			equal( image.attr( "title" ), "Cal", "Image button - image text" );
-
-			testHelper.onFocus( inp, function() {
-				ok( !dp.is( ":visible" ), "Image button - not rendered on focus" );
-				image.click();
-				ok( dp.is( ":visible" ), "Image button - rendered on image click" );
-				image.click();
-				ok( !dp.is( ":visible" ), "Image button - hidden on second image click" );
-				inp.datepicker( "hide" ).datepicker( "destroy" );
-
-				step4();
-			});
-		}
-
-		function step4() {
-			var inp = testHelper.initNewInput({
-					showOn: "both",
-					buttonImage: "images/calendar.gif"
-				}),
-				dp = $( "#ui-datepicker-div" );
-
-			ok( !dp.is( ":visible" ), "Both - initially hidden" );
-			button = inp.siblings( "button" );
-			ok( button.length === 1, "Both - button present" );
-			image = inp.siblings( "img" );
-			ok( image.length === 0, "Both - image absent" );
-			image = button.children( "img" );
-			ok( image.length === 1, "Both - button image present" );
-
-			// TODO: This test occasionally fails to focus in IE8 in BrowserStack
-			if ( !isOldIE ) {
-				testHelper.onFocus( inp, function() {
-					ok( dp.is( ":visible" ), "Both - rendered on focus" );
-					body.simulate( "mousedown", {} );
-					ok( !dp.is( ":visible" ), "Both - hidden on external click" );
-					button.click();
-					ok( dp.is( ":visible" ), "Both - rendered on button click" );
-					button.click();
-					ok( !dp.is( ":visible" ), "Both - hidden on second button click" );
-					inp.datepicker( "hide" ).datepicker( "destroy" );
-
-					start();
-				});
-			} else {
-				start();
-			}
-		}
-
-		step0();
-	});
-})();
-
-test("otherMonths", function() {
-	expect( 8 );
-	var inp = testHelper.init("#inp"),
-		pop = $("#ui-datepicker-div");
-	inp.val("06/01/2009").datepicker("show");
-	equal(pop.find("tbody").text(),
-		// support: IE <9, jQuery <1.8
-		// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
-		$( "<span>\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0</span>" ).text(),
-		"Other months - none");
-	ok(pop.find("td:last *").length === 0, "Other months - no content");
-	inp.datepicker("hide").datepicker("option", "showOtherMonths", true).datepicker("show");
-	equal(pop.find("tbody").text(), "311234567891011121314151617181920212223242526272829301234",
-		"Other months - show");
-	ok(pop.find("td:last span").length === 1, "Other months - span content");
-	inp.datepicker("hide").datepicker("option", "selectOtherMonths", true).datepicker("show");
-	equal(pop.find("tbody").text(), "311234567891011121314151617181920212223242526272829301234",
-		"Other months - select");
-	ok(pop.find("td:last a").length === 1, "Other months - link content");
-	inp.datepicker("hide").datepicker("option", "showOtherMonths", false).datepicker("show");
-	equal(pop.find("tbody").text(),
-		// support: IE <9, jQuery <1.8
-		// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
-		$( "<span>\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0</span>" ).text(),
-		"Other months - none");
-	ok(pop.find("td:last *").length === 0, "Other months - no content");
-});
-
-test("defaultDate", function() {
-	expect( 16 );
-	var inp = testHelper.init("#inp"),
-		date = new Date();
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date null");
-
-	// Numeric values
-	inp.datepicker("option", {defaultDate: -2}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2");
-
-	date = new Date();
-	inp.datepicker("option", {defaultDate: 3}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 3);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 3");
-
-	date = new Date();
-	inp.datepicker("option", {defaultDate: 1 / "a"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date NaN");
-
-	// String offset values
-	inp.datepicker("option", {defaultDate: "-1d"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -1d");
-	inp.datepicker("option", {defaultDate: "+3D"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 4);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +3D");
-	inp.datepicker("option", {defaultDate: " -2 w "}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = new Date();
-	date.setDate(date.getDate() - 14);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2 w");
-	inp.datepicker("option", {defaultDate: "+1 W"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 21);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1 W");
-	inp.datepicker("option", {defaultDate: " -1 m "}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = testHelper.addMonths(new Date(), -1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -1 m");
-	inp.datepicker("option", {defaultDate: "+2M"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = testHelper.addMonths(new Date(), 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +2M");
-	inp.datepicker("option", {defaultDate: "-2y"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = new Date();
-	date.setFullYear(date.getFullYear() - 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2y");
-	inp.datepicker("option", {defaultDate: "+1 Y "}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setFullYear(date.getFullYear() + 3);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1 Y");
-	inp.datepicker("option", {defaultDate: "+1M +10d"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = testHelper.addMonths(new Date(), 1);
-	date.setDate(date.getDate() + 10);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1M +10d");
-	// String date values
-	inp.datepicker("option", {defaultDate: "07/04/2007"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = new Date(2007, 7 - 1, 4);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 07/04/2007");
-	inp.datepicker("option", {dateFormat: "yy-mm-dd", defaultDate: "2007-04-02"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = new Date(2007, 4 - 1, 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 2007-04-02");
-	// Date value
-	date = new Date(2007, 1 - 1, 26);
-	inp.datepicker("option", {dateFormat: "mm/dd/yy", defaultDate: date}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 01/26/2007");
-});
-
-test("miscellaneous", function() {
-	expect( 19 );
-	var curYear, longNames, shortNames, date,
-		dp = $("#ui-datepicker-div"),
-		inp = testHelper.init("#inp");
-	// Year range
-	function genRange(start, offset) {
-		var i = start,
-			range = "";
-		for (; i < start + offset; i++) {
-			range += i;
-		}
-		return range;
-	}
-	curYear = new Date().getFullYear();
-	inp.val("02/04/2008").datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), "2008", "Year range - read-only default");
-	inp.datepicker("hide").datepicker("option", {changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2008 - 10, 21), "Year range - changeable default");
-	inp.datepicker("hide").datepicker("option", {yearRange: "c-6:c+2", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2008 - 6, 9), "Year range - c-6:c+2");
-	inp.datepicker("hide").datepicker("option", {yearRange: "2000:2010", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2000, 11), "Year range - 2000:2010");
-	inp.datepicker("hide").datepicker("option", {yearRange: "-5:+3", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(curYear - 5, 9), "Year range - -5:+3");
-	inp.datepicker("hide").datepicker("option", {yearRange: "2000:-5", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2000, curYear - 2004), "Year range - 2000:-5");
-	inp.datepicker("hide").datepicker("option", {yearRange: "", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(curYear, 1), "Year range - -6:+2");
-
-	// Navigation as date format
-	inp.datepicker("option", {showButtonPanel: true});
-	equal(dp.find(".ui-datepicker-prev").text(), "Prev", "Navigation prev - default");
-	equal(dp.find(".ui-datepicker-current").text(), "Today", "Navigation current - default");
-	equal(dp.find(".ui-datepicker-next").text(), "Next", "Navigation next - default");
-	inp.datepicker("hide").datepicker("option", {navigationAsDateFormat: true, prevText: "< M", currentText: "MM", nextText: "M >"}).
-		val("02/04/2008").datepicker("show");
-	longNames = $.datepicker.regional[""].monthNames;
-	shortNames = $.datepicker.regional[""].monthNamesShort;
-	date = new Date();
-	equal(dp.find(".ui-datepicker-prev").text(), "< " + shortNames[0], "Navigation prev - as date format");
-	equal(dp.find(".ui-datepicker-current").text(),
-		longNames[date.getMonth()], "Navigation current - as date format");
-	equal(dp.find(".ui-datepicker-next").text(),
-		shortNames[2] + " >", "Navigation next - as date format");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN});
-	equal(dp.find(".ui-datepicker-prev").text(),
-		"< " + shortNames[1], "Navigation prev - as date format + pgdn");
-	equal(dp.find(".ui-datepicker-current").text(),
-		longNames[date.getMonth()], "Navigation current - as date format + pgdn");
-	equal(dp.find(".ui-datepicker-next").text(),
-		shortNames[3] + " >", "Navigation next - as date format + pgdn");
-	inp.datepicker("hide").datepicker("option", {gotoCurrent: true}).
-		val("02/04/2008").datepicker("show");
-	equal(dp.find(".ui-datepicker-prev").text(),
-		"< " + shortNames[0], "Navigation prev - as date format + goto current");
-	equal(dp.find(".ui-datepicker-current").text(),
-		longNames[1], "Navigation current - as date format + goto current");
-	equal(dp.find(".ui-datepicker-next").text(),
-		shortNames[2] + " >", "Navigation next - as date format + goto current");
-});
-
-test("minMax", function() {
-	expect( 23 );
-	var date,
-		inp = testHelper.init("#inp"),
-		dp = $("#ui-datepicker-div"),
-		lastYear = new Date(2007, 6 - 1, 4),
-		nextYear = new Date(2009, 6 - 1, 4),
-		minDate = new Date(2008, 2 - 1, 29),
-		maxDate = new Date(2008, 12 - 1, 7);
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), lastYear,
-		"Min/max - null, null - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), nextYear,
-		"Min/max - null, null - ctrl+pgdn");
-	inp.datepicker("option", {minDate: minDate}).
-		datepicker("hide").val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate,
-		"Min/max - 02/29/2008, null - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), nextYear,
-		"Min/max - 02/29/2008, null - ctrl+pgdn");
-	inp.datepicker("option", {maxDate: maxDate}).
-		datepicker("hide").val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate,
-		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate,
-		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgdn");
-	inp.datepicker("option", {minDate: null}).
-		datepicker("hide").val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), lastYear,
-		"Min/max - null, 12/07/2008 - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate,
-		"Min/max - null, 12/07/2008 - ctrl+pgdn");
-	// Relative dates
-	date = new Date();
-	date.setDate(date.getDate() - 7);
-	inp.datepicker("option", {minDate: "-1w", maxDate: "+1 M +10 D "}).
-		datepicker("hide").val("").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date,
-		"Min/max - -1w, +1 M +10 D - ctrl+pgup");
-	date = testHelper.addMonths(new Date(), 1);
-	date.setDate(date.getDate() + 10);
-	inp.val("").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date,
-		"Min/max - -1w, +1 M +10 D - ctrl+pgdn");
-	// With existing date
-	inp = testHelper.init("#inp");
-	inp.val("06/04/2008").datepicker("option", {minDate: minDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate > min");
-	inp.datepicker("option", {minDate: null}).val("01/04/2008").datepicker("option", {minDate: minDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Min/max - setDate < min");
-	inp.datepicker("option", {minDate: null}).val("06/04/2008").datepicker("option", {maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate < max");
-	inp.datepicker("option", {maxDate: null}).val("01/04/2009").datepicker("option", {maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Min/max - setDate > max");
-	inp.datepicker("option", {maxDate: null}).val("01/04/2008").datepicker("option", {minDate: minDate, maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Min/max - setDate < min");
-	inp.datepicker("option", {maxDate: null}).val("06/04/2008").datepicker("option", {minDate: minDate, maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate > min, < max");
-	inp.datepicker("option", {maxDate: null}).val("01/04/2009").datepicker("option", {minDate: minDate, maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Min/max - setDate > max");
-
-	inp.datepicker("option", {yearRange: "-0:+1"}).val("01/01/" + new Date().getFullYear());
-	ok(dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - previous button disabled at 1/1/minYear");
-	inp.datepicker("setDate", "12/30/" + new Date().getFullYear());
-	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - next button disabled at 12/30/maxYear");
-
-	inp.datepicker("option", {
-		minDate: new Date(1900, 0, 1),
-		maxDate: "-7Y",
-		yearRange: "1900:-7"
-	}).val( "" );
-	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - relative - next button disabled");
-	ok(!dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - relative - prev button enabled");
-
-	inp.datepicker("option", {
-		minDate: new Date(1900, 0, 1),
-		maxDate: "1/25/2007",
-		yearRange: "1900:2007"
-	}).val( "" );
-	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - absolute - next button disabled");
-	ok(!dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - absolute - prev button enabled");
-});
-
-test("setDate", function() {
-	expect( 24 );
-	var inl, alt, minDate, maxDate, dateAndTimeToSet, dateAndTimeClone,
-		inp = testHelper.init("#inp"),
-		date1 = new Date(2008, 6 - 1, 4),
-		date2 = new Date();
-	ok(inp.datepicker("getDate") == null, "Set date - default");
-	inp.datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - 2008-06-04");
-	date1 = new Date();
-	date1.setDate(date1.getDate() + 7);
-	inp.datepicker("setDate", +7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - +7");
-	date2.setFullYear(date2.getFullYear() + 2);
-	inp.datepicker("setDate", "+2y");
-	testHelper.equalsDate(inp.datepicker("getDate"), date2, "Set date - +2y");
-	inp.datepicker("setDate", date1, date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - two dates");
-	inp.datepicker("setDate");
-	ok(inp.datepicker("getDate") == null, "Set date - null");
-	// Relative to current date
-	date1 = new Date();
-	date1.setDate(date1.getDate() + 7);
-	inp.datepicker("setDate", "c +7");
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c +7");
-	date1.setDate(date1.getDate() + 7);
-	inp.datepicker("setDate", "c+7");
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c+7");
-	date1.setDate(date1.getDate() - 21);
-	inp.datepicker("setDate", "c -3 w");
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c -3 w");
-	// Inline
-	inl = testHelper.init("#inl");
-	date1 = new Date(2008, 6 - 1, 4);
-	date2 = new Date();
-	testHelper.equalsDate(inl.datepicker("getDate"), date2, "Set date inline - default");
-	inl.datepicker("setDate", date1);
-	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - 2008-06-04");
-	date1 = new Date();
-	date1.setDate(date1.getDate() + 7);
-	inl.datepicker("setDate", +7);
-	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - +7");
-	date2.setFullYear(date2.getFullYear() + 2);
-	inl.datepicker("setDate", "+2y");
-	testHelper.equalsDate(inl.datepicker("getDate"), date2, "Set date inline - +2y");
-	inl.datepicker("setDate", date1, date2);
-	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - two dates");
-	inl.datepicker("setDate");
-	ok(inl.datepicker("getDate") == null, "Set date inline - null");
-	// Alternate field
-	alt = $("#alt");
-	inp.datepicker("option", {altField: "#alt", altFormat: "yy-mm-dd"});
-	date1 = new Date(2008, 6 - 1, 4);
-	inp.datepicker("setDate", date1);
-	equal(inp.val(), "06/04/2008", "Set date alternate - 06/04/2008");
-	equal(alt.val(), "2008-06-04", "Set date alternate - 2008-06-04");
-	// With minimum/maximum
-	inp = testHelper.init("#inp");
-	date1 = new Date(2008, 1 - 1, 4);
-	date2 = new Date(2008, 6 - 1, 4);
-	minDate = new Date(2008, 2 - 1, 29);
-	maxDate = new Date(2008, 3 - 1, 28);
-	inp.val("").datepicker("option", {minDate: minDate}).datepicker("setDate", date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date2, "Set date min/max - setDate > min");
-	inp.datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Set date min/max - setDate < min");
-	inp.val("").datepicker("option", {maxDate: maxDate, minDate: null}).datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date min/max - setDate < max");
-	inp.datepicker("setDate", date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Set date min/max - setDate > max");
-	inp.val("").datepicker("option", {minDate: minDate}).datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Set date min/max - setDate < min");
-	inp.datepicker("setDate", date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Set date min/max - setDate > max");
-	dateAndTimeToSet = new Date(2008, 3 - 1, 28, 1, 11, 0);
-	dateAndTimeClone = new Date(2008, 3 - 1, 28, 1, 11, 0);
-	inp.datepicker("setDate", dateAndTimeToSet);
-	equal(dateAndTimeToSet.getTime(), dateAndTimeClone.getTime(), "Date object passed should not be changed by setDate");
-});
-
-test("altField", function() {
-	expect( 10 );
-	var inp = testHelper.init("#inp"),
-		alt = $("#alt");
-	// No alternate field set
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(inp.val(), "06/04/2008", "Alt field - dp - enter");
-	equal(alt.val(), "", "Alt field - alt not set");
-	// Alternate field set
-	alt.val("");
-	inp.datepicker("option", {altField: "#alt", altFormat: "yy-mm-dd"}).
-		val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(inp.val(), "06/04/2008", "Alt field - dp - enter");
-	equal(alt.val(), "2008-06-04", "Alt field - alt - enter");
-	// Move from initial date
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(inp.val(), "07/04/2008", "Alt field - dp - pgdn");
-	equal(alt.val(), "2008-07-04", "Alt field - alt - pgdn");
-	// Alternate field set - closed
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	equal(inp.val(), "06/04/2008", "Alt field - dp - pgdn/esc");
-	equal(alt.val(), "", "Alt field - alt - pgdn/esc");
-	// Clear date and alternate
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
-	equal(inp.val(), "", "Alt field - dp - ctrl+end");
-	equal(alt.val(), "", "Alt field - alt - ctrl+end");
-});
-
-test("autoSize", function() {
-	expect( 15 );
-	var inp = testHelper.init("#inp");
-	equal(inp.prop("size"), 20, "Auto size - default");
-	inp.datepicker("option", "autoSize", true);
-	equal(inp.prop("size"), 10, "Auto size - mm/dd/yy");
-	inp.datepicker("option", "dateFormat", "m/d/yy");
-	equal(inp.prop("size"), 10, "Auto size - m/d/yy");
-	inp.datepicker("option", "dateFormat", "D M d yy");
-	equal(inp.prop("size"), 15, "Auto size - D M d yy");
-	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
-	equal(inp.prop("size"), 29, "Auto size - DD, MM dd, yy");
-
-	// French
-	inp.datepicker("option", $.extend({autoSize: false}, $.datepicker.regional.fr));
-	equal(inp.prop("size"), 29, "Auto size - fr - default");
-	inp.datepicker("option", "autoSize", true);
-	equal(inp.prop("size"), 10, "Auto size - fr - dd/mm/yy");
-	inp.datepicker("option", "dateFormat", "m/d/yy");
-	equal(inp.prop("size"), 10, "Auto size - fr - m/d/yy");
-	inp.datepicker("option", "dateFormat", "D M d yy");
-	equal(inp.prop("size"), 18, "Auto size - fr - D M d yy");
-	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
-	equal(inp.prop("size"), 28, "Auto size - fr - DD, MM dd, yy");
-
-	// Hebrew
-	inp.datepicker("option", $.extend({autoSize: false}, $.datepicker.regional.he));
-	equal(inp.prop("size"), 28, "Auto size - he - default");
-	inp.datepicker("option", "autoSize", true);
-	equal(inp.prop("size"), 10, "Auto size - he - dd/mm/yy");
-	inp.datepicker("option", "dateFormat", "m/d/yy");
-	equal(inp.prop("size"), 10, "Auto size - he - m/d/yy");
-	inp.datepicker("option", "dateFormat", "D M d yy");
-	equal(inp.prop("size"), 16, "Auto size - he - D M d yy");
-	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
-	equal(inp.prop("size"), 23, "Auto size - he - DD, MM dd, yy");
-});
-
-test("daylightSaving", function() {
-	expect( 25 );
-	var inp = testHelper.init("#inp"),
-		dp = $("#ui-datepicker-div");
-	ok(true, "Daylight saving - " + new Date());
-	// Australia, Sydney - AM change, southern hemisphere
-	inp.val("04/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
-	equal(inp.val(), "04/05/2008", "Daylight saving - Australia 04/05/2008");
-	inp.val("04/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
-	equal(inp.val(), "04/06/2008", "Daylight saving - Australia 04/06/2008");
-	inp.val("04/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
-	equal(inp.val(), "04/07/2008", "Daylight saving - Australia 04/07/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
-	equal(inp.val(), "10/04/2008", "Daylight saving - Australia 10/04/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
-	equal(inp.val(), "10/05/2008", "Daylight saving - Australia 10/05/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
-	equal(inp.val(), "10/06/2008", "Daylight saving - Australia 10/06/2008");
-	// Brasil, Brasilia - midnight change, southern hemisphere
-	inp.val("02/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(20) a", dp).simulate("click");
-	equal(inp.val(), "02/16/2008", "Daylight saving - Brasil 02/16/2008");
-	inp.val("02/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(21) a", dp).simulate("click");
-	equal(inp.val(), "02/17/2008", "Daylight saving - Brasil 02/17/2008");
-	inp.val("02/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(22) a", dp).simulate("click");
-	equal(inp.val(), "02/18/2008", "Daylight saving - Brasil 02/18/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(13) a", dp).simulate("click");
-	equal(inp.val(), "10/11/2008", "Daylight saving - Brasil 10/11/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(14) a", dp).simulate("click");
-	equal(inp.val(), "10/12/2008", "Daylight saving - Brasil 10/12/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(15) a", dp).simulate("click");
-	equal(inp.val(), "10/13/2008", "Daylight saving - Brasil 10/13/2008");
-	// Lebanon, Beirut - midnight change, northern hemisphere
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(34) a", dp).simulate("click");
-	equal(inp.val(), "03/29/2008", "Daylight saving - Lebanon 03/29/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(35) a", dp).simulate("click");
-	equal(inp.val(), "03/30/2008", "Daylight saving - Lebanon 03/30/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(36) a", dp).simulate("click");
-	equal(inp.val(), "03/31/2008", "Daylight saving - Lebanon 03/31/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(27) a", dp).simulate("click");
-	equal(inp.val(), "10/25/2008", "Daylight saving - Lebanon 10/25/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(28) a", dp).simulate("click");
-	equal(inp.val(), "10/26/2008", "Daylight saving - Lebanon 10/26/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(29) a", dp).simulate("click");
-	equal(inp.val(), "10/27/2008", "Daylight saving - Lebanon 10/27/2008");
-	// US, Eastern - AM change, northern hemisphere
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(13) a", dp).simulate("click");
-	equal(inp.val(), "03/08/2008", "Daylight saving - US 03/08/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(14) a", dp).simulate("click");
-	equal(inp.val(), "03/09/2008", "Daylight saving - US 03/09/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(15) a", dp).simulate("click");
-	equal(inp.val(), "03/10/2008", "Daylight saving - US 03/10/2008");
-	inp.val("11/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
-	equal(inp.val(), "11/01/2008", "Daylight saving - US 11/01/2008");
-	inp.val("11/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
-	equal(inp.val(), "11/02/2008", "Daylight saving - US 11/02/2008");
-	inp.val("11/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
-	equal(inp.val(), "11/03/2008", "Daylight saving - US 11/03/2008");
-});
-
-var beforeShowThis = null,
-	beforeShowInput = null,
-	beforeShowInst = null,
-	beforeShowDayThis = null,
-	beforeShowDayOK = true;
-
-function beforeAll(input, inst) {
-	beforeShowThis = this;
-	beforeShowInput = input;
-	beforeShowInst = inst;
-	return {currentText: "Current"};
-}
-
-function beforeDay(date) {
-	beforeShowDayThis = this;
-	beforeShowDayOK &= (date > new Date(2008, 1 - 1, 26) &&
-		date < new Date(2008, 3 - 1, 6));
-	return [(date.getDate() % 2 === 0), (date.getDate() % 10 === 0 ? "day10" : ""),
-		(date.getDate() % 3 === 0 ? "Divisble by 3" : "")];
-}
-
-test("callbacks", function() {
-	expect( 13 );
-	// Before show
-	var dp, day20, day21,
-		inp = testHelper.init("#inp", {beforeShow: beforeAll}),
-		inst = $.data(inp[0], "datepicker");
-	equal($.datepicker._get(inst, "currentText"), "Today", "Before show - initial");
-	inp.val("02/04/2008").datepicker("show");
-	equal($.datepicker._get(inst, "currentText"), "Current", "Before show - changed");
-	ok(beforeShowThis.id === inp[0].id, "Before show - this OK");
-	ok(beforeShowInput.id === inp[0].id, "Before show - input OK");
-	deepEqual(beforeShowInst, inst, "Before show - inst OK");
-	inp.datepicker("hide").datepicker("destroy");
-	// Before show day
-	inp = testHelper.init("#inp", {beforeShowDay: beforeDay});
-	dp = $("#ui-datepicker-div");
-	inp.val("02/04/2008").datepicker("show");
-	ok(beforeShowDayThis.id === inp[0].id, "Before show day - this OK");
-	ok(beforeShowDayOK, "Before show day - dates OK");
-	day20 = dp.find(".ui-datepicker-calendar td:contains('20')");
-	day21 = dp.find(".ui-datepicker-calendar td:contains('21')");
-	ok(!day20.is(".ui-datepicker-unselectable"), "Before show day - unselectable 20");
-	ok(day21.is(".ui-datepicker-unselectable"), "Before show day - unselectable 21");
-	ok(day20.is(".day10"), "Before show day - CSS 20");
-	ok(!day21.is(".day10"), "Before show day - CSS 21");
-	ok(!day20.attr("title"), "Before show day - title 20");
-	ok(day21.attr("title") === "Divisble by 3", "Before show day - title 21");
-	inp.datepicker("hide").datepicker("destroy");
-});
-
-test("beforeShowDay - tooltips with quotes", function() {
-	expect( 1 );
-	var inp, dp;
-	inp = testHelper.init("#inp", {
-		beforeShowDay: function() {
-			return [ true, "", "'" ];
-		}
-	});
-	dp = $("#ui-datepicker-div");
-
-	inp.datepicker("show");
-	equal( dp.find( ".ui-datepicker-calendar td:contains('9')").attr( "title" ), "'" );
-	inp.datepicker("hide").datepicker("destroy");
-});
-
-test("localisation", function() {
-	expect( 24 );
-	var dp, month, day, date,
-		inp = testHelper.init("#inp", $.datepicker.regional.fr);
-	inp.datepicker("option", {dateFormat: "DD, d MM yy", showButtonPanel:true, changeMonth:true, changeYear:true}).val("").datepicker("show");
-	dp = $("#ui-datepicker-div");
-	equal($(".ui-datepicker-close", dp).text(), "Fermer", "Localisation - close");
-	$(".ui-datepicker-close", dp).simulate("mouseover");
-	equal($(".ui-datepicker-prev", dp).text(), "Précédent", "Localisation - previous");
-	equal($(".ui-datepicker-current", dp).text(), "Aujourd'hui", "Localisation - current");
-	equal($(".ui-datepicker-next", dp).text(), "Suivant", "Localisation - next");
-	month = 0;
-	$(".ui-datepicker-month option", dp).each(function() {
-		equal($(this).text(), $.datepicker.regional.fr.monthNamesShort[month],
-			"Localisation - month " + month);
-		month++;
-	});
-	day = 1;
-	$(".ui-datepicker-calendar th", dp).each(function() {
-		equal($(this).text(), $.datepicker.regional.fr.dayNamesMin[day],
-			"Localisation - day " + day);
-		day = (day + 1) % 7;
-	});
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = new Date();
-	equal(inp.val(), $.datepicker.regional.fr.dayNames[date.getDay()] + ", " +
-		date.getDate() + " " + $.datepicker.regional.fr.monthNames[date.getMonth()] +
-		" " + date.getFullYear(), "Localisation - formatting");
-});
-
-test("noWeekends", function() {
-	expect( 31 );
-	var i, date;
-	for (i = 1; i <= 31; i++) {
-		date = new Date(2001, 1 - 1, i);
-		deepEqual($.datepicker.noWeekends(date), [(i + 1) % 7 >= 2, ""],
-			"No weekends " + date);
-	}
-});
-
-test("iso8601Week", function() {
-	expect( 12 );
-	var date = new Date(2000, 12 - 1, 31);
-	equal($.datepicker.iso8601Week(date), 52, "ISO 8601 week " + date);
-	date = new Date(2001, 1 - 1, 1);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2001, 1 - 1, 7);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2001, 1 - 1, 8);
-	equal($.datepicker.iso8601Week(date), 2, "ISO 8601 week " + date);
-	date = new Date(2003, 12 - 1, 28);
-	equal($.datepicker.iso8601Week(date), 52, "ISO 8601 week " + date);
-	date = new Date(2003, 12 - 1, 29);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2004, 1 - 1, 4);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2004, 1 - 1, 5);
-	equal($.datepicker.iso8601Week(date), 2, "ISO 8601 week " + date);
-	date = new Date(2009, 12 - 1, 28);
-	equal($.datepicker.iso8601Week(date), 53, "ISO 8601 week " + date);
-	date = new Date(2010, 1 - 1, 3);
-	equal($.datepicker.iso8601Week(date), 53, "ISO 8601 week " + date);
-	date = new Date(2010, 1 - 1, 4);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2010, 1 - 1, 10);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-});
-
-test("parseDate", function() {
-	expect( 26 );
-	testHelper.init("#inp");
-	var currentYear, gmtDate, fr, settings, zh;
-	ok($.datepicker.parseDate("d m y", "") == null, "Parse date empty");
-	testHelper.equalsDate($.datepicker.parseDate("d m y", "3 2 01"),
-		new Date(2001, 2 - 1, 3), "Parse date d m y");
-	testHelper.equalsDate($.datepicker.parseDate("dd mm yy", "03 02 2001"),
-		new Date(2001, 2 - 1, 3), "Parse date dd mm yy");
-	testHelper.equalsDate($.datepicker.parseDate("d m y", "13 12 01"),
-		new Date(2001, 12 - 1, 13), "Parse date d m y");
-	testHelper.equalsDate($.datepicker.parseDate("dd mm yy", "13 12 2001"),
-		new Date(2001, 12 - 1, 13), "Parse date dd mm yy");
-	testHelper.equalsDate($.datepicker.parseDate("y-o", "01-34"),
-		new Date(2001, 2 - 1, 3), "Parse date y-o");
-	testHelper.equalsDate($.datepicker.parseDate("yy-oo", "2001-347"),
-		new Date(2001, 12 - 1, 13), "Parse date yy-oo");
-	testHelper.equalsDate($.datepicker.parseDate("oo yy", "348 2004"),
-		new Date(2004, 12 - 1, 13), "Parse date oo yy");
-	testHelper.equalsDate($.datepicker.parseDate("D d M y", "Sat 3 Feb 01"),
-		new Date(2001, 2 - 1, 3), "Parse date D d M y");
-	testHelper.equalsDate($.datepicker.parseDate("d MM DD yy", "3 February Saturday 2001"),
-		new Date(2001, 2 - 1, 3), "Parse date dd MM DD yy");
-	testHelper.equalsDate($.datepicker.parseDate("DD, MM d, yy", "Saturday, February 3, 2001"),
-		new Date(2001, 2 - 1, 3), "Parse date DD, MM d, yy");
-	testHelper.equalsDate($.datepicker.parseDate("'day' d 'of' MM (''DD''), yy",
-		"day 3 of February ('Saturday'), 2001"), new Date(2001, 2 - 1, 3),
-		"Parse date 'day' d 'of' MM (''DD''), yy");
-	currentYear = new Date().getFullYear();
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000) + "-02-03"),
-			new Date(currentYear, 2 - 1, 3), "Parse date y-m-d - default cutuff");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 10) + "-02-03"),
-			new Date(currentYear+10, 2 - 1, 3), "Parse date y-m-d - default cutuff");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 11) + "-02-03"),
-			new Date(currentYear-89, 2 - 1, 3), "Parse date y-m-d - default cutuff");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", "80-02-03", {shortYearCutoff: 80}),
-		new Date(2080, 2 - 1, 3), "Parse date y-m-d - cutoff 80");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", "81-02-03", {shortYearCutoff: 80}),
-		new Date(1981, 2 - 1, 3), "Parse date y-m-d - cutoff 80");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 60) + "-02-03", {shortYearCutoff: "+60"}),
-			new Date(currentYear + 60, 2 - 1, 3), "Parse date y-m-d - cutoff +60");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 61) + "-02-03", {shortYearCutoff: "+60"}),
-			new Date(currentYear - 39, 2 - 1, 3), "Parse date y-m-d - cutoff +60");
-	gmtDate = new Date(2001, 2 - 1, 3);
-	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
-	testHelper.equalsDate($.datepicker.parseDate("@", "981158400000"), gmtDate, "Parse date @");
-	testHelper.equalsDate($.datepicker.parseDate("!", "631167552000000000"), gmtDate, "Parse date !");
-
-	fr = $.datepicker.regional.fr;
-	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
-		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-	testHelper.equalsDate($.datepicker.parseDate("D d M y", "Lun. 9 avr. 01", settings),
-		new Date(2001, 4 - 1, 9), "Parse date D M y with settings");
-	testHelper.equalsDate($.datepicker.parseDate("d MM DD yy", "9 Avril Lundi 2001", settings),
-		new Date(2001, 4 - 1, 9), "Parse date d MM DD yy with settings");
-	testHelper.equalsDate($.datepicker.parseDate("DD, MM d, yy", "Lundi, Avril 9, 2001", settings),
-		new Date(2001, 4 - 1, 9), "Parse date DD, MM d, yy with settings");
-	testHelper.equalsDate($.datepicker.parseDate("'jour' d 'de' MM (''DD''), yy", "jour 9 de Avril ('Lundi'), 2001", settings),
-		new Date(2001, 4 - 1, 9), "Parse date 'jour' d 'de' MM (''DD''), yy with settings");
-
-	zh = $.datepicker.regional["zh-CN"];
-	testHelper.equalsDate($.datepicker.parseDate("yy M d", "2011 十一月 22", zh),
-		new Date(2011, 11 - 1, 22), "Parse date yy M d with zh-CN");
-});
-
-test("parseDateErrors", function() {
-	expect( 18 );
-	testHelper.init("#inp");
-	var fr, settings;
-	function expectError(expr, value, error) {
-		try {
-			expr();
-			ok(false, "Parsed error " + value);
-		}
-		catch (e) {
-			equal(e, error, "Parsed error " + value);
-		}
-	}
-	expectError(function() { $.datepicker.parseDate(null, "Sat 2 01"); },
-		"Sat 2 01", "Invalid arguments");
-	expectError(function() { $.datepicker.parseDate("d m y", null); },
-		"null", "Invalid arguments");
-	expectError(function() { $.datepicker.parseDate("d m y", "Sat 2 01"); },
-		"Sat 2 01 - d m y", "Missing number at position 0");
-	expectError(function() { $.datepicker.parseDate("dd mm yy", "Sat 2 01"); },
-		"Sat 2 01 - dd mm yy", "Missing number at position 0");
-	expectError(function() { $.datepicker.parseDate("d m y", "3 Feb 01"); },
-		"3 Feb 01 - d m y", "Missing number at position 2");
-	expectError(function() { $.datepicker.parseDate("dd mm yy", "3 Feb 01"); },
-		"3 Feb 01 - dd mm yy", "Missing number at position 2");
-	expectError(function() { $.datepicker.parseDate("mm dd yy", "2 1 01"); },
-		"2 1 01 - dd mm yy", "Missing number at position 4");
-	expectError(function() { $.datepicker.parseDate("d m y", "3 2 AD01"); },
-		"3 2 AD01 - d m y", "Missing number at position 4");
-	expectError(function() { $.datepicker.parseDate("d m yy", "3 2 AD01"); },
-		"3 2 AD01 - dd mm yy", "Missing number at position 4");
-	expectError(function() { $.datepicker.parseDate("y-o", "01-D01"); },
-		"2001-D01 - y-o", "Missing number at position 3");
-	expectError(function() { $.datepicker.parseDate("yy-oo", "2001-D01"); },
-		"2001-D01 - yy-oo", "Missing number at position 5");
-	expectError(function() { $.datepicker.parseDate("D d M y", "D7 3 Feb 01"); },
-		"D7 3 Feb 01 - D d M y", "Unknown name at position 0");
-	expectError(function() { $.datepicker.parseDate("D d M y", "Sat 3 M2 01"); },
-		"Sat 3 M2 01 - D d M y", "Unknown name at position 6");
-	expectError(function() { $.datepicker.parseDate("DD, MM d, yy", "Saturday- Feb 3, 2001"); },
-		"Saturday- Feb 3, 2001 - DD, MM d, yy", "Unexpected literal at position 8");
-	expectError(function() { $.datepicker.parseDate("'day' d 'of' MM (''DD''), yy",
-		"day 3 of February (\"Saturday\"), 2001"); },
-		"day 3 of Mon2 ('Day7'), 2001", "Unexpected literal at position 19");
-	expectError(function() { $.datepicker.parseDate("d m y", "29 2 01"); },
-		"29 2 01 - d m y", "Invalid date");
-	fr = $.datepicker.regional.fr;
-	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
-		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-	expectError(function() { $.datepicker.parseDate("D d M y", "Mon 9 Avr 01", settings); },
-		"Mon 9 Avr 01 - D d M y", "Unknown name at position 0");
-	expectError(function() { $.datepicker.parseDate("D d M y", "Lun. 9 Apr 01", settings); },
-		"Lun. 9 Apr 01 - D d M y", "Unknown name at position 7");
-});
-
-test("Ticket #7244: date parser does not fail when too many numbers are passed into the date function", function() {
-	expect( 4 );
-	var date;
-	try{
-		date = $.datepicker.parseDate("dd/mm/yy", "18/04/19881");
-		ok(false, "Did not properly detect an invalid date");
-	}catch(e){
-		ok("invalid date detected");
-	}
-
-	try {
-		date = $.datepicker.parseDate("dd/mm/yy", "18/04/1988 @ 2:43 pm");
-		equal(date.getDate(), 18);
-		equal(date.getMonth(), 3);
-		equal(date.getFullYear(), 1988);
-	} catch(e) {
-		ok(false, "Did not properly parse date with extra text separated by whitespace");
-	}
-});
-
-test("formatDate", function() {
-	expect( 16 );
-	testHelper.init("#inp");
-	var gmtDate, fr, settings;
-	equal($.datepicker.formatDate("d m y", new Date(2001, 2 - 1, 3)),
-		"3 2 01", "Format date d m y");
-	equal($.datepicker.formatDate("dd mm yy", new Date(2001, 2 - 1, 3)),
-		"03 02 2001", "Format date dd mm yy");
-	equal($.datepicker.formatDate("d m y", new Date(2001, 12 - 1, 13)),
-		"13 12 01", "Format date d m y");
-	equal($.datepicker.formatDate("dd mm yy", new Date(2001, 12 - 1, 13)),
-		"13 12 2001", "Format date dd mm yy");
-	equal($.datepicker.formatDate("yy-o", new Date(2001, 2 - 1, 3)),
-		"2001-34", "Format date yy-o");
-	equal($.datepicker.formatDate("yy-oo", new Date(2001, 2 - 1, 3)),
-		"2001-034", "Format date yy-oo");
-	equal($.datepicker.formatDate("D M y", new Date(2001, 2 - 1, 3)),
-		"Sat Feb 01", "Format date D M y");
-	equal($.datepicker.formatDate("DD MM yy", new Date(2001, 2 - 1, 3)),
-		"Saturday February 2001", "Format date DD MM yy");
-	equal($.datepicker.formatDate("DD, MM d, yy", new Date(2001, 2 - 1, 3)),
-		"Saturday, February 3, 2001", "Format date DD, MM d, yy");
-	equal($.datepicker.formatDate("'day' d 'of' MM (''DD''), yy",
-		new Date(2001, 2 - 1, 3)), "day 3 of February ('Saturday'), 2001",
-		"Format date 'day' d 'of' MM ('DD'), yy");
-	gmtDate = new Date(2001, 2 - 1, 3);
-	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
-	equal($.datepicker.formatDate("@", gmtDate), "981158400000", "Format date @");
-	equal($.datepicker.formatDate("!", gmtDate), "631167552000000000", "Format date !");
-	fr = $.datepicker.regional.fr;
-	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
-		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-	equal($.datepicker.formatDate("D M y", new Date(2001, 4 - 1, 9), settings),
-		"lun. avr. 01", "Format date D M y with settings");
-	equal($.datepicker.formatDate("DD MM yy", new Date(2001, 4 - 1, 9), settings),
-		"lundi avril 2001", "Format date DD MM yy with settings");
-	equal($.datepicker.formatDate("DD, MM d, yy", new Date(2001, 4 - 1, 9), settings),
-		"lundi, avril 9, 2001", "Format date DD, MM d, yy with settings");
-	equal($.datepicker.formatDate("'jour' d 'de' MM (''DD''), yy",
-		new Date(2001, 4 - 1, 9), settings), "jour 9 de avril ('lundi'), 2001",
-		"Format date 'jour' d 'de' MM (''DD''), yy with settings");
-});
-
-// TODO: Fix this test so it isn't mysteriously flaky in Browserstack on certain OS/Browser combos
-// test("Ticket 6827: formatDate day of year calculation is wrong during day lights savings time", function(){
-// 	expect( 1 );
-// 	var time = $.datepicker.formatDate("oo", new Date("2010/03/30 12:00:00 CDT"));
-// 	equal(time, "089");
-// });
-
-test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler", function() {
-	expect( 3 );
-
-	var inp, dp;
-
-	inp = testHelper.init( "#inp", {
-		beforeShow: function() {
-		}
-	});
-	dp = $( "#ui-datepicker-div" );
-	inp.datepicker( "show" );
-	equal( dp.css( "display" ), "block", "beforeShow returns nothing" );
-	inp.datepicker( "hide" ).datepicker( "destroy" );
-
-	inp = testHelper.init( "#inp", {
-		beforeShow: function() {
-			return true;
-		}
-	});
-	dp = $( "#ui-datepicker-div" );
-	inp.datepicker( "show" );
-	equal( dp.css( "display" ), "block", "beforeShow returns true" );
-	inp.datepicker( "hide" );
-	inp.datepicker( "destroy" );
-
-	inp = testHelper.init( "#inp", {
-		beforeShow: function() {
-			return false;
-		}
-	});
-	dp = $( "#ui-datepicker-div" );
-	inp.datepicker( "show" );
-	equal( dp.css( "display" ), "none","beforeShow returns false" );
-	inp.datepicker( "destroy" );
-});
-
-} );
diff --git a/tests/unit/datepicker/datepicker_test_helpers.js b/tests/unit/datepicker/datepicker_test_helpers.js
deleted file mode 100644
index 4cd9b48ff..000000000
--- a/tests/unit/datepicker/datepicker_test_helpers.js
+++ /dev/null
@@ -1,38 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper",
-	"ui/datepicker"
-], function( $, helper ) {
-
-return $.extend( helper, {
-	addMonths: function(date, offset) {
-		var maxDay = 32 - new Date(date.getFullYear(), date.getMonth() + offset, 32).getDate();
-		date.setDate(Math.min(date.getDate(), maxDay));
-		date.setMonth(date.getMonth() + offset);
-		return date;
-	},
-
-	equalsDate: function(d1, d2, message) {
-		if (!d1 || !d2) {
-			ok(false, message + " - missing date");
-			return;
-		}
-		d1 = new Date(d1.getFullYear(), d1.getMonth(), d1.getDate());
-		d2 = new Date(d2.getFullYear(), d2.getMonth(), d2.getDate());
-		equal(d1.toString(), d2.toString(), message);
-	},
-
-	init: function( id, options ) {
-		$.datepicker.setDefaults( $.datepicker.regional[ "" ] );
-		return $( id ).datepicker( $.extend( { showAnim: "" }, options || {} ) );
-	},
-
-	initNewInput: function( options ) {
-		var id = $( "<input>" ).appendTo( "#qunit-fixture" );
-		return this.init( id, options );
-	},
-
-	PROP_NAME: "datepicker"
-} );
-
-} );
diff --git a/tests/unit/datepicker/events.js b/tests/unit/datepicker/events.js
new file mode 100644
index 000000000..ea69c1aaa
--- /dev/null
+++ b/tests/unit/datepicker/events.js
@@ -0,0 +1,154 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/datepicker"
+], function( $, testHelper ) {
+
+module("datepicker: events");
+
+var selectedThis = null,
+selectedDate = null,
+selectedInst = null;
+
+function callback(date, inst) {
+	selectedThis = this;
+	selectedDate = date;
+	selectedInst = inst;
+}
+
+function callback2(year, month, inst) {
+	selectedThis = this;
+	selectedDate = year + "/" + month;
+	selectedInst = inst;
+}
+
+test("events", function() {
+	expect( 26 );
+	var dateStr, newMonthYear, inp2,
+		inp = testHelper.init("#inp", {onSelect: callback}),
+	date = new Date();
+	// onSelect
+	inp.val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	equal(selectedThis, inp[0], "Callback selected this");
+	equal(selectedInst, $.data(inp[0], testHelper.PROP_NAME), "Callback selected inst");
+	equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", date),
+		"Callback selected date");
+	inp.val("").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() + 7);
+	equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", date),
+		"Callback selected date - ctrl+down");
+	inp.val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+	equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", date),
+		"Callback selected date - esc");
+    dateStr = "02/04/2008";
+    inp.val(dateStr).datepicker("show").
+        simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+    equal(dateStr, selectedDate,
+        "onSelect is called after enter keydown");
+	// onChangeMonthYear
+	inp.datepicker("option", {onChangeMonthYear: callback2, onSelect: null}).
+		val("").datepicker("show");
+	newMonthYear = function(date) {
+		return date.getFullYear() + "/" + (date.getMonth() + 1);
+	};
+	date = new Date();
+	date.setDate(1);
+	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP});
+	date.setMonth(date.getMonth() - 1);
+	equal(selectedThis, inp[0], "Callback change month/year this");
+	equal(selectedInst, $.data(inp[0], testHelper.PROP_NAME), "Callback change month/year inst");
+	equal(selectedDate, newMonthYear(date),
+		"Callback change month/year date - pgup");
+	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN});
+	date.setMonth(date.getMonth() + 1);
+	equal(selectedDate, newMonthYear(date),
+		"Callback change month/year date - pgdn");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP});
+	date.setFullYear(date.getFullYear() - 1);
+	equal(selectedDate, newMonthYear(date),
+		"Callback change month/year date - ctrl+pgup");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME});
+	date.setFullYear(date.getFullYear() + 1);
+	equal(selectedDate, newMonthYear(date),
+		"Callback change month/year date - ctrl+home");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN});
+	date.setFullYear(date.getFullYear() + 1);
+	equal(selectedDate, newMonthYear(date),
+		"Callback change month/year date - ctrl+pgdn");
+	inp.datepicker("setDate", new Date(2007, 1 - 1, 26));
+	equal(selectedDate, "2007/1", "Callback change month/year date - setDate");
+	selectedDate = null;
+	inp.datepicker("setDate", new Date(2007, 1 - 1, 12));
+	ok(selectedDate == null, "Callback change month/year date - setDate no change");
+	// onChangeMonthYear step by 2
+	inp.datepicker("option", {stepMonths: 2}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP});
+	date.setMonth(date.getMonth() - 14);
+	equal(selectedDate, newMonthYear(date),
+		"Callback change month/year by 2 date - pgup");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP});
+	date.setMonth(date.getMonth() - 12);
+	equal(selectedDate, newMonthYear(date),
+		"Callback change month/year by 2 date - ctrl+pgup");
+	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN});
+	date.setMonth(date.getMonth() + 2);
+	equal(selectedDate, newMonthYear(date),
+		"Callback change month/year by 2 date - pgdn");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN});
+	date.setMonth(date.getMonth() + 12);
+	equal(selectedDate, newMonthYear(date),
+		"Callback change month/year by 2 date - ctrl+pgdn");
+	// onClose
+	inp.datepicker("option", {onClose: callback, onChangeMonthYear: null, stepMonths: 1}).
+		val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+	equal(selectedThis, inp[0], "Callback close this");
+	equal(selectedInst, $.data(inp[0], testHelper.PROP_NAME), "Callback close inst");
+	equal(selectedDate, "", "Callback close date - esc");
+	inp.val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", new Date()),
+		"Callback close date - enter");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+	equal(selectedDate, "02/04/2008", "Callback close date - preset");
+	inp.val("02/04/2008").datepicker("show").
+		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
+	equal(selectedDate, "", "Callback close date - ctrl+end");
+
+	inp2 = testHelper.init("#inp2");
+	inp2.datepicker().datepicker("option", {onClose: callback}).datepicker("show");
+	inp.datepicker("show");
+	equal(selectedThis, inp2[0], "Callback close this");
+});
+
+test("beforeShowDay-getDate", function() {
+	expect( 3 );
+	var inp = testHelper.init("#inp", {beforeShowDay: function() { inp.datepicker("getDate"); return [true, ""]; }}),
+		dp = $("#ui-datepicker-div");
+	inp.val("01/01/2010").datepicker("show");
+	// contains non-breaking space
+	equal($("div.ui-datepicker-title").text(),
+		// support: IE <9, jQuery <1.8
+		// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
+		$( "<span>January&#xa0;2010</span>" ).text(), "Initial month");
+	$("a.ui-datepicker-next", dp).click();
+	$("a.ui-datepicker-next", dp).click();
+	// contains non-breaking space
+	equal($("div.ui-datepicker-title").text(),
+		$( "<span>March&#xa0;2010</span>" ).text(), "After next clicks");
+	inp.datepicker("hide").datepicker("show");
+	$("a.ui-datepicker-prev", dp).click();
+	$("a.ui-datepicker-prev", dp).click();
+	// contains non-breaking space
+	equal($("div.ui-datepicker-title").text(),
+		$( "<span>November&#xa0;2009</span>" ).text(), "After prev clicks");
+	inp.datepicker("hide");
+});
+
+} );
diff --git a/tests/unit/datepicker/helper.js b/tests/unit/datepicker/helper.js
new file mode 100644
index 000000000..4cd9b48ff
--- /dev/null
+++ b/tests/unit/datepicker/helper.js
@@ -0,0 +1,38 @@
+define( [
+	"jquery",
+	"lib/helper",
+	"ui/datepicker"
+], function( $, helper ) {
+
+return $.extend( helper, {
+	addMonths: function(date, offset) {
+		var maxDay = 32 - new Date(date.getFullYear(), date.getMonth() + offset, 32).getDate();
+		date.setDate(Math.min(date.getDate(), maxDay));
+		date.setMonth(date.getMonth() + offset);
+		return date;
+	},
+
+	equalsDate: function(d1, d2, message) {
+		if (!d1 || !d2) {
+			ok(false, message + " - missing date");
+			return;
+		}
+		d1 = new Date(d1.getFullYear(), d1.getMonth(), d1.getDate());
+		d2 = new Date(d2.getFullYear(), d2.getMonth(), d2.getDate());
+		equal(d1.toString(), d2.toString(), message);
+	},
+
+	init: function( id, options ) {
+		$.datepicker.setDefaults( $.datepicker.regional[ "" ] );
+		return $( id ).datepicker( $.extend( { showAnim: "" }, options || {} ) );
+	},
+
+	initNewInput: function( options ) {
+		var id = $( "<input>" ).appendTo( "#qunit-fixture" );
+		return this.init( id, options );
+	},
+
+	PROP_NAME: "datepicker"
+} );
+
+} );
diff --git a/tests/unit/datepicker/methods.js b/tests/unit/datepicker/methods.js
new file mode 100644
index 000000000..14fefacc2
--- /dev/null
+++ b/tests/unit/datepicker/methods.js
@@ -0,0 +1,126 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/datepicker"
+], function( $, testHelper ) {
+
+module("datepicker: methods");
+
+test("destroy", function() {
+	expect( 33 );
+	var inl,
+		inp = testHelper.init("#inp");
+	ok(inp.is(".hasDatepicker"), "Default - marker class set");
+	ok($.data(inp[0], testHelper.PROP_NAME), "Default - instance present");
+	ok(inp.next().is("#alt"), "Default - button absent");
+	inp.datepicker("destroy");
+	inp = $("#inp");
+	ok(!inp.is(".hasDatepicker"), "Default - marker class cleared");
+	ok(!$.data(inp[0], testHelper.PROP_NAME), "Default - instance absent");
+	ok(inp.next().is("#alt"), "Default - button absent");
+	// With button
+	inp= testHelper.init("#inp", {showOn: "both"});
+	ok(inp.is(".hasDatepicker"), "Button - marker class set");
+	ok($.data(inp[0], testHelper.PROP_NAME), "Button - instance present");
+	ok(inp.next().text() === "...", "Button - button added");
+	inp.datepicker("destroy");
+	inp = $("#inp");
+	ok(!inp.is(".hasDatepicker"), "Button - marker class cleared");
+	ok(!$.data(inp[0], testHelper.PROP_NAME), "Button - instance absent");
+	ok(inp.next().is("#alt"), "Button - button removed");
+	// With append text
+	inp = testHelper.init("#inp", {appendText: "Testing"});
+	ok(inp.is(".hasDatepicker"), "Append - marker class set");
+	ok($.data(inp[0], testHelper.PROP_NAME), "Append - instance present");
+	ok(inp.next().text() === "Testing", "Append - append text added");
+	inp.datepicker("destroy");
+	inp = $("#inp");
+	ok(!inp.is(".hasDatepicker"), "Append - marker class cleared");
+	ok(!$.data(inp[0], testHelper.PROP_NAME), "Append - instance absent");
+	ok(inp.next().is("#alt"), "Append - append text removed");
+	// With both
+	inp= testHelper.init("#inp", {showOn: "both", buttonImageOnly: true,
+		buttonImage: "images/calendar.gif", appendText: "Testing"});
+	ok(inp.is(".hasDatepicker"), "Both - marker class set");
+	ok($.data(inp[0], testHelper.PROP_NAME), "Both - instance present");
+	ok(inp.next()[0].nodeName.toLowerCase() === "img", "Both - button added");
+	ok(inp.next().next().text() === "Testing", "Both - append text added");
+	inp.datepicker("destroy");
+	inp = $("#inp");
+	ok(!inp.is(".hasDatepicker"), "Both - marker class cleared");
+	ok(!$.data(inp[0], testHelper.PROP_NAME), "Both - instance absent");
+	ok(inp.next().is("#alt"), "Both - button and append text absent");
+	// Inline
+	inl = testHelper.init("#inl");
+	ok(inl.is(".hasDatepicker"), "Inline - marker class set");
+	ok(inl.html() !== "", "Inline - datepicker present");
+	ok($.data(inl[0], testHelper.PROP_NAME), "Inline - instance present");
+	ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
+	inl.datepicker("destroy");
+	inl = $("#inl");
+	ok(!inl.is(".hasDatepicker"), "Inline - marker class cleared");
+	ok(inl.html() === "", "Inline - datepicker absent");
+	ok(!$.data(inl[0], testHelper.PROP_NAME), "Inline - instance absent");
+	ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
+});
+
+test("enableDisable", function() {
+	expect( 33 );
+	var inl, dp,
+		inp = testHelper.init("#inp");
+	ok(!inp.datepicker("isDisabled"), "Enable/disable - initially marked as enabled");
+	ok(!inp[0].disabled, "Enable/disable - field initially enabled");
+	inp.datepicker("disable");
+	ok(inp.datepicker("isDisabled"), "Enable/disable - now marked as disabled");
+	ok(inp[0].disabled, "Enable/disable - field now disabled");
+	inp.datepicker("enable");
+	ok(!inp.datepicker("isDisabled"), "Enable/disable - now marked as enabled");
+	ok(!inp[0].disabled, "Enable/disable - field now enabled");
+	inp.datepicker("destroy");
+	// With a button
+	inp = testHelper.init("#inp", {showOn: "button"});
+	ok(!inp.datepicker("isDisabled"), "Enable/disable button - initially marked as enabled");
+	ok(!inp[0].disabled, "Enable/disable button - field initially enabled");
+	ok(!inp.next("button")[0].disabled, "Enable/disable button - button initially enabled");
+	inp.datepicker("disable");
+	ok(inp.datepicker("isDisabled"), "Enable/disable button - now marked as disabled");
+	ok(inp[0].disabled, "Enable/disable button - field now disabled");
+	ok(inp.next("button")[0].disabled, "Enable/disable button - button now disabled");
+	inp.datepicker("enable");
+	ok(!inp.datepicker("isDisabled"), "Enable/disable button - now marked as enabled");
+	ok(!inp[0].disabled, "Enable/disable button - field now enabled");
+	ok(!inp.next("button")[0].disabled, "Enable/disable button - button now enabled");
+	inp.datepicker("destroy");
+	// With an image button
+	inp = testHelper.init("#inp", {showOn: "button", buttonImageOnly: true,
+		buttonImage: "images/calendar.gif"});
+	ok(!inp.datepicker("isDisabled"), "Enable/disable image - initially marked as enabled");
+	ok(!inp[0].disabled, "Enable/disable image - field initially enabled");
+	ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image initially enabled");
+	inp.datepicker("disable");
+	ok(inp.datepicker("isDisabled"), "Enable/disable image - now marked as disabled");
+	ok(inp[0].disabled, "Enable/disable image - field now disabled");
+	ok(parseFloat(inp.next("img").css("opacity")) !== 1, "Enable/disable image - image now disabled");
+	inp.datepicker("enable");
+	ok(!inp.datepicker("isDisabled"), "Enable/disable image - now marked as enabled");
+	ok(!inp[0].disabled, "Enable/disable image - field now enabled");
+	ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image now enabled");
+	inp.datepicker("destroy");
+	// Inline
+	inl = testHelper.init("#inl", {changeYear: true});
+	dp = $(".ui-datepicker-inline", inl);
+	ok(!inl.datepicker("isDisabled"), "Enable/disable inline - initially marked as enabled");
+	ok(!dp.children().is(".ui-state-disabled"), "Enable/disable inline - not visually disabled initially");
+	ok(!dp.find("select").prop("disabled"), "Enable/disable inline - form element enabled initially");
+	inl.datepicker("disable");
+	ok(inl.datepicker("isDisabled"), "Enable/disable inline - now marked as disabled");
+	ok(dp.children().is(".ui-state-disabled"), "Enable/disable inline - visually disabled");
+	ok(dp.find("select").prop("disabled"), "Enable/disable inline - form element disabled");
+	inl.datepicker("enable");
+	ok(!inl.datepicker("isDisabled"), "Enable/disable inline - now marked as enabled");
+	ok(!dp.children().is(".ui-state-disabled"), "Enable/disable inline - not visiually disabled");
+	ok(!dp.find("select").prop("disabled"), "Enable/disable inline - form element enabled");
+	inl.datepicker("destroy");
+});
+
+} );
diff --git a/tests/unit/datepicker/options.js b/tests/unit/datepicker/options.js
new file mode 100644
index 000000000..c8a30678b
--- /dev/null
+++ b/tests/unit/datepicker/options.js
@@ -0,0 +1,1127 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/datepicker",
+	"ui/i18n/datepicker-fr",
+	"ui/i18n/datepicker-he",
+	"ui/i18n/datepicker-zh-CN"
+], function( $, testHelper ) {
+
+module("datepicker: options");
+
+test("setDefaults", function() {
+	expect( 3 );
+	testHelper.init("#inp");
+	equal($.datepicker._defaults.showOn, "focus", "Initial showOn");
+	$.datepicker.setDefaults({showOn: "button"});
+	equal($.datepicker._defaults.showOn, "button", "Change default showOn");
+	$.datepicker.setDefaults({showOn: "focus"});
+	equal($.datepicker._defaults.showOn, "focus", "Restore showOn");
+});
+
+test("option", function() {
+	expect( 17 );
+	var inp = testHelper.init("#inp"),
+	inst = $.data(inp[0], testHelper.PROP_NAME);
+	// Set option
+	equal(inst.settings.showOn, null, "Initial setting showOn");
+	equal($.datepicker._get(inst, "showOn"), "focus", "Initial instance showOn");
+	equal($.datepicker._defaults.showOn, "focus", "Initial default showOn");
+	inp.datepicker("option", "showOn", "button");
+	equal(inst.settings.showOn, "button", "Change setting showOn");
+	equal($.datepicker._get(inst, "showOn"), "button", "Change instance showOn");
+	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
+	inp.datepicker("option", {showOn: "both"});
+	equal(inst.settings.showOn, "both", "Change setting showOn");
+	equal($.datepicker._get(inst, "showOn"), "both", "Change instance showOn");
+	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
+	inp.datepicker("option", "showOn", undefined);
+	equal(inst.settings.showOn, null, "Clear setting showOn");
+	equal($.datepicker._get(inst, "showOn"), "focus", "Restore instance showOn");
+	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
+	// Get option
+	inp = testHelper.init("#inp");
+	equal(inp.datepicker("option", "showOn"), "focus", "Initial setting showOn");
+	inp.datepicker("option", "showOn", "button");
+	equal(inp.datepicker("option", "showOn"), "button", "Change instance showOn");
+	inp.datepicker("option", "showOn", undefined);
+	equal(inp.datepicker("option", "showOn"), "focus", "Reset instance showOn");
+	deepEqual(inp.datepicker("option", "all"), {showAnim: ""}, "Get instance settings");
+	deepEqual(inp.datepicker("option", "defaults"), $.datepicker._defaults,
+		"Get default settings");
+});
+
+test( "disabled", function() {
+	expect(8);
+	var inp = testHelper.init("#inp");
+	ok(!inp.datepicker("isDisabled"), "Initially marked as enabled");
+	ok(!inp[0].disabled, "Field initially enabled");
+	inp.datepicker("option", "disabled", true);
+	ok(inp.datepicker("isDisabled"), "Marked as disabled");
+	ok(inp[0].disabled, "Field now disabled");
+	inp.datepicker("option", "disabled", false);
+	ok(!inp.datepicker("isDisabled"), "Marked as enabled");
+	ok(!inp[0].disabled, "Field now enabled");
+	inp.datepicker("destroy");
+
+	inp = testHelper.init("#inp", { disabled: true });
+	ok(inp.datepicker("isDisabled"), "Initially marked as disabled");
+	ok(inp[0].disabled, "Field initially disabled");
+});
+
+test("change", function() {
+	expect( 12 );
+	var inp = testHelper.init("#inp"),
+	inst = $.data(inp[0], testHelper.PROP_NAME);
+	equal(inst.settings.showOn, null, "Initial setting showOn");
+	equal($.datepicker._get(inst, "showOn"), "focus", "Initial instance showOn");
+	equal($.datepicker._defaults.showOn, "focus", "Initial default showOn");
+	inp.datepicker("change", "showOn", "button");
+	equal(inst.settings.showOn, "button", "Change setting showOn");
+	equal($.datepicker._get(inst, "showOn"), "button", "Change instance showOn");
+	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
+	inp.datepicker("change", {showOn: "both"});
+	equal(inst.settings.showOn, "both", "Change setting showOn");
+	equal($.datepicker._get(inst, "showOn"), "both", "Change instance showOn");
+	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
+	inp.datepicker("change", "showOn", undefined);
+	equal(inst.settings.showOn, null, "Clear setting showOn");
+	equal($.datepicker._get(inst, "showOn"), "focus", "Restore instance showOn");
+	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
+});
+
+(function() {
+	var url = window.location.search;
+	url = decodeURIComponent( url.slice( url.indexOf( "swarmURL=" ) + 9 ) );
+
+	// TODO: This test occassionally fails in IE in TestSwarm
+	if ( $.ui.ie && url && url.indexOf( "http" ) === 0 ) {
+		return;
+	}
+
+	asyncTest( "invocation", function() {
+		var button, image,
+			isOldIE = $.ui.ie && ( !document.documentMode || document.documentMode < 9 ),
+			body = $( "body" );
+
+		expect( isOldIE ? 25 : 29 );
+
+		function step0() {
+			var inp = testHelper.initNewInput(),
+				dp = $( "#ui-datepicker-div" );
+
+			button = inp.siblings( "button" );
+			ok( button.length === 0, "Focus - button absent" );
+			image = inp.siblings( "img" );
+			ok( image.length === 0, "Focus - image absent" );
+
+			testHelper.onFocus( inp, function() {
+				ok( dp.is( ":visible" ), "Focus - rendered on focus" );
+				inp.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+				ok( !dp.is( ":visible" ), "Focus - hidden on exit" );
+				step1();
+			});
+		}
+
+		function step1() {
+
+			var inp = testHelper.initNewInput(),
+				dp = $( "#ui-datepicker-div" );
+
+			testHelper.onFocus( inp, function() {
+				ok( dp.is( ":visible" ), "Focus - rendered on focus" );
+				body.simulate( "mousedown", {} );
+				ok( !dp.is( ":visible" ), "Focus - hidden on external click" );
+				inp.datepicker( "hide" ).datepicker( "destroy" );
+
+				step2();
+			});
+		}
+
+		function step2() {
+			var inp = testHelper.initNewInput({
+					showOn: "button",
+					buttonText: "Popup"
+				}),
+				dp = $( "#ui-datepicker-div" );
+
+			ok( !dp.is( ":visible" ), "Button - initially hidden" );
+			button = inp.siblings( "button" );
+			image = inp.siblings( "img" );
+			ok( button.length === 1, "Button - button present" );
+			ok( image.length === 0, "Button - image absent" );
+			equal( button.text(), "Popup", "Button - button text" );
+
+			testHelper.onFocus( inp, function() {
+				ok( !dp.is( ":visible" ), "Button - not rendered on focus" );
+				button.click();
+				ok( dp.is( ":visible" ), "Button - rendered on button click" );
+				button.click();
+				ok( !dp.is( ":visible" ), "Button - hidden on second button click" );
+				inp.datepicker( "hide" ).datepicker( "destroy" );
+
+				step3();
+			});
+		}
+
+		function step3() {
+			var inp = testHelper.initNewInput({
+					showOn: "button",
+					buttonImageOnly: true,
+					buttonImage: "images/calendar.gif",
+					buttonText: "Cal"
+				}),
+				dp = $( "#ui-datepicker-div" );
+
+			ok( !dp.is( ":visible" ), "Image button - initially hidden" );
+			button = inp.siblings( "button" );
+			ok( button.length === 0, "Image button - button absent" );
+			image = inp.siblings( "img" );
+			ok( image.length === 1, "Image button - image present" );
+			ok( /images\/calendar\.gif$/.test( image.attr( "src" ) ), "Image button - image source" );
+			equal( image.attr( "title" ), "Cal", "Image button - image text" );
+
+			testHelper.onFocus( inp, function() {
+				ok( !dp.is( ":visible" ), "Image button - not rendered on focus" );
+				image.click();
+				ok( dp.is( ":visible" ), "Image button - rendered on image click" );
+				image.click();
+				ok( !dp.is( ":visible" ), "Image button - hidden on second image click" );
+				inp.datepicker( "hide" ).datepicker( "destroy" );
+
+				step4();
+			});
+		}
+
+		function step4() {
+			var inp = testHelper.initNewInput({
+					showOn: "both",
+					buttonImage: "images/calendar.gif"
+				}),
+				dp = $( "#ui-datepicker-div" );
+
+			ok( !dp.is( ":visible" ), "Both - initially hidden" );
+			button = inp.siblings( "button" );
+			ok( button.length === 1, "Both - button present" );
+			image = inp.siblings( "img" );
+			ok( image.length === 0, "Both - image absent" );
+			image = button.children( "img" );
+			ok( image.length === 1, "Both - button image present" );
+
+			// TODO: This test occasionally fails to focus in IE8 in BrowserStack
+			if ( !isOldIE ) {
+				testHelper.onFocus( inp, function() {
+					ok( dp.is( ":visible" ), "Both - rendered on focus" );
+					body.simulate( "mousedown", {} );
+					ok( !dp.is( ":visible" ), "Both - hidden on external click" );
+					button.click();
+					ok( dp.is( ":visible" ), "Both - rendered on button click" );
+					button.click();
+					ok( !dp.is( ":visible" ), "Both - hidden on second button click" );
+					inp.datepicker( "hide" ).datepicker( "destroy" );
+
+					start();
+				});
+			} else {
+				start();
+			}
+		}
+
+		step0();
+	});
+})();
+
+test("otherMonths", function() {
+	expect( 8 );
+	var inp = testHelper.init("#inp"),
+		pop = $("#ui-datepicker-div");
+	inp.val("06/01/2009").datepicker("show");
+	equal(pop.find("tbody").text(),
+		// support: IE <9, jQuery <1.8
+		// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
+		$( "<span>\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0</span>" ).text(),
+		"Other months - none");
+	ok(pop.find("td:last *").length === 0, "Other months - no content");
+	inp.datepicker("hide").datepicker("option", "showOtherMonths", true).datepicker("show");
+	equal(pop.find("tbody").text(), "311234567891011121314151617181920212223242526272829301234",
+		"Other months - show");
+	ok(pop.find("td:last span").length === 1, "Other months - span content");
+	inp.datepicker("hide").datepicker("option", "selectOtherMonths", true).datepicker("show");
+	equal(pop.find("tbody").text(), "311234567891011121314151617181920212223242526272829301234",
+		"Other months - select");
+	ok(pop.find("td:last a").length === 1, "Other months - link content");
+	inp.datepicker("hide").datepicker("option", "showOtherMonths", false).datepicker("show");
+	equal(pop.find("tbody").text(),
+		// support: IE <9, jQuery <1.8
+		// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
+		$( "<span>\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0</span>" ).text(),
+		"Other months - none");
+	ok(pop.find("td:last *").length === 0, "Other months - no content");
+});
+
+test("defaultDate", function() {
+	expect( 16 );
+	var inp = testHelper.init("#inp"),
+		date = new Date();
+	inp.val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date null");
+
+	// Numeric values
+	inp.datepicker("option", {defaultDate: -2}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() - 2);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2");
+
+	date = new Date();
+	inp.datepicker("option", {defaultDate: 3}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() + 3);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 3");
+
+	date = new Date();
+	inp.datepicker("option", {defaultDate: 1 / "a"}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date NaN");
+
+	// String offset values
+	inp.datepicker("option", {defaultDate: "-1d"}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() - 1);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -1d");
+	inp.datepicker("option", {defaultDate: "+3D"}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() + 4);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +3D");
+	inp.datepicker("option", {defaultDate: " -2 w "}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date = new Date();
+	date.setDate(date.getDate() - 14);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2 w");
+	inp.datepicker("option", {defaultDate: "+1 W"}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate(date.getDate() + 21);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1 W");
+	inp.datepicker("option", {defaultDate: " -1 m "}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date = testHelper.addMonths(new Date(), -1);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -1 m");
+	inp.datepicker("option", {defaultDate: "+2M"}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date = testHelper.addMonths(new Date(), 2);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +2M");
+	inp.datepicker("option", {defaultDate: "-2y"}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date = new Date();
+	date.setFullYear(date.getFullYear() - 2);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2y");
+	inp.datepicker("option", {defaultDate: "+1 Y "}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setFullYear(date.getFullYear() + 3);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1 Y");
+	inp.datepicker("option", {defaultDate: "+1M +10d"}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date = testHelper.addMonths(new Date(), 1);
+	date.setDate(date.getDate() + 10);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1M +10d");
+	// String date values
+	inp.datepicker("option", {defaultDate: "07/04/2007"}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date = new Date(2007, 7 - 1, 4);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 07/04/2007");
+	inp.datepicker("option", {dateFormat: "yy-mm-dd", defaultDate: "2007-04-02"}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date = new Date(2007, 4 - 1, 2);
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 2007-04-02");
+	// Date value
+	date = new Date(2007, 1 - 1, 26);
+	inp.datepicker("option", {dateFormat: "mm/dd/yy", defaultDate: date}).
+		datepicker("hide").val("").datepicker("show").
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 01/26/2007");
+});
+
+test("miscellaneous", function() {
+	expect( 19 );
+	var curYear, longNames, shortNames, date,
+		dp = $("#ui-datepicker-div"),
+		inp = testHelper.init("#inp");
+	// Year range
+	function genRange(start, offset) {
+		var i = start,
+			range = "";
+		for (; i < start + offset; i++) {
+			range += i;
+		}
+		return range;
+	}
+	curYear = new Date().getFullYear();
+	inp.val("02/04/2008").datepicker("show");
+	equal(dp.find(".ui-datepicker-year").text(), "2008", "Year range - read-only default");
+	inp.datepicker("hide").datepicker("option", {changeYear: true}).datepicker("show");
+	equal(dp.find(".ui-datepicker-year").text(), genRange(2008 - 10, 21), "Year range - changeable default");
+	inp.datepicker("hide").datepicker("option", {yearRange: "c-6:c+2", changeYear: true}).datepicker("show");
+	equal(dp.find(".ui-datepicker-year").text(), genRange(2008 - 6, 9), "Year range - c-6:c+2");
+	inp.datepicker("hide").datepicker("option", {yearRange: "2000:2010", changeYear: true}).datepicker("show");
+	equal(dp.find(".ui-datepicker-year").text(), genRange(2000, 11), "Year range - 2000:2010");
+	inp.datepicker("hide").datepicker("option", {yearRange: "-5:+3", changeYear: true}).datepicker("show");
+	equal(dp.find(".ui-datepicker-year").text(), genRange(curYear - 5, 9), "Year range - -5:+3");
+	inp.datepicker("hide").datepicker("option", {yearRange: "2000:-5", changeYear: true}).datepicker("show");
+	equal(dp.find(".ui-datepicker-year").text(), genRange(2000, curYear - 2004), "Year range - 2000:-5");
+	inp.datepicker("hide").datepicker("option", {yearRange: "", changeYear: true}).datepicker("show");
+	equal(dp.find(".ui-datepicker-year").text(), genRange(curYear, 1), "Year range - -6:+2");
+
+	// Navigation as date format
+	inp.datepicker("option", {showButtonPanel: true});
+	equal(dp.find(".ui-datepicker-prev").text(), "Prev", "Navigation prev - default");
+	equal(dp.find(".ui-datepicker-current").text(), "Today", "Navigation current - default");
+	equal(dp.find(".ui-datepicker-next").text(), "Next", "Navigation next - default");
+	inp.datepicker("hide").datepicker("option", {navigationAsDateFormat: true, prevText: "< M", currentText: "MM", nextText: "M >"}).
+		val("02/04/2008").datepicker("show");
+	longNames = $.datepicker.regional[""].monthNames;
+	shortNames = $.datepicker.regional[""].monthNamesShort;
+	date = new Date();
+	equal(dp.find(".ui-datepicker-prev").text(), "< " + shortNames[0], "Navigation prev - as date format");
+	equal(dp.find(".ui-datepicker-current").text(),
+		longNames[date.getMonth()], "Navigation current - as date format");
+	equal(dp.find(".ui-datepicker-next").text(),
+		shortNames[2] + " >", "Navigation next - as date format");
+	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN});
+	equal(dp.find(".ui-datepicker-prev").text(),
+		"< " + shortNames[1], "Navigation prev - as date format + pgdn");
+	equal(dp.find(".ui-datepicker-current").text(),
+		longNames[date.getMonth()], "Navigation current - as date format + pgdn");
+	equal(dp.find(".ui-datepicker-next").text(),
+		shortNames[3] + " >", "Navigation next - as date format + pgdn");
+	inp.datepicker("hide").datepicker("option", {gotoCurrent: true}).
+		val("02/04/2008").datepicker("show");
+	equal(dp.find(".ui-datepicker-prev").text(),
+		"< " + shortNames[0], "Navigation prev - as date format + goto current");
+	equal(dp.find(".ui-datepicker-current").text(),
+		longNames[1], "Navigation current - as date format + goto current");
+	equal(dp.find(".ui-datepicker-next").text(),
+		shortNames[2] + " >", "Navigation next - as date format + goto current");
+});
+
+test("minMax", function() {
+	expect( 23 );
+	var date,
+		inp = testHelper.init("#inp"),
+		dp = $("#ui-datepicker-div"),
+		lastYear = new Date(2007, 6 - 1, 4),
+		nextYear = new Date(2009, 6 - 1, 4),
+		minDate = new Date(2008, 2 - 1, 29),
+		maxDate = new Date(2008, 12 - 1, 7);
+	inp.val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), lastYear,
+		"Min/max - null, null - ctrl+pgup");
+	inp.val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), nextYear,
+		"Min/max - null, null - ctrl+pgdn");
+	inp.datepicker("option", {minDate: minDate}).
+		datepicker("hide").val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), minDate,
+		"Min/max - 02/29/2008, null - ctrl+pgup");
+	inp.val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), nextYear,
+		"Min/max - 02/29/2008, null - ctrl+pgdn");
+	inp.datepicker("option", {maxDate: maxDate}).
+		datepicker("hide").val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), minDate,
+		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgup");
+	inp.val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), maxDate,
+		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgdn");
+	inp.datepicker("option", {minDate: null}).
+		datepicker("hide").val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), lastYear,
+		"Min/max - null, 12/07/2008 - ctrl+pgup");
+	inp.val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), maxDate,
+		"Min/max - null, 12/07/2008 - ctrl+pgdn");
+	// Relative dates
+	date = new Date();
+	date.setDate(date.getDate() - 7);
+	inp.datepicker("option", {minDate: "-1w", maxDate: "+1 M +10 D "}).
+		datepicker("hide").val("").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), date,
+		"Min/max - -1w, +1 M +10 D - ctrl+pgup");
+	date = testHelper.addMonths(new Date(), 1);
+	date.setDate(date.getDate() + 10);
+	inp.val("").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	testHelper.equalsDate(inp.datepicker("getDate"), date,
+		"Min/max - -1w, +1 M +10 D - ctrl+pgdn");
+	// With existing date
+	inp = testHelper.init("#inp");
+	inp.val("06/04/2008").datepicker("option", {minDate: minDate});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate > min");
+	inp.datepicker("option", {minDate: null}).val("01/04/2008").datepicker("option", {minDate: minDate});
+	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Min/max - setDate < min");
+	inp.datepicker("option", {minDate: null}).val("06/04/2008").datepicker("option", {maxDate: maxDate});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate < max");
+	inp.datepicker("option", {maxDate: null}).val("01/04/2009").datepicker("option", {maxDate: maxDate});
+	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Min/max - setDate > max");
+	inp.datepicker("option", {maxDate: null}).val("01/04/2008").datepicker("option", {minDate: minDate, maxDate: maxDate});
+	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Min/max - setDate < min");
+	inp.datepicker("option", {maxDate: null}).val("06/04/2008").datepicker("option", {minDate: minDate, maxDate: maxDate});
+	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate > min, < max");
+	inp.datepicker("option", {maxDate: null}).val("01/04/2009").datepicker("option", {minDate: minDate, maxDate: maxDate});
+	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Min/max - setDate > max");
+
+	inp.datepicker("option", {yearRange: "-0:+1"}).val("01/01/" + new Date().getFullYear());
+	ok(dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - previous button disabled at 1/1/minYear");
+	inp.datepicker("setDate", "12/30/" + new Date().getFullYear());
+	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - next button disabled at 12/30/maxYear");
+
+	inp.datepicker("option", {
+		minDate: new Date(1900, 0, 1),
+		maxDate: "-7Y",
+		yearRange: "1900:-7"
+	}).val( "" );
+	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - relative - next button disabled");
+	ok(!dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - relative - prev button enabled");
+
+	inp.datepicker("option", {
+		minDate: new Date(1900, 0, 1),
+		maxDate: "1/25/2007",
+		yearRange: "1900:2007"
+	}).val( "" );
+	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - absolute - next button disabled");
+	ok(!dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - absolute - prev button enabled");
+});
+
+test("setDate", function() {
+	expect( 24 );
+	var inl, alt, minDate, maxDate, dateAndTimeToSet, dateAndTimeClone,
+		inp = testHelper.init("#inp"),
+		date1 = new Date(2008, 6 - 1, 4),
+		date2 = new Date();
+	ok(inp.datepicker("getDate") == null, "Set date - default");
+	inp.datepicker("setDate", date1);
+	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - 2008-06-04");
+	date1 = new Date();
+	date1.setDate(date1.getDate() + 7);
+	inp.datepicker("setDate", +7);
+	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - +7");
+	date2.setFullYear(date2.getFullYear() + 2);
+	inp.datepicker("setDate", "+2y");
+	testHelper.equalsDate(inp.datepicker("getDate"), date2, "Set date - +2y");
+	inp.datepicker("setDate", date1, date2);
+	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - two dates");
+	inp.datepicker("setDate");
+	ok(inp.datepicker("getDate") == null, "Set date - null");
+	// Relative to current date
+	date1 = new Date();
+	date1.setDate(date1.getDate() + 7);
+	inp.datepicker("setDate", "c +7");
+	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c +7");
+	date1.setDate(date1.getDate() + 7);
+	inp.datepicker("setDate", "c+7");
+	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c+7");
+	date1.setDate(date1.getDate() - 21);
+	inp.datepicker("setDate", "c -3 w");
+	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c -3 w");
+	// Inline
+	inl = testHelper.init("#inl");
+	date1 = new Date(2008, 6 - 1, 4);
+	date2 = new Date();
+	testHelper.equalsDate(inl.datepicker("getDate"), date2, "Set date inline - default");
+	inl.datepicker("setDate", date1);
+	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - 2008-06-04");
+	date1 = new Date();
+	date1.setDate(date1.getDate() + 7);
+	inl.datepicker("setDate", +7);
+	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - +7");
+	date2.setFullYear(date2.getFullYear() + 2);
+	inl.datepicker("setDate", "+2y");
+	testHelper.equalsDate(inl.datepicker("getDate"), date2, "Set date inline - +2y");
+	inl.datepicker("setDate", date1, date2);
+	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - two dates");
+	inl.datepicker("setDate");
+	ok(inl.datepicker("getDate") == null, "Set date inline - null");
+	// Alternate field
+	alt = $("#alt");
+	inp.datepicker("option", {altField: "#alt", altFormat: "yy-mm-dd"});
+	date1 = new Date(2008, 6 - 1, 4);
+	inp.datepicker("setDate", date1);
+	equal(inp.val(), "06/04/2008", "Set date alternate - 06/04/2008");
+	equal(alt.val(), "2008-06-04", "Set date alternate - 2008-06-04");
+	// With minimum/maximum
+	inp = testHelper.init("#inp");
+	date1 = new Date(2008, 1 - 1, 4);
+	date2 = new Date(2008, 6 - 1, 4);
+	minDate = new Date(2008, 2 - 1, 29);
+	maxDate = new Date(2008, 3 - 1, 28);
+	inp.val("").datepicker("option", {minDate: minDate}).datepicker("setDate", date2);
+	testHelper.equalsDate(inp.datepicker("getDate"), date2, "Set date min/max - setDate > min");
+	inp.datepicker("setDate", date1);
+	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Set date min/max - setDate < min");
+	inp.val("").datepicker("option", {maxDate: maxDate, minDate: null}).datepicker("setDate", date1);
+	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date min/max - setDate < max");
+	inp.datepicker("setDate", date2);
+	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Set date min/max - setDate > max");
+	inp.val("").datepicker("option", {minDate: minDate}).datepicker("setDate", date1);
+	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Set date min/max - setDate < min");
+	inp.datepicker("setDate", date2);
+	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Set date min/max - setDate > max");
+	dateAndTimeToSet = new Date(2008, 3 - 1, 28, 1, 11, 0);
+	dateAndTimeClone = new Date(2008, 3 - 1, 28, 1, 11, 0);
+	inp.datepicker("setDate", dateAndTimeToSet);
+	equal(dateAndTimeToSet.getTime(), dateAndTimeClone.getTime(), "Date object passed should not be changed by setDate");
+});
+
+test("altField", function() {
+	expect( 10 );
+	var inp = testHelper.init("#inp"),
+		alt = $("#alt");
+	// No alternate field set
+	alt.val("");
+	inp.val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	equal(inp.val(), "06/04/2008", "Alt field - dp - enter");
+	equal(alt.val(), "", "Alt field - alt not set");
+	// Alternate field set
+	alt.val("");
+	inp.datepicker("option", {altField: "#alt", altFormat: "yy-mm-dd"}).
+		val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	equal(inp.val(), "06/04/2008", "Alt field - dp - enter");
+	equal(alt.val(), "2008-06-04", "Alt field - alt - enter");
+	// Move from initial date
+	alt.val("");
+	inp.val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	equal(inp.val(), "07/04/2008", "Alt field - dp - pgdn");
+	equal(alt.val(), "2008-07-04", "Alt field - alt - pgdn");
+	// Alternate field set - closed
+	alt.val("");
+	inp.val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
+		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+	equal(inp.val(), "06/04/2008", "Alt field - dp - pgdn/esc");
+	equal(alt.val(), "", "Alt field - alt - pgdn/esc");
+	// Clear date and alternate
+	alt.val("");
+	inp.val("06/04/2008").datepicker("show");
+	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
+	equal(inp.val(), "", "Alt field - dp - ctrl+end");
+	equal(alt.val(), "", "Alt field - alt - ctrl+end");
+});
+
+test("autoSize", function() {
+	expect( 15 );
+	var inp = testHelper.init("#inp");
+	equal(inp.prop("size"), 20, "Auto size - default");
+	inp.datepicker("option", "autoSize", true);
+	equal(inp.prop("size"), 10, "Auto size - mm/dd/yy");
+	inp.datepicker("option", "dateFormat", "m/d/yy");
+	equal(inp.prop("size"), 10, "Auto size - m/d/yy");
+	inp.datepicker("option", "dateFormat", "D M d yy");
+	equal(inp.prop("size"), 15, "Auto size - D M d yy");
+	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
+	equal(inp.prop("size"), 29, "Auto size - DD, MM dd, yy");
+
+	// French
+	inp.datepicker("option", $.extend({autoSize: false}, $.datepicker.regional.fr));
+	equal(inp.prop("size"), 29, "Auto size - fr - default");
+	inp.datepicker("option", "autoSize", true);
+	equal(inp.prop("size"), 10, "Auto size - fr - dd/mm/yy");
+	inp.datepicker("option", "dateFormat", "m/d/yy");
+	equal(inp.prop("size"), 10, "Auto size - fr - m/d/yy");
+	inp.datepicker("option", "dateFormat", "D M d yy");
+	equal(inp.prop("size"), 18, "Auto size - fr - D M d yy");
+	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
+	equal(inp.prop("size"), 28, "Auto size - fr - DD, MM dd, yy");
+
+	// Hebrew
+	inp.datepicker("option", $.extend({autoSize: false}, $.datepicker.regional.he));
+	equal(inp.prop("size"), 28, "Auto size - he - default");
+	inp.datepicker("option", "autoSize", true);
+	equal(inp.prop("size"), 10, "Auto size - he - dd/mm/yy");
+	inp.datepicker("option", "dateFormat", "m/d/yy");
+	equal(inp.prop("size"), 10, "Auto size - he - m/d/yy");
+	inp.datepicker("option", "dateFormat", "D M d yy");
+	equal(inp.prop("size"), 16, "Auto size - he - D M d yy");
+	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
+	equal(inp.prop("size"), 23, "Auto size - he - DD, MM dd, yy");
+});
+
+test("daylightSaving", function() {
+	expect( 25 );
+	var inp = testHelper.init("#inp"),
+		dp = $("#ui-datepicker-div");
+	ok(true, "Daylight saving - " + new Date());
+	// Australia, Sydney - AM change, southern hemisphere
+	inp.val("04/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
+	equal(inp.val(), "04/05/2008", "Daylight saving - Australia 04/05/2008");
+	inp.val("04/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
+	equal(inp.val(), "04/06/2008", "Daylight saving - Australia 04/06/2008");
+	inp.val("04/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
+	equal(inp.val(), "04/07/2008", "Daylight saving - Australia 04/07/2008");
+	inp.val("10/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
+	equal(inp.val(), "10/04/2008", "Daylight saving - Australia 10/04/2008");
+	inp.val("10/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
+	equal(inp.val(), "10/05/2008", "Daylight saving - Australia 10/05/2008");
+	inp.val("10/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
+	equal(inp.val(), "10/06/2008", "Daylight saving - Australia 10/06/2008");
+	// Brasil, Brasilia - midnight change, southern hemisphere
+	inp.val("02/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(20) a", dp).simulate("click");
+	equal(inp.val(), "02/16/2008", "Daylight saving - Brasil 02/16/2008");
+	inp.val("02/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(21) a", dp).simulate("click");
+	equal(inp.val(), "02/17/2008", "Daylight saving - Brasil 02/17/2008");
+	inp.val("02/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(22) a", dp).simulate("click");
+	equal(inp.val(), "02/18/2008", "Daylight saving - Brasil 02/18/2008");
+	inp.val("10/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(13) a", dp).simulate("click");
+	equal(inp.val(), "10/11/2008", "Daylight saving - Brasil 10/11/2008");
+	inp.val("10/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(14) a", dp).simulate("click");
+	equal(inp.val(), "10/12/2008", "Daylight saving - Brasil 10/12/2008");
+	inp.val("10/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(15) a", dp).simulate("click");
+	equal(inp.val(), "10/13/2008", "Daylight saving - Brasil 10/13/2008");
+	// Lebanon, Beirut - midnight change, northern hemisphere
+	inp.val("03/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(34) a", dp).simulate("click");
+	equal(inp.val(), "03/29/2008", "Daylight saving - Lebanon 03/29/2008");
+	inp.val("03/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(35) a", dp).simulate("click");
+	equal(inp.val(), "03/30/2008", "Daylight saving - Lebanon 03/30/2008");
+	inp.val("03/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(36) a", dp).simulate("click");
+	equal(inp.val(), "03/31/2008", "Daylight saving - Lebanon 03/31/2008");
+	inp.val("10/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(27) a", dp).simulate("click");
+	equal(inp.val(), "10/25/2008", "Daylight saving - Lebanon 10/25/2008");
+	inp.val("10/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(28) a", dp).simulate("click");
+	equal(inp.val(), "10/26/2008", "Daylight saving - Lebanon 10/26/2008");
+	inp.val("10/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(29) a", dp).simulate("click");
+	equal(inp.val(), "10/27/2008", "Daylight saving - Lebanon 10/27/2008");
+	// US, Eastern - AM change, northern hemisphere
+	inp.val("03/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(13) a", dp).simulate("click");
+	equal(inp.val(), "03/08/2008", "Daylight saving - US 03/08/2008");
+	inp.val("03/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(14) a", dp).simulate("click");
+	equal(inp.val(), "03/09/2008", "Daylight saving - US 03/09/2008");
+	inp.val("03/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(15) a", dp).simulate("click");
+	equal(inp.val(), "03/10/2008", "Daylight saving - US 03/10/2008");
+	inp.val("11/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
+	equal(inp.val(), "11/01/2008", "Daylight saving - US 11/01/2008");
+	inp.val("11/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
+	equal(inp.val(), "11/02/2008", "Daylight saving - US 11/02/2008");
+	inp.val("11/01/2008").datepicker("show");
+	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
+	equal(inp.val(), "11/03/2008", "Daylight saving - US 11/03/2008");
+});
+
+var beforeShowThis = null,
+	beforeShowInput = null,
+	beforeShowInst = null,
+	beforeShowDayThis = null,
+	beforeShowDayOK = true;
+
+function beforeAll(input, inst) {
+	beforeShowThis = this;
+	beforeShowInput = input;
+	beforeShowInst = inst;
+	return {currentText: "Current"};
+}
+
+function beforeDay(date) {
+	beforeShowDayThis = this;
+	beforeShowDayOK &= (date > new Date(2008, 1 - 1, 26) &&
+		date < new Date(2008, 3 - 1, 6));
+	return [(date.getDate() % 2 === 0), (date.getDate() % 10 === 0 ? "day10" : ""),
+		(date.getDate() % 3 === 0 ? "Divisble by 3" : "")];
+}
+
+test("callbacks", function() {
+	expect( 13 );
+	// Before show
+	var dp, day20, day21,
+		inp = testHelper.init("#inp", {beforeShow: beforeAll}),
+		inst = $.data(inp[0], "datepicker");
+	equal($.datepicker._get(inst, "currentText"), "Today", "Before show - initial");
+	inp.val("02/04/2008").datepicker("show");
+	equal($.datepicker._get(inst, "currentText"), "Current", "Before show - changed");
+	ok(beforeShowThis.id === inp[0].id, "Before show - this OK");
+	ok(beforeShowInput.id === inp[0].id, "Before show - input OK");
+	deepEqual(beforeShowInst, inst, "Before show - inst OK");
+	inp.datepicker("hide").datepicker("destroy");
+	// Before show day
+	inp = testHelper.init("#inp", {beforeShowDay: beforeDay});
+	dp = $("#ui-datepicker-div");
+	inp.val("02/04/2008").datepicker("show");
+	ok(beforeShowDayThis.id === inp[0].id, "Before show day - this OK");
+	ok(beforeShowDayOK, "Before show day - dates OK");
+	day20 = dp.find(".ui-datepicker-calendar td:contains('20')");
+	day21 = dp.find(".ui-datepicker-calendar td:contains('21')");
+	ok(!day20.is(".ui-datepicker-unselectable"), "Before show day - unselectable 20");
+	ok(day21.is(".ui-datepicker-unselectable"), "Before show day - unselectable 21");
+	ok(day20.is(".day10"), "Before show day - CSS 20");
+	ok(!day21.is(".day10"), "Before show day - CSS 21");
+	ok(!day20.attr("title"), "Before show day - title 20");
+	ok(day21.attr("title") === "Divisble by 3", "Before show day - title 21");
+	inp.datepicker("hide").datepicker("destroy");
+});
+
+test("beforeShowDay - tooltips with quotes", function() {
+	expect( 1 );
+	var inp, dp;
+	inp = testHelper.init("#inp", {
+		beforeShowDay: function() {
+			return [ true, "", "'" ];
+		}
+	});
+	dp = $("#ui-datepicker-div");
+
+	inp.datepicker("show");
+	equal( dp.find( ".ui-datepicker-calendar td:contains('9')").attr( "title" ), "'" );
+	inp.datepicker("hide").datepicker("destroy");
+});
+
+test("localisation", function() {
+	expect( 24 );
+	var dp, month, day, date,
+		inp = testHelper.init("#inp", $.datepicker.regional.fr);
+	inp.datepicker("option", {dateFormat: "DD, d MM yy", showButtonPanel:true, changeMonth:true, changeYear:true}).val("").datepicker("show");
+	dp = $("#ui-datepicker-div");
+	equal($(".ui-datepicker-close", dp).text(), "Fermer", "Localisation - close");
+	$(".ui-datepicker-close", dp).simulate("mouseover");
+	equal($(".ui-datepicker-prev", dp).text(), "Précédent", "Localisation - previous");
+	equal($(".ui-datepicker-current", dp).text(), "Aujourd'hui", "Localisation - current");
+	equal($(".ui-datepicker-next", dp).text(), "Suivant", "Localisation - next");
+	month = 0;
+	$(".ui-datepicker-month option", dp).each(function() {
+		equal($(this).text(), $.datepicker.regional.fr.monthNamesShort[month],
+			"Localisation - month " + month);
+		month++;
+	});
+	day = 1;
+	$(".ui-datepicker-calendar th", dp).each(function() {
+		equal($(this).text(), $.datepicker.regional.fr.dayNamesMin[day],
+			"Localisation - day " + day);
+		day = (day + 1) % 7;
+	});
+	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date = new Date();
+	equal(inp.val(), $.datepicker.regional.fr.dayNames[date.getDay()] + ", " +
+		date.getDate() + " " + $.datepicker.regional.fr.monthNames[date.getMonth()] +
+		" " + date.getFullYear(), "Localisation - formatting");
+});
+
+test("noWeekends", function() {
+	expect( 31 );
+	var i, date;
+	for (i = 1; i <= 31; i++) {
+		date = new Date(2001, 1 - 1, i);
+		deepEqual($.datepicker.noWeekends(date), [(i + 1) % 7 >= 2, ""],
+			"No weekends " + date);
+	}
+});
+
+test("iso8601Week", function() {
+	expect( 12 );
+	var date = new Date(2000, 12 - 1, 31);
+	equal($.datepicker.iso8601Week(date), 52, "ISO 8601 week " + date);
+	date = new Date(2001, 1 - 1, 1);
+	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
+	date = new Date(2001, 1 - 1, 7);
+	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
+	date = new Date(2001, 1 - 1, 8);
+	equal($.datepicker.iso8601Week(date), 2, "ISO 8601 week " + date);
+	date = new Date(2003, 12 - 1, 28);
+	equal($.datepicker.iso8601Week(date), 52, "ISO 8601 week " + date);
+	date = new Date(2003, 12 - 1, 29);
+	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
+	date = new Date(2004, 1 - 1, 4);
+	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
+	date = new Date(2004, 1 - 1, 5);
+	equal($.datepicker.iso8601Week(date), 2, "ISO 8601 week " + date);
+	date = new Date(2009, 12 - 1, 28);
+	equal($.datepicker.iso8601Week(date), 53, "ISO 8601 week " + date);
+	date = new Date(2010, 1 - 1, 3);
+	equal($.datepicker.iso8601Week(date), 53, "ISO 8601 week " + date);
+	date = new Date(2010, 1 - 1, 4);
+	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
+	date = new Date(2010, 1 - 1, 10);
+	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
+});
+
+test("parseDate", function() {
+	expect( 26 );
+	testHelper.init("#inp");
+	var currentYear, gmtDate, fr, settings, zh;
+	ok($.datepicker.parseDate("d m y", "") == null, "Parse date empty");
+	testHelper.equalsDate($.datepicker.parseDate("d m y", "3 2 01"),
+		new Date(2001, 2 - 1, 3), "Parse date d m y");
+	testHelper.equalsDate($.datepicker.parseDate("dd mm yy", "03 02 2001"),
+		new Date(2001, 2 - 1, 3), "Parse date dd mm yy");
+	testHelper.equalsDate($.datepicker.parseDate("d m y", "13 12 01"),
+		new Date(2001, 12 - 1, 13), "Parse date d m y");
+	testHelper.equalsDate($.datepicker.parseDate("dd mm yy", "13 12 2001"),
+		new Date(2001, 12 - 1, 13), "Parse date dd mm yy");
+	testHelper.equalsDate($.datepicker.parseDate("y-o", "01-34"),
+		new Date(2001, 2 - 1, 3), "Parse date y-o");
+	testHelper.equalsDate($.datepicker.parseDate("yy-oo", "2001-347"),
+		new Date(2001, 12 - 1, 13), "Parse date yy-oo");
+	testHelper.equalsDate($.datepicker.parseDate("oo yy", "348 2004"),
+		new Date(2004, 12 - 1, 13), "Parse date oo yy");
+	testHelper.equalsDate($.datepicker.parseDate("D d M y", "Sat 3 Feb 01"),
+		new Date(2001, 2 - 1, 3), "Parse date D d M y");
+	testHelper.equalsDate($.datepicker.parseDate("d MM DD yy", "3 February Saturday 2001"),
+		new Date(2001, 2 - 1, 3), "Parse date dd MM DD yy");
+	testHelper.equalsDate($.datepicker.parseDate("DD, MM d, yy", "Saturday, February 3, 2001"),
+		new Date(2001, 2 - 1, 3), "Parse date DD, MM d, yy");
+	testHelper.equalsDate($.datepicker.parseDate("'day' d 'of' MM (''DD''), yy",
+		"day 3 of February ('Saturday'), 2001"), new Date(2001, 2 - 1, 3),
+		"Parse date 'day' d 'of' MM (''DD''), yy");
+	currentYear = new Date().getFullYear();
+	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000) + "-02-03"),
+			new Date(currentYear, 2 - 1, 3), "Parse date y-m-d - default cutuff");
+	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 10) + "-02-03"),
+			new Date(currentYear+10, 2 - 1, 3), "Parse date y-m-d - default cutuff");
+	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 11) + "-02-03"),
+			new Date(currentYear-89, 2 - 1, 3), "Parse date y-m-d - default cutuff");
+	testHelper.equalsDate($.datepicker.parseDate("y-m-d", "80-02-03", {shortYearCutoff: 80}),
+		new Date(2080, 2 - 1, 3), "Parse date y-m-d - cutoff 80");
+	testHelper.equalsDate($.datepicker.parseDate("y-m-d", "81-02-03", {shortYearCutoff: 80}),
+		new Date(1981, 2 - 1, 3), "Parse date y-m-d - cutoff 80");
+	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 60) + "-02-03", {shortYearCutoff: "+60"}),
+			new Date(currentYear + 60, 2 - 1, 3), "Parse date y-m-d - cutoff +60");
+	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 61) + "-02-03", {shortYearCutoff: "+60"}),
+			new Date(currentYear - 39, 2 - 1, 3), "Parse date y-m-d - cutoff +60");
+	gmtDate = new Date(2001, 2 - 1, 3);
+	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
+	testHelper.equalsDate($.datepicker.parseDate("@", "981158400000"), gmtDate, "Parse date @");
+	testHelper.equalsDate($.datepicker.parseDate("!", "631167552000000000"), gmtDate, "Parse date !");
+
+	fr = $.datepicker.regional.fr;
+	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
+	testHelper.equalsDate($.datepicker.parseDate("D d M y", "Lun. 9 avr. 01", settings),
+		new Date(2001, 4 - 1, 9), "Parse date D M y with settings");
+	testHelper.equalsDate($.datepicker.parseDate("d MM DD yy", "9 Avril Lundi 2001", settings),
+		new Date(2001, 4 - 1, 9), "Parse date d MM DD yy with settings");
+	testHelper.equalsDate($.datepicker.parseDate("DD, MM d, yy", "Lundi, Avril 9, 2001", settings),
+		new Date(2001, 4 - 1, 9), "Parse date DD, MM d, yy with settings");
+	testHelper.equalsDate($.datepicker.parseDate("'jour' d 'de' MM (''DD''), yy", "jour 9 de Avril ('Lundi'), 2001", settings),
+		new Date(2001, 4 - 1, 9), "Parse date 'jour' d 'de' MM (''DD''), yy with settings");
+
+	zh = $.datepicker.regional["zh-CN"];
+	testHelper.equalsDate($.datepicker.parseDate("yy M d", "2011 十一月 22", zh),
+		new Date(2011, 11 - 1, 22), "Parse date yy M d with zh-CN");
+});
+
+test("parseDateErrors", function() {
+	expect( 18 );
+	testHelper.init("#inp");
+	var fr, settings;
+	function expectError(expr, value, error) {
+		try {
+			expr();
+			ok(false, "Parsed error " + value);
+		}
+		catch (e) {
+			equal(e, error, "Parsed error " + value);
+		}
+	}
+	expectError(function() { $.datepicker.parseDate(null, "Sat 2 01"); },
+		"Sat 2 01", "Invalid arguments");
+	expectError(function() { $.datepicker.parseDate("d m y", null); },
+		"null", "Invalid arguments");
+	expectError(function() { $.datepicker.parseDate("d m y", "Sat 2 01"); },
+		"Sat 2 01 - d m y", "Missing number at position 0");
+	expectError(function() { $.datepicker.parseDate("dd mm yy", "Sat 2 01"); },
+		"Sat 2 01 - dd mm yy", "Missing number at position 0");
+	expectError(function() { $.datepicker.parseDate("d m y", "3 Feb 01"); },
+		"3 Feb 01 - d m y", "Missing number at position 2");
+	expectError(function() { $.datepicker.parseDate("dd mm yy", "3 Feb 01"); },
+		"3 Feb 01 - dd mm yy", "Missing number at position 2");
+	expectError(function() { $.datepicker.parseDate("mm dd yy", "2 1 01"); },
+		"2 1 01 - dd mm yy", "Missing number at position 4");
+	expectError(function() { $.datepicker.parseDate("d m y", "3 2 AD01"); },
+		"3 2 AD01 - d m y", "Missing number at position 4");
+	expectError(function() { $.datepicker.parseDate("d m yy", "3 2 AD01"); },
+		"3 2 AD01 - dd mm yy", "Missing number at position 4");
+	expectError(function() { $.datepicker.parseDate("y-o", "01-D01"); },
+		"2001-D01 - y-o", "Missing number at position 3");
+	expectError(function() { $.datepicker.parseDate("yy-oo", "2001-D01"); },
+		"2001-D01 - yy-oo", "Missing number at position 5");
+	expectError(function() { $.datepicker.parseDate("D d M y", "D7 3 Feb 01"); },
+		"D7 3 Feb 01 - D d M y", "Unknown name at position 0");
+	expectError(function() { $.datepicker.parseDate("D d M y", "Sat 3 M2 01"); },
+		"Sat 3 M2 01 - D d M y", "Unknown name at position 6");
+	expectError(function() { $.datepicker.parseDate("DD, MM d, yy", "Saturday- Feb 3, 2001"); },
+		"Saturday- Feb 3, 2001 - DD, MM d, yy", "Unexpected literal at position 8");
+	expectError(function() { $.datepicker.parseDate("'day' d 'of' MM (''DD''), yy",
+		"day 3 of February (\"Saturday\"), 2001"); },
+		"day 3 of Mon2 ('Day7'), 2001", "Unexpected literal at position 19");
+	expectError(function() { $.datepicker.parseDate("d m y", "29 2 01"); },
+		"29 2 01 - d m y", "Invalid date");
+	fr = $.datepicker.regional.fr;
+	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
+	expectError(function() { $.datepicker.parseDate("D d M y", "Mon 9 Avr 01", settings); },
+		"Mon 9 Avr 01 - D d M y", "Unknown name at position 0");
+	expectError(function() { $.datepicker.parseDate("D d M y", "Lun. 9 Apr 01", settings); },
+		"Lun. 9 Apr 01 - D d M y", "Unknown name at position 7");
+});
+
+test("Ticket #7244: date parser does not fail when too many numbers are passed into the date function", function() {
+	expect( 4 );
+	var date;
+	try{
+		date = $.datepicker.parseDate("dd/mm/yy", "18/04/19881");
+		ok(false, "Did not properly detect an invalid date");
+	}catch(e){
+		ok("invalid date detected");
+	}
+
+	try {
+		date = $.datepicker.parseDate("dd/mm/yy", "18/04/1988 @ 2:43 pm");
+		equal(date.getDate(), 18);
+		equal(date.getMonth(), 3);
+		equal(date.getFullYear(), 1988);
+	} catch(e) {
+		ok(false, "Did not properly parse date with extra text separated by whitespace");
+	}
+});
+
+test("formatDate", function() {
+	expect( 16 );
+	testHelper.init("#inp");
+	var gmtDate, fr, settings;
+	equal($.datepicker.formatDate("d m y", new Date(2001, 2 - 1, 3)),
+		"3 2 01", "Format date d m y");
+	equal($.datepicker.formatDate("dd mm yy", new Date(2001, 2 - 1, 3)),
+		"03 02 2001", "Format date dd mm yy");
+	equal($.datepicker.formatDate("d m y", new Date(2001, 12 - 1, 13)),
+		"13 12 01", "Format date d m y");
+	equal($.datepicker.formatDate("dd mm yy", new Date(2001, 12 - 1, 13)),
+		"13 12 2001", "Format date dd mm yy");
+	equal($.datepicker.formatDate("yy-o", new Date(2001, 2 - 1, 3)),
+		"2001-34", "Format date yy-o");
+	equal($.datepicker.formatDate("yy-oo", new Date(2001, 2 - 1, 3)),
+		"2001-034", "Format date yy-oo");
+	equal($.datepicker.formatDate("D M y", new Date(2001, 2 - 1, 3)),
+		"Sat Feb 01", "Format date D M y");
+	equal($.datepicker.formatDate("DD MM yy", new Date(2001, 2 - 1, 3)),
+		"Saturday February 2001", "Format date DD MM yy");
+	equal($.datepicker.formatDate("DD, MM d, yy", new Date(2001, 2 - 1, 3)),
+		"Saturday, February 3, 2001", "Format date DD, MM d, yy");
+	equal($.datepicker.formatDate("'day' d 'of' MM (''DD''), yy",
+		new Date(2001, 2 - 1, 3)), "day 3 of February ('Saturday'), 2001",
+		"Format date 'day' d 'of' MM ('DD'), yy");
+	gmtDate = new Date(2001, 2 - 1, 3);
+	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
+	equal($.datepicker.formatDate("@", gmtDate), "981158400000", "Format date @");
+	equal($.datepicker.formatDate("!", gmtDate), "631167552000000000", "Format date !");
+	fr = $.datepicker.regional.fr;
+	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
+	equal($.datepicker.formatDate("D M y", new Date(2001, 4 - 1, 9), settings),
+		"lun. avr. 01", "Format date D M y with settings");
+	equal($.datepicker.formatDate("DD MM yy", new Date(2001, 4 - 1, 9), settings),
+		"lundi avril 2001", "Format date DD MM yy with settings");
+	equal($.datepicker.formatDate("DD, MM d, yy", new Date(2001, 4 - 1, 9), settings),
+		"lundi, avril 9, 2001", "Format date DD, MM d, yy with settings");
+	equal($.datepicker.formatDate("'jour' d 'de' MM (''DD''), yy",
+		new Date(2001, 4 - 1, 9), settings), "jour 9 de avril ('lundi'), 2001",
+		"Format date 'jour' d 'de' MM (''DD''), yy with settings");
+});
+
+// TODO: Fix this test so it isn't mysteriously flaky in Browserstack on certain OS/Browser combos
+// test("Ticket 6827: formatDate day of year calculation is wrong during day lights savings time", function(){
+// 	expect( 1 );
+// 	var time = $.datepicker.formatDate("oo", new Date("2010/03/30 12:00:00 CDT"));
+// 	equal(time, "089");
+// });
+
+test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler", function() {
+	expect( 3 );
+
+	var inp, dp;
+
+	inp = testHelper.init( "#inp", {
+		beforeShow: function() {
+		}
+	});
+	dp = $( "#ui-datepicker-div" );
+	inp.datepicker( "show" );
+	equal( dp.css( "display" ), "block", "beforeShow returns nothing" );
+	inp.datepicker( "hide" ).datepicker( "destroy" );
+
+	inp = testHelper.init( "#inp", {
+		beforeShow: function() {
+			return true;
+		}
+	});
+	dp = $( "#ui-datepicker-div" );
+	inp.datepicker( "show" );
+	equal( dp.css( "display" ), "block", "beforeShow returns true" );
+	inp.datepicker( "hide" );
+	inp.datepicker( "destroy" );
+
+	inp = testHelper.init( "#inp", {
+		beforeShow: function() {
+			return false;
+		}
+	});
+	dp = $( "#ui-datepicker-div" );
+	inp.datepicker( "show" );
+	equal( dp.css( "display" ), "none","beforeShow returns false" );
+	inp.datepicker( "destroy" );
+});
+
+} );
diff --git a/tests/unit/dialog/common-deprecated.js b/tests/unit/dialog/common-deprecated.js
new file mode 100644
index 000000000..7b0091277
--- /dev/null
+++ b/tests/unit/dialog/common-deprecated.js
@@ -0,0 +1,54 @@
+define( [
+	"lib/common",
+	"ui/dialog"
+], function( common ) {
+
+common.testWidget( "dialog", {
+	defaults: {
+		appendTo: "body",
+		autoOpen: true,
+		buttons: [],
+		classes: {
+			"ui-dialog": "ui-corner-all",
+			"ui-dialog-titlebar": "ui-corner-all"
+		},
+		closeOnEscape: true,
+		closeText: "Close",
+		dialogClass: "",
+		disabled: false,
+		draggable: true,
+		height: "auto",
+		hide: null,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 150,
+		minWidth: 150,
+		modal: false,
+		position: {
+			my: "center",
+			at: "center",
+			of: window,
+			collision: "fit",
+			using: $.ui.dialog.prototype.options.position.using
+		},
+		resizable: true,
+		show: null,
+		title: null,
+		width: 300,
+
+		// callbacks
+		beforeClose: null,
+		close: null,
+		create: null,
+		drag: null,
+		dragStart: null,
+		dragStop: null,
+		focus: null,
+		open: null,
+		resize: null,
+		resizeStart: null,
+		resizeStop: null
+	}
+});
+
+} );
diff --git a/tests/unit/dialog/common.js b/tests/unit/dialog/common.js
new file mode 100644
index 000000000..389b2ddff
--- /dev/null
+++ b/tests/unit/dialog/common.js
@@ -0,0 +1,53 @@
+define( [
+	"lib/common",
+	"ui/dialog"
+], function( common ) {
+
+common.testWidget( "dialog", {
+	defaults: {
+		appendTo: "body",
+		autoOpen: true,
+		buttons: [],
+		classes: {
+			"ui-dialog": "ui-corner-all",
+			"ui-dialog-titlebar": "ui-corner-all"
+		},
+		closeOnEscape: true,
+		closeText: "Close",
+		disabled: false,
+		draggable: true,
+		height: "auto",
+		hide: null,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 150,
+		minWidth: 150,
+		modal: false,
+		position: {
+			my: "center",
+			at: "center",
+			of: window,
+			collision: "fit",
+			using: $.ui.dialog.prototype.options.position.using
+		},
+		resizable: true,
+		show: null,
+		title: null,
+		width: 300,
+
+		// callbacks
+		beforeClose: null,
+		close: null,
+		create: null,
+		drag: null,
+		dragStart: null,
+		dragStop: null,
+		focus: null,
+		open: null,
+		resize: null,
+		resizeStart: null,
+		resizeStop: null
+	}
+});
+
+} );
diff --git a/tests/unit/dialog/core.js b/tests/unit/dialog/core.js
new file mode 100644
index 000000000..cb086ce8d
--- /dev/null
+++ b/tests/unit/dialog/core.js
@@ -0,0 +1,308 @@
+define( [
+	"jquery",
+	"ui/dialog"
+], function( $ ) {
+
+// TODO add teardown callback to remove dialogs
+module("dialog: core");
+
+test( "markup structure", function( assert ) {
+	expect( 11 );
+
+	var element = $( "<div>" ).dialog({
+			buttons: [ {
+				text: "Ok",
+				click: $.noop
+			} ]
+		}),
+		widget = element.dialog( "widget" ),
+		titlebar = widget.find( ".ui-dialog-titlebar" ),
+		title = titlebar.find( ".ui-dialog-title" ),
+		close = titlebar.find( ".ui-dialog-titlebar-close" ),
+		buttonpane = widget.find( ".ui-dialog-buttonpane" ),
+		buttonset = widget.find( ".ui-dialog-buttonset" ),
+		buttons = buttonset.find( ".ui-button" );
+
+	assert.hasClasses( widget, "ui-dialog ui-dialog-buttons ui-widget ui-widget-content" );
+	assert.hasClasses( titlebar, "ui-dialog-titlebar ui-widget-header" );
+	equal( titlebar.length, 1, "Dialog has exactly one titlebar" );
+	assert.hasClasses( close, "ui-dialog-titlebar-close ui-widget" );
+	equal( close.length, 1, "Titlebar has exactly one close button" );
+	equal( title.length, 1, "Titlebar has exactly one title" );
+	assert.hasClasses( element, "ui-dialog-content ui-widget-content" );
+	assert.hasClasses( buttonpane, "ui-dialog-buttonpane ui-widget-content" );
+	equal( buttonpane.length, 1, "Dialog has exactly one buttonpane" );
+	equal( buttonset.length, 1, "Buttonpane has exactly one buttonset" );
+	equal( buttons.length, 1, "Buttonset contains exactly 1 button when created with 1" );
+
+});
+
+test( "markup structure - no buttons", function( assert ) {
+	expect( 7 );
+
+	var element = $( "<div>" ).dialog(),
+		widget = element.dialog( "widget" ),
+		titlebar = widget.find( ".ui-dialog-titlebar" ),
+		title = titlebar.find( ".ui-dialog-title" ),
+		close = titlebar.find( ".ui-dialog-titlebar-close" );
+
+	assert.hasClasses( widget, "ui-dialog ui-widget ui-widget-content" );
+	assert.hasClasses( titlebar, "ui-dialog-titlebar ui-widget-header" );
+	equal( titlebar.length, 1, "Dialog has exactly one titlebar" );
+	assert.hasClasses( close, "ui-dialog-titlebar-close ui-widget" );
+	equal( close.length, 1, "Titlebar has exactly one close button" );
+	equal( title.length, 1, "Titlebar has exactly one title" );
+	assert.hasClasses( element, "ui-dialog-content ui-widget-content" );
+});
+
+test("title id", function() {
+	expect(1);
+
+	var titleId,
+		element = $("<div>").dialog();
+
+	titleId = element.dialog("widget").find(".ui-dialog-title").attr("id");
+	ok( /ui-id-\d+$/.test( titleId ), "auto-numbered title id");
+	element.remove();
+});
+
+test( "ARIA", function() {
+	expect( 4 );
+
+	var element = $( "<div>" ).dialog(),
+		wrapper = element.dialog( "widget" );
+	equal( wrapper.attr( "role" ), "dialog", "dialog role" );
+	equal( wrapper.attr( "aria-labelledby" ), wrapper.find( ".ui-dialog-title" ).attr( "id" ) );
+	equal( wrapper.attr( "aria-describedby" ), element.attr( "id" ), "aria-describedby added" );
+	element.remove();
+
+	element = $("<div><div aria-describedby='section2'><p id='section2'>descriotion</p></div></div>").dialog();
+	equal( element.dialog( "widget" ).attr( "aria-describedby" ), null, "no aria-describedby added, as already present in markup" );
+	element.remove();
+});
+
+test("widget method", function() {
+	expect( 1 );
+	var dialog = $("<div>").appendTo("#qunit-fixture").dialog();
+	deepEqual(dialog.parent()[0], dialog.dialog("widget")[0]);
+	dialog.remove();
+});
+
+asyncTest( "focus tabbable", function() {
+	expect( 8 );
+	var element,
+		options = {
+			buttons: [{
+				text: "Ok",
+				click: $.noop
+			}]
+		};
+
+	function checkFocus( markup, options, testFn, next ) {
+
+		// Support: IE8
+		// For some reason the focus doesn't get set properly if we don't
+		// focus the body first.
+		$( "body" ).focus();
+
+		element = $( markup ).dialog( options );
+		setTimeout(function() {
+			testFn(function done() {
+				element.remove();
+				setTimeout( next );
+			});
+		});
+	}
+
+	function step1() {
+		checkFocus( "<div><input><input></div>", options, function( done ) {
+			var input = element.find( "input:last" ).focus().blur();
+			element.dialog( "instance" )._focusTabbable();
+			setTimeout(function() {
+				equal( document.activeElement, input[ 0 ],
+					"1. an element that was focused previously." );
+				done();
+			});
+		}, step2 );
+	}
+
+	function step2() {
+		checkFocus( "<div><input><input autofocus></div>", options, function( done ) {
+			equal( document.activeElement, element.find( "input" )[ 1 ],
+				"2. first element inside the dialog matching [autofocus]" );
+			done();
+		}, step3 );
+	}
+
+	function step3() {
+		checkFocus( "<div><input><input></div>", options, function( done ) {
+			equal( document.activeElement, element.find( "input" )[ 0 ],
+				"3. tabbable element inside the content element" );
+			done();
+		}, step4 );
+	}
+
+	function step4() {
+		checkFocus( "<div>text</div>", options, function( done ) {
+			equal( document.activeElement,
+				element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" )[ 0 ],
+				"4. tabbable element inside the buttonpane" );
+			done();
+		}, step5 );
+	}
+
+	function step5() {
+		checkFocus( "<div>text</div>", {}, function( done ) {
+			equal( document.activeElement,
+				element.dialog( "widget" ).find( ".ui-dialog-titlebar .ui-dialog-titlebar-close" )[ 0 ],
+				"5. the close button" );
+			done();
+		}, step6 );
+	}
+
+	function step6() {
+		checkFocus( "<div>text</div>", { autoOpen: false }, function( done ) {
+			element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).hide();
+			element.dialog( "open" );
+			setTimeout(function() {
+				equal( document.activeElement, element.parent()[ 0 ], "6. the dialog itself" );
+				done();
+			});
+		}, step7 );
+	}
+
+	function step7() {
+		checkFocus(
+			"<div><input><input autofocus></div>",
+			{
+				open: function() {
+					var inputs = $( this ).find( "input" );
+					inputs.last().keydown(function( event ) {
+						event.preventDefault();
+						inputs.first().focus();
+					});
+				}
+			},
+			function( done ) {
+				var inputs = element.find( "input" );
+				equal( document.activeElement, inputs[ 1 ], "Focus starts on second input" );
+				inputs.last().simulate( "keydown", { keyCode: $.ui.keyCode.TAB });
+				setTimeout(function() {
+					equal( document.activeElement, inputs[ 0 ],
+						"Honor preventDefault, allowing custom focus management" );
+					done();
+				}, 50 );
+			},
+			start
+		);
+	}
+
+	step1();
+});
+
+test( "#7960: resizable handles below modal overlays", function() {
+	expect( 1 );
+
+	var resizable = $( "<div>" ).resizable(),
+		dialog = $( "<div>" ).dialog({ modal: true }),
+		resizableZindex = parseInt( resizable.find( ".ui-resizable-handle" ).css( "zIndex" ), 10 ),
+		overlayZindex = parseInt( $( ".ui-widget-overlay" ).css( "zIndex" ), 10 );
+
+	ok( resizableZindex < overlayZindex, "Resizable handles have lower z-index than modal overlay" );
+	dialog.dialog( "destroy" );
+});
+
+asyncTest( "Prevent tabbing out of dialogs", function() {
+	expect( 3 );
+
+	var element = $( "<div><input name='0'><input name='1'></div>" ).dialog(),
+		inputs = element.find( "input" );
+
+	// Remove close button to test focus on just the two buttons
+	element.dialog( "widget" ).find( ".ui-button").remove();
+
+	function checkTab() {
+		equal( document.activeElement, inputs[ 0 ], "Tab key event moved focus within the modal" );
+
+		// check shift tab
+		$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB, shiftKey: true });
+		setTimeout( checkShiftTab );
+	}
+
+	function checkShiftTab() {
+		equal( document.activeElement, inputs[ 1 ], "Shift-Tab key event moved focus back to second input" );
+
+		element.remove();
+		setTimeout( start );
+	}
+
+	inputs[ 1 ].focus();
+	setTimeout(function() {
+		equal( document.activeElement, inputs[ 1 ], "Focus set on second input" );
+		inputs.eq( 1 ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB });
+
+		setTimeout( checkTab );
+	});
+});
+
+asyncTest( "#9048: multiple modal dialogs opened and closed in different order", function() {
+	expect( 1 );
+	$( "#dialog1, #dialog2" ).dialog({ autoOpen: false, modal:true });
+	$( "#dialog1" ).dialog( "open" );
+	$( "#dialog2" ).dialog( "open" );
+	$( "#dialog1" ).dialog( "close" );
+	setTimeout(function() {
+		$( "#dialog2" ).dialog( "close" );
+		$( "#favorite-animal" ).focus();
+		ok( true, "event handlers cleaned up (no errors thrown)" );
+		start();
+	});
+});
+
+asyncTest( "interaction between overlay and other dialogs", function() {
+	$.widget( "ui.testWidget", $.ui.dialog, {
+		options: {
+			modal: true,
+			autoOpen: false
+		}
+	});
+	expect( 2 );
+	var first = $( "<div><input id='input-1'></div>" ).dialog({
+			modal: true
+		}),
+		firstInput = first.find( "input" ),
+		second = $( "<div><input id='input-2'></div>" ).testWidget(),
+		secondInput = second.find( "input" );
+
+	// Support: IE8
+	// For some reason the focus doesn't get set properly if we don't
+	// focus the body first.
+	$( "body" ).focus();
+
+	// Wait for the modal to init
+	setTimeout(function() {
+		second.testWidget( "open" );
+
+		// Simulate user tabbing from address bar to an element outside the dialog
+		$( "#favorite-animal" ).focus();
+		setTimeout(function() {
+			equal( document.activeElement, secondInput[ 0 ] );
+
+			// Last active dialog must receive focus
+			firstInput.focus();
+			$( "#favorite-animal" ).focus();
+			setTimeout(function() {
+				equal( document.activeElement, firstInput[ 0 ] );
+
+				// Cleanup
+				first.remove();
+				second.remove();
+				delete $.ui.testWidget;
+				delete $.fn.testWidget;
+				start();
+			});
+		});
+	});
+});
+
+} );
diff --git a/tests/unit/dialog/deprecated.html b/tests/unit/dialog/deprecated.html
new file mode 100644
index 000000000..2d20b6291
--- /dev/null
+++ b/tests/unit/dialog/deprecated.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Dialog Test Suite</title>
+
+	<script src="../../lib/css.js" data-modules="core button dialog"></script>
+	<script src="../../lib/bootstrap.js" data-widget="dialog" data-deprecated="true"></script>
+</head>
+<body>
+
+<div id="qunit"></div>
+<div id="qunit-fixture">
+	<div id="dialog1"></div>
+	<div id="dialog2"></div>
+	<div id="form-dialog" title="Profile Information">
+		<!-- create a spacer to ensure there's enough space to scroll -->
+		<div style="height: 250px;">...</div>
+		<fieldset>
+			<legend>Please share some personal information</legend>
+			<label for="favorite-animal">Your favorite animal</label><input id="favorite-animal">
+			<label for="favorite-color">Your favorite color</label><input id="favorite-color">
+		</fieldset>
+		<div role="group" aria-describedby="section2">
+			<p id="section2">Some more (optional) information</p>
+			<label for="favorite-food">Favorite food</label><input id="favorite-food">
+		</div>
+	</div>
+	<div class="wrap" id="wrap1"></div>
+	<div class="wrap" id="wrap2"></div>
+</div>
+</body>
+</html>
diff --git a/tests/unit/dialog/deprecated.js b/tests/unit/dialog/deprecated.js
new file mode 100644
index 000000000..1f7087c57
--- /dev/null
+++ b/tests/unit/dialog/deprecated.js
@@ -0,0 +1,30 @@
+define( [
+	"jquery",
+	"ui/dialog"
+], function( $ ) {
+
+module( "dialog (deprecated): options" );
+
+test( "dialogClass", function( assert ) {
+	expect( 5 );
+
+	var element = $( "<div>" ).dialog(),
+		widget = element.dialog( "widget" );
+	assert.lacksClasses( widget, "foo", "dialogClass not specified. class not added" );
+	element.remove();
+
+	element = $( "<div>" ).dialog({ dialogClass: "foo" });
+	widget = element.dialog( "widget" );
+	assert.hasClasses( widget, "foo", "dialogClass in init, foo class added" );
+	element.dialog( "option", "dialogClass", "foobar" );
+	assert.lacksClasses( widget, "foo", "dialogClass changed, previous one was removed" );
+	assert.hasClasses( widget, "foobar", "dialogClass changed, new one was added" );
+	element.remove();
+
+	element = $( "<div>" ).dialog({ dialogClass: "foo bar" });
+	widget = element.dialog( "widget" );
+	assert.hasClasses( widget, "foo bar", "dialogClass in init, two classes." );
+	element.remove();
+});
+
+} );
diff --git a/tests/unit/dialog/dialog_common.js b/tests/unit/dialog/dialog_common.js
deleted file mode 100644
index 389b2ddff..000000000
--- a/tests/unit/dialog/dialog_common.js
+++ /dev/null
@@ -1,53 +0,0 @@
-define( [
-	"lib/common",
-	"ui/dialog"
-], function( common ) {
-
-common.testWidget( "dialog", {
-	defaults: {
-		appendTo: "body",
-		autoOpen: true,
-		buttons: [],
-		classes: {
-			"ui-dialog": "ui-corner-all",
-			"ui-dialog-titlebar": "ui-corner-all"
-		},
-		closeOnEscape: true,
-		closeText: "Close",
-		disabled: false,
-		draggable: true,
-		height: "auto",
-		hide: null,
-		maxHeight: null,
-		maxWidth: null,
-		minHeight: 150,
-		minWidth: 150,
-		modal: false,
-		position: {
-			my: "center",
-			at: "center",
-			of: window,
-			collision: "fit",
-			using: $.ui.dialog.prototype.options.position.using
-		},
-		resizable: true,
-		show: null,
-		title: null,
-		width: 300,
-
-		// callbacks
-		beforeClose: null,
-		close: null,
-		create: null,
-		drag: null,
-		dragStart: null,
-		dragStop: null,
-		focus: null,
-		open: null,
-		resize: null,
-		resizeStart: null,
-		resizeStop: null
-	}
-});
-
-} );
diff --git a/tests/unit/dialog/dialog_common_deprecated.js b/tests/unit/dialog/dialog_common_deprecated.js
deleted file mode 100644
index 7b0091277..000000000
--- a/tests/unit/dialog/dialog_common_deprecated.js
+++ /dev/null
@@ -1,54 +0,0 @@
-define( [
-	"lib/common",
-	"ui/dialog"
-], function( common ) {
-
-common.testWidget( "dialog", {
-	defaults: {
-		appendTo: "body",
-		autoOpen: true,
-		buttons: [],
-		classes: {
-			"ui-dialog": "ui-corner-all",
-			"ui-dialog-titlebar": "ui-corner-all"
-		},
-		closeOnEscape: true,
-		closeText: "Close",
-		dialogClass: "",
-		disabled: false,
-		draggable: true,
-		height: "auto",
-		hide: null,
-		maxHeight: null,
-		maxWidth: null,
-		minHeight: 150,
-		minWidth: 150,
-		modal: false,
-		position: {
-			my: "center",
-			at: "center",
-			of: window,
-			collision: "fit",
-			using: $.ui.dialog.prototype.options.position.using
-		},
-		resizable: true,
-		show: null,
-		title: null,
-		width: 300,
-
-		// callbacks
-		beforeClose: null,
-		close: null,
-		create: null,
-		drag: null,
-		dragStart: null,
-		dragStop: null,
-		focus: null,
-		open: null,
-		resize: null,
-		resizeStart: null,
-		resizeStop: null
-	}
-});
-
-} );
diff --git a/tests/unit/dialog/dialog_core.js b/tests/unit/dialog/dialog_core.js
deleted file mode 100644
index cb086ce8d..000000000
--- a/tests/unit/dialog/dialog_core.js
+++ /dev/null
@@ -1,308 +0,0 @@
-define( [
-	"jquery",
-	"ui/dialog"
-], function( $ ) {
-
-// TODO add teardown callback to remove dialogs
-module("dialog: core");
-
-test( "markup structure", function( assert ) {
-	expect( 11 );
-
-	var element = $( "<div>" ).dialog({
-			buttons: [ {
-				text: "Ok",
-				click: $.noop
-			} ]
-		}),
-		widget = element.dialog( "widget" ),
-		titlebar = widget.find( ".ui-dialog-titlebar" ),
-		title = titlebar.find( ".ui-dialog-title" ),
-		close = titlebar.find( ".ui-dialog-titlebar-close" ),
-		buttonpane = widget.find( ".ui-dialog-buttonpane" ),
-		buttonset = widget.find( ".ui-dialog-buttonset" ),
-		buttons = buttonset.find( ".ui-button" );
-
-	assert.hasClasses( widget, "ui-dialog ui-dialog-buttons ui-widget ui-widget-content" );
-	assert.hasClasses( titlebar, "ui-dialog-titlebar ui-widget-header" );
-	equal( titlebar.length, 1, "Dialog has exactly one titlebar" );
-	assert.hasClasses( close, "ui-dialog-titlebar-close ui-widget" );
-	equal( close.length, 1, "Titlebar has exactly one close button" );
-	equal( title.length, 1, "Titlebar has exactly one title" );
-	assert.hasClasses( element, "ui-dialog-content ui-widget-content" );
-	assert.hasClasses( buttonpane, "ui-dialog-buttonpane ui-widget-content" );
-	equal( buttonpane.length, 1, "Dialog has exactly one buttonpane" );
-	equal( buttonset.length, 1, "Buttonpane has exactly one buttonset" );
-	equal( buttons.length, 1, "Buttonset contains exactly 1 button when created with 1" );
-
-});
-
-test( "markup structure - no buttons", function( assert ) {
-	expect( 7 );
-
-	var element = $( "<div>" ).dialog(),
-		widget = element.dialog( "widget" ),
-		titlebar = widget.find( ".ui-dialog-titlebar" ),
-		title = titlebar.find( ".ui-dialog-title" ),
-		close = titlebar.find( ".ui-dialog-titlebar-close" );
-
-	assert.hasClasses( widget, "ui-dialog ui-widget ui-widget-content" );
-	assert.hasClasses( titlebar, "ui-dialog-titlebar ui-widget-header" );
-	equal( titlebar.length, 1, "Dialog has exactly one titlebar" );
-	assert.hasClasses( close, "ui-dialog-titlebar-close ui-widget" );
-	equal( close.length, 1, "Titlebar has exactly one close button" );
-	equal( title.length, 1, "Titlebar has exactly one title" );
-	assert.hasClasses( element, "ui-dialog-content ui-widget-content" );
-});
-
-test("title id", function() {
-	expect(1);
-
-	var titleId,
-		element = $("<div>").dialog();
-
-	titleId = element.dialog("widget").find(".ui-dialog-title").attr("id");
-	ok( /ui-id-\d+$/.test( titleId ), "auto-numbered title id");
-	element.remove();
-});
-
-test( "ARIA", function() {
-	expect( 4 );
-
-	var element = $( "<div>" ).dialog(),
-		wrapper = element.dialog( "widget" );
-	equal( wrapper.attr( "role" ), "dialog", "dialog role" );
-	equal( wrapper.attr( "aria-labelledby" ), wrapper.find( ".ui-dialog-title" ).attr( "id" ) );
-	equal( wrapper.attr( "aria-describedby" ), element.attr( "id" ), "aria-describedby added" );
-	element.remove();
-
-	element = $("<div><div aria-describedby='section2'><p id='section2'>descriotion</p></div></div>").dialog();
-	equal( element.dialog( "widget" ).attr( "aria-describedby" ), null, "no aria-describedby added, as already present in markup" );
-	element.remove();
-});
-
-test("widget method", function() {
-	expect( 1 );
-	var dialog = $("<div>").appendTo("#qunit-fixture").dialog();
-	deepEqual(dialog.parent()[0], dialog.dialog("widget")[0]);
-	dialog.remove();
-});
-
-asyncTest( "focus tabbable", function() {
-	expect( 8 );
-	var element,
-		options = {
-			buttons: [{
-				text: "Ok",
-				click: $.noop
-			}]
-		};
-
-	function checkFocus( markup, options, testFn, next ) {
-
-		// Support: IE8
-		// For some reason the focus doesn't get set properly if we don't
-		// focus the body first.
-		$( "body" ).focus();
-
-		element = $( markup ).dialog( options );
-		setTimeout(function() {
-			testFn(function done() {
-				element.remove();
-				setTimeout( next );
-			});
-		});
-	}
-
-	function step1() {
-		checkFocus( "<div><input><input></div>", options, function( done ) {
-			var input = element.find( "input:last" ).focus().blur();
-			element.dialog( "instance" )._focusTabbable();
-			setTimeout(function() {
-				equal( document.activeElement, input[ 0 ],
-					"1. an element that was focused previously." );
-				done();
-			});
-		}, step2 );
-	}
-
-	function step2() {
-		checkFocus( "<div><input><input autofocus></div>", options, function( done ) {
-			equal( document.activeElement, element.find( "input" )[ 1 ],
-				"2. first element inside the dialog matching [autofocus]" );
-			done();
-		}, step3 );
-	}
-
-	function step3() {
-		checkFocus( "<div><input><input></div>", options, function( done ) {
-			equal( document.activeElement, element.find( "input" )[ 0 ],
-				"3. tabbable element inside the content element" );
-			done();
-		}, step4 );
-	}
-
-	function step4() {
-		checkFocus( "<div>text</div>", options, function( done ) {
-			equal( document.activeElement,
-				element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" )[ 0 ],
-				"4. tabbable element inside the buttonpane" );
-			done();
-		}, step5 );
-	}
-
-	function step5() {
-		checkFocus( "<div>text</div>", {}, function( done ) {
-			equal( document.activeElement,
-				element.dialog( "widget" ).find( ".ui-dialog-titlebar .ui-dialog-titlebar-close" )[ 0 ],
-				"5. the close button" );
-			done();
-		}, step6 );
-	}
-
-	function step6() {
-		checkFocus( "<div>text</div>", { autoOpen: false }, function( done ) {
-			element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).hide();
-			element.dialog( "open" );
-			setTimeout(function() {
-				equal( document.activeElement, element.parent()[ 0 ], "6. the dialog itself" );
-				done();
-			});
-		}, step7 );
-	}
-
-	function step7() {
-		checkFocus(
-			"<div><input><input autofocus></div>",
-			{
-				open: function() {
-					var inputs = $( this ).find( "input" );
-					inputs.last().keydown(function( event ) {
-						event.preventDefault();
-						inputs.first().focus();
-					});
-				}
-			},
-			function( done ) {
-				var inputs = element.find( "input" );
-				equal( document.activeElement, inputs[ 1 ], "Focus starts on second input" );
-				inputs.last().simulate( "keydown", { keyCode: $.ui.keyCode.TAB });
-				setTimeout(function() {
-					equal( document.activeElement, inputs[ 0 ],
-						"Honor preventDefault, allowing custom focus management" );
-					done();
-				}, 50 );
-			},
-			start
-		);
-	}
-
-	step1();
-});
-
-test( "#7960: resizable handles below modal overlays", function() {
-	expect( 1 );
-
-	var resizable = $( "<div>" ).resizable(),
-		dialog = $( "<div>" ).dialog({ modal: true }),
-		resizableZindex = parseInt( resizable.find( ".ui-resizable-handle" ).css( "zIndex" ), 10 ),
-		overlayZindex = parseInt( $( ".ui-widget-overlay" ).css( "zIndex" ), 10 );
-
-	ok( resizableZindex < overlayZindex, "Resizable handles have lower z-index than modal overlay" );
-	dialog.dialog( "destroy" );
-});
-
-asyncTest( "Prevent tabbing out of dialogs", function() {
-	expect( 3 );
-
-	var element = $( "<div><input name='0'><input name='1'></div>" ).dialog(),
-		inputs = element.find( "input" );
-
-	// Remove close button to test focus on just the two buttons
-	element.dialog( "widget" ).find( ".ui-button").remove();
-
-	function checkTab() {
-		equal( document.activeElement, inputs[ 0 ], "Tab key event moved focus within the modal" );
-
-		// check shift tab
-		$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB, shiftKey: true });
-		setTimeout( checkShiftTab );
-	}
-
-	function checkShiftTab() {
-		equal( document.activeElement, inputs[ 1 ], "Shift-Tab key event moved focus back to second input" );
-
-		element.remove();
-		setTimeout( start );
-	}
-
-	inputs[ 1 ].focus();
-	setTimeout(function() {
-		equal( document.activeElement, inputs[ 1 ], "Focus set on second input" );
-		inputs.eq( 1 ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB });
-
-		setTimeout( checkTab );
-	});
-});
-
-asyncTest( "#9048: multiple modal dialogs opened and closed in different order", function() {
-	expect( 1 );
-	$( "#dialog1, #dialog2" ).dialog({ autoOpen: false, modal:true });
-	$( "#dialog1" ).dialog( "open" );
-	$( "#dialog2" ).dialog( "open" );
-	$( "#dialog1" ).dialog( "close" );
-	setTimeout(function() {
-		$( "#dialog2" ).dialog( "close" );
-		$( "#favorite-animal" ).focus();
-		ok( true, "event handlers cleaned up (no errors thrown)" );
-		start();
-	});
-});
-
-asyncTest( "interaction between overlay and other dialogs", function() {
-	$.widget( "ui.testWidget", $.ui.dialog, {
-		options: {
-			modal: true,
-			autoOpen: false
-		}
-	});
-	expect( 2 );
-	var first = $( "<div><input id='input-1'></div>" ).dialog({
-			modal: true
-		}),
-		firstInput = first.find( "input" ),
-		second = $( "<div><input id='input-2'></div>" ).testWidget(),
-		secondInput = second.find( "input" );
-
-	// Support: IE8
-	// For some reason the focus doesn't get set properly if we don't
-	// focus the body first.
-	$( "body" ).focus();
-
-	// Wait for the modal to init
-	setTimeout(function() {
-		second.testWidget( "open" );
-
-		// Simulate user tabbing from address bar to an element outside the dialog
-		$( "#favorite-animal" ).focus();
-		setTimeout(function() {
-			equal( document.activeElement, secondInput[ 0 ] );
-
-			// Last active dialog must receive focus
-			firstInput.focus();
-			$( "#favorite-animal" ).focus();
-			setTimeout(function() {
-				equal( document.activeElement, firstInput[ 0 ] );
-
-				// Cleanup
-				first.remove();
-				second.remove();
-				delete $.ui.testWidget;
-				delete $.fn.testWidget;
-				start();
-			});
-		});
-	});
-});
-
-} );
diff --git a/tests/unit/dialog/dialog_deprecated.html b/tests/unit/dialog/dialog_deprecated.html
deleted file mode 100644
index 2d20b6291..000000000
--- a/tests/unit/dialog/dialog_deprecated.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>jQuery UI Dialog Test Suite</title>
-
-	<script src="../../lib/css.js" data-modules="core button dialog"></script>
-	<script src="../../lib/bootstrap.js" data-widget="dialog" data-deprecated="true"></script>
-</head>
-<body>
-
-<div id="qunit"></div>
-<div id="qunit-fixture">
-	<div id="dialog1"></div>
-	<div id="dialog2"></div>
-	<div id="form-dialog" title="Profile Information">
-		<!-- create a spacer to ensure there's enough space to scroll -->
-		<div style="height: 250px;">...</div>
-		<fieldset>
-			<legend>Please share some personal information</legend>
-			<label for="favorite-animal">Your favorite animal</label><input id="favorite-animal">
-			<label for="favorite-color">Your favorite color</label><input id="favorite-color">
-		</fieldset>
-		<div role="group" aria-describedby="section2">
-			<p id="section2">Some more (optional) information</p>
-			<label for="favorite-food">Favorite food</label><input id="favorite-food">
-		</div>
-	</div>
-	<div class="wrap" id="wrap1"></div>
-	<div class="wrap" id="wrap2"></div>
-</div>
-</body>
-</html>
diff --git a/tests/unit/dialog/dialog_deprecated.js b/tests/unit/dialog/dialog_deprecated.js
deleted file mode 100644
index 1f7087c57..000000000
--- a/tests/unit/dialog/dialog_deprecated.js
+++ /dev/null
@@ -1,30 +0,0 @@
-define( [
-	"jquery",
-	"ui/dialog"
-], function( $ ) {
-
-module( "dialog (deprecated): options" );
-
-test( "dialogClass", function( assert ) {
-	expect( 5 );
-
-	var element = $( "<div>" ).dialog(),
-		widget = element.dialog( "widget" );
-	assert.lacksClasses( widget, "foo", "dialogClass not specified. class not added" );
-	element.remove();
-
-	element = $( "<div>" ).dialog({ dialogClass: "foo" });
-	widget = element.dialog( "widget" );
-	assert.hasClasses( widget, "foo", "dialogClass in init, foo class added" );
-	element.dialog( "option", "dialogClass", "foobar" );
-	assert.lacksClasses( widget, "foo", "dialogClass changed, previous one was removed" );
-	assert.hasClasses( widget, "foobar", "dialogClass changed, new one was added" );
-	element.remove();
-
-	element = $( "<div>" ).dialog({ dialogClass: "foo bar" });
-	widget = element.dialog( "widget" );
-	assert.hasClasses( widget, "foo bar", "dialogClass in init, two classes." );
-	element.remove();
-});
-
-} );
diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/dialog_events.js
deleted file mode 100644
index cc5bef8fa..000000000
--- a/tests/unit/dialog/dialog_events.js
+++ /dev/null
@@ -1,370 +0,0 @@
-define( [
-	"jquery",
-	"./dialog_test_helpers",
-	"ui/dialog"
-], function( $, testHelper ) {
-
-module("dialog: events");
-
-test("open", function() {
-	expect(13);
-
-	var element = $("<div></div>");
-	element.dialog({
-		open: function(ev, ui) {
-			ok(element.dialog( "instance" )._isOpen, "interal _isOpen flag is set");
-			ok(true, "autoOpen: true fires open callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.type, "dialogopen", "event type in callback");
-			deepEqual(ui, {}, "ui hash in callback");
-		}
-	});
-	element.remove();
-
-	element = $("<div></div>");
-	element.dialog({
-		autoOpen: false,
-		open: function(ev, ui) {
-			ok(true, ".dialog('open') fires open callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.type, "dialogopen", "event type in callback");
-			deepEqual(ui, {}, "ui hash in callback");
-		}
-	}).bind("dialogopen", function(ev, ui) {
-		ok(element.dialog( "instance" )._isOpen, "interal _isOpen flag is set");
-		ok(true, "dialog('open') fires open event");
-		equal(this, element[0], "context of event");
-		deepEqual(ui, {}, "ui hash in event");
-	});
-	element.dialog("open");
-	element.remove();
-});
-
-test( "focus", function() {
-	expect( 5 );
-	var element, other;
-	element = $("#dialog1").dialog({
-		autoOpen: false
-	});
-	other = $("#dialog2").dialog({
-		autoOpen: false
-	});
-
-	element.one( "dialogopen", function() {
-		ok( true, "open, just once" );
-	});
-	element.one( "dialogfocus", function() {
-		ok( true, "focus on open" );
-	});
-	other.dialog( "open" );
-
-	element.one( "dialogfocus", function() {
-		ok( true, "when opening and already open and wasn't on top" );
-	});
-	other.dialog( "open" );
-	element.dialog( "open" );
-
-	element.one( "dialogfocus", function() {
-		ok( true, "when calling moveToTop and wasn't on top" );
-	});
-	other.dialog( "moveToTop" );
-	element.dialog( "moveToTop" );
-
-	element.bind( "dialogfocus", function() {
-		ok( true, "when mousedown anywhere on the dialog and it wasn't on top" );
-	});
-	other.dialog( "moveToTop" );
-	element.trigger( "mousedown" );
-
-	// triggers just once when already on top
-	element.dialog( "open" );
-	element.dialog( "moveToTop" );
-	element.trigger( "mousedown" );
-
-	element.add( other ).remove();
-});
-
-test("dragStart", function() {
-	expect(9);
-
-	var handle,
-		element = $("<div></div>").dialog({
-			dragStart: function(ev, ui) {
-				ok(true, "dragging fires dragStart callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.type, "dialogdragstart", "event type in callback");
-				ok(ui.position !== undefined, "ui.position in callback");
-				ok(ui.offset !== undefined, "ui.offset in callback");
-			}
-		}).bind("dialogdragstart", function(ev, ui) {
-			ok(true, "dragging fires dialogdragstart event");
-			equal(this, element[0], "context of event");
-			ok(ui.position !== undefined, "ui.position in callback");
-			ok(ui.offset !== undefined, "ui.offset in callback");
-		});
-
-	handle = $(".ui-dialog-titlebar", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
-	element.remove();
-});
-
-test("drag", function() {
-	expect(9);
-	var handle,
-		hasDragged = false,
-		element = $("<div></div>").dialog({
-			drag: function(ev, ui) {
-				if (!hasDragged) {
-					ok(true, "dragging fires drag callback");
-					equal(this, element[0], "context of callback");
-					equal(ev.type, "dialogdrag", "event type in callback");
-					ok(ui.position !== undefined, "ui.position in callback");
-					ok(ui.offset !== undefined, "ui.offset in callback");
-
-					hasDragged = true;
-				}
-			}
-		}).one("dialogdrag", function(ev, ui) {
-			ok(true, "dragging fires dialogdrag event");
-			equal(this, element[0], "context of event");
-			ok(ui.position !== undefined, "ui.position in callback");
-			ok(ui.offset !== undefined, "ui.offset in callback");
-		});
-
-	handle = $(".ui-dialog-titlebar", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
-	element.remove();
-});
-
-test("dragStop", function() {
-	expect(9);
-
-	var handle,
-		element = $("<div></div>").dialog({
-			dragStop: function(ev, ui) {
-				ok(true, "dragging fires dragStop callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.type, "dialogdragstop", "event type in callback");
-				ok(ui.position !== undefined, "ui.position in callback");
-				ok(ui.offset !== undefined, "ui.offset in callback");
-			}
-		}).bind("dialogdragstop", function(ev, ui) {
-			ok(true, "dragging fires dialogdragstop event");
-			equal(this, element[0], "context of event");
-			ok(ui.position !== undefined, "ui.position in callback");
-			ok(ui.offset !== undefined, "ui.offset in callback");
-		});
-
-	handle = $(".ui-dialog-titlebar", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
-	element.remove();
-});
-
-test("resizeStart", function() {
-	expect(13);
-
-	var handle,
-		element = $("<div></div>").dialog({
-			resizeStart: function(ev, ui) {
-				ok(true, "resizing fires resizeStart callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.type, "dialogresizestart", "event type in callback");
-				ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-				ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-				ok(ui.position !== undefined, "ui.position in callback");
-				ok(ui.size !== undefined, "ui.size in callback");
-			}
-		}).bind("dialogresizestart", function(ev, ui) {
-			ok(true, "resizing fires dialogresizestart event");
-			equal(this, element[0], "context of event");
-			ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-			ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-			ok(ui.position !== undefined, "ui.position in callback");
-			ok(ui.size !== undefined, "ui.size in callback");
-		});
-
-	handle = $(".ui-resizable-se", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
-	element.remove();
-});
-
-test("resize", function() {
-	expect(13);
-	var handle,
-		hasResized = false,
-		element = $("<div></div>").dialog({
-			resize: function(ev, ui) {
-				if (!hasResized) {
-					ok(true, "resizing fires resize callback");
-					equal(this, element[0], "context of callback");
-					equal(ev.type, "dialogresize", "event type in callback");
-					ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-					ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-					ok(ui.position !== undefined, "ui.position in callback");
-					ok(ui.size !== undefined, "ui.size in callback");
-
-					hasResized = true;
-				}
-			}
-		}).one("dialogresize", function(ev, ui) {
-			ok(true, "resizing fires dialogresize event");
-			equal(this, element[0], "context of event");
-			ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-			ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-			ok(ui.position !== undefined, "ui.position in callback");
-			ok(ui.size !== undefined, "ui.size in callback");
-		});
-
-	handle = $(".ui-resizable-se", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
-	element.remove();
-});
-
-test("resizeStop", function() {
-	expect(13);
-
-	var handle,
-		element = $("<div></div>").dialog({
-			resizeStop: function(ev, ui) {
-				ok(true, "resizing fires resizeStop callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.type, "dialogresizestop", "event type in callback");
-				ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-				ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-				ok(ui.position !== undefined, "ui.position in callback");
-				ok(ui.size !== undefined, "ui.size in callback");
-			}
-		}).bind("dialogresizestop", function(ev, ui) {
-			ok(true, "resizing fires dialogresizestop event");
-			equal(this, element[0], "context of event");
-				ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-				ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-				ok(ui.position !== undefined, "ui.position in callback");
-				ok(ui.size !== undefined, "ui.size in callback");
-		});
-
-	handle = $(".ui-resizable-se", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
-	element.remove();
-});
-
-asyncTest("close", function() {
-	expect(14);
-
-	var element = $("<div></div>").dialog({
-		close: function(ev, ui) {
-			ok(true, ".dialog('close') fires close callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.type, "dialogclose", "event type in callback");
-			deepEqual(ui, {}, "ui hash in callback");
-		}
-	}).bind("dialogclose", function(ev, ui) {
-		ok(true, ".dialog('close') fires dialogclose event");
-		equal(this, element[0], "context of event");
-		deepEqual(ui, {}, "ui hash in event");
-	});
-	element.dialog("close");
-	element.remove();
-
-	// Close event with an effect
-	element = $("<div></div>").dialog({
-		hide: 10,
-		close: function(ev, ui) {
-			ok(true, ".dialog('close') fires close callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.type, "dialogclose", "event type in callback");
-			deepEqual(ui, {}, "ui hash in callback");
-			start();
-		}
-	}).bind("dialogclose", function(ev, ui) {
-		ok(true, ".dialog('close') fires dialogclose event");
-		equal(this, element[0], "context of event");
-		deepEqual(ui, {}, "ui hash in event");
-	});
-	element.dialog("close");
-});
-
-test("beforeClose", function() {
-	expect(14);
-
-	var element = $("<div></div>").dialog({
-		beforeClose: function(ev, ui) {
-			ok(true, ".dialog('close') fires beforeClose callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.type, "dialogbeforeclose", "event type in callback");
-			deepEqual(ui, {}, "ui hash in callback");
-			return false;
-		}
-	});
-
-	element.dialog("close");
-	ok( element.dialog("widget").is(":visible"), "beforeClose callback should prevent dialog from closing");
-	element.remove();
-
-	element = $("<div></div>").dialog();
-	element.dialog("option", "beforeClose", function(ev, ui) {
-		ok(true, ".dialog('close') fires beforeClose callback");
-		equal(this, element[0], "context of callback");
-		equal(ev.type, "dialogbeforeclose", "event type in callback");
-		deepEqual(ui, {}, "ui hash in callback");
-		return false;
-	});
-	element.dialog("close");
-
-	ok( element.dialog("widget").is(":visible"), "beforeClose callback should prevent dialog from closing");
-	element.remove();
-
-	element = $("<div></div>").dialog().bind("dialogbeforeclose", function(ev, ui) {
-		ok(true, ".dialog('close') triggers dialogbeforeclose event");
-		equal(this, element[0], "context of event");
-		deepEqual(ui, {}, "ui hash in event");
-		return false;
-	});
-	element.dialog("close");
-	ok( element.dialog("widget").is(":visible"), "dialogbeforeclose event should prevent dialog from closing");
-	element.remove();
-});
-
-// #8789 and #8838
-asyncTest("ensure dialog's container doesn't scroll on resize and focus", function() {
-	expect(2);
-
-	var element = $("#dialog1").dialog(),
-		initialScroll = $(window).scrollTop();
-	element.dialog("option", "height", 600);
-	equal($(window).scrollTop(), initialScroll, "scroll hasn't moved after height change");
-	setTimeout( function(){
-		$(".ui-dialog-titlebar-close").simulate("mousedown");
-		equal($(window).scrollTop(), initialScroll, "scroll hasn't moved after focus moved to dialog");
-		element.dialog("destroy");
-		start();
-	});
-});
-
-test("#5184: isOpen in dialogclose event is true", function() {
-	expect( 3 );
-
-	var element = $( "<div></div>" ).dialog({
-			close: function() {
-				ok( !element.dialog("isOpen"), "dialog is not open during close" );
-			}
-		});
-	ok( element.dialog("isOpen"), "dialog is open after init" );
-	element.dialog( "close" );
-	ok( !element.dialog("isOpen"), "dialog is not open after close" );
-	element.remove();
-});
-
-test("ensure dialog keeps focus when clicking modal overlay", function() {
-	expect( 2 );
-
-	var element = $( "<div></div>" ).dialog({
-			modal: true
-		});
-	equal( $( document.activeElement ).closest( ".ui-dialog" ).length, 1, "focus is in dialog" );
-	$(".ui-widget-overlay").simulate("mousedown");
-	equal( $( document.activeElement ).closest( ".ui-dialog" ).length, 1, "focus is still in dialog" );
-	element.remove();
-});
-
-} );
diff --git a/tests/unit/dialog/dialog_methods.js b/tests/unit/dialog/dialog_methods.js
deleted file mode 100644
index 10b0fd7bb..000000000
--- a/tests/unit/dialog/dialog_methods.js
+++ /dev/null
@@ -1,267 +0,0 @@
-define( [
-	"jquery",
-	"ui/dialog"
-], function( $ ) {
-
-module("dialog: methods", {
-	teardown: function() {
-		$("body>.ui-dialog").remove();
-	}
-});
-
-test("init", function() {
-	expect(6);
-
-	$("<div></div>").appendTo("body").dialog().remove();
-	ok(true, ".dialog() called on element");
-
-	$([]).dialog().remove();
-	ok(true, ".dialog() called on empty collection");
-
-	$("<div></div>").dialog().remove();
-	ok(true, ".dialog() called on disconnected DOMElement - never connected");
-
-	$("<div></div>").appendTo("body").remove().dialog().remove();
-	ok(true, ".dialog() called on disconnected DOMElement - removed");
-
-	var element = $("<div></div>").dialog();
-	element.dialog("option", "foo");
-	element.remove();
-	ok(true, "arbitrary option getter after init");
-
-	$("<div></div>").dialog().dialog("option", "foo", "bar").remove();
-	ok(true, "arbitrary option setter after init");
-});
-
-test("destroy", function( assert ) {
-	expect( 17 );
-
-	var element, element2;
-
-	$( "#dialog1, #form-dialog" ).hide();
-	assert.domEqual( "#dialog1", function() {
-		var dialog = $( "#dialog1" ).dialog().dialog( "destroy" );
-		equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] );
-		equal( dialog.index(), 0 );
-	});
-	assert.domEqual( "#form-dialog", function() {
-		var dialog = $( "#form-dialog" ).dialog().dialog( "destroy" );
-		equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] );
-		equal( dialog.index(), 2 );
-	});
-
-	// Ensure dimensions are restored (#8119)
-	$( "#dialog1" ).show().css({
-		width: "400px",
-		minHeight: "100px",
-		height: "200px"
-	});
-	assert.domEqual( "#dialog1", function() {
-		$( "#dialog1" ).dialog().dialog( "destroy" );
-	});
-
-	// Don't throw errors when destroying a never opened modal dialog (#9004)
-	$( "#dialog1" ).dialog({ autoOpen: false, modal: true }).dialog( "destroy" );
-	equal( $( ".ui-widget-overlay" ).length, 0, "overlay does not exist" );
-	equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays");
-
-	element = $( "#dialog1" ).dialog({ modal: true }),
-	element2 = $( "#dialog2" ).dialog({ modal: true });
-	equal( $( ".ui-widget-overlay" ).length, 2, "overlays created when dialogs are open" );
-	equal( $( document ).data( "ui-dialog-overlays" ), 2, "ui-dialog-overlays equals the number of open overlays" );
-	element.dialog( "close" );
-	equal( $( ".ui-widget-overlay" ).length, 1, "overlay remains after closing one dialog" );
-	equal( $( document ).data( "ui-dialog-overlays" ), 1, "ui-dialog-overlays equals the number of open overlays" );
-	element.dialog( "destroy" );
-	equal( $( ".ui-widget-overlay" ).length, 1, "overlay remains after destroying one dialog" );
-	equal( $( document ).data( "ui-dialog-overlays" ), 1, "ui-dialog-overlays equals the number of open overlays" );
-	element2.dialog( "destroy" );
-	equal( $( ".ui-widget-overlay" ).length, 0, "overlays removed when all dialogs are destoryed" );
-	equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays" );
-});
-
-asyncTest("#9000: Dialog leaves broken event handler after close/destroy in certain cases", function() {
-	expect( 1 );
-	$( "#dialog1" ).dialog({ modal:true }).dialog( "close" ).dialog( "destroy" );
-	setTimeout(function() {
-		$( "#favorite-animal" ).focus();
-		ok( true, "close and destroy modal dialog before its really opened" );
-		start();
-	});
-});
-
-test("#4980: Destroy should place element back in original DOM position", function(){
-	expect( 2 );
-	var container = $("<div id='container'><div id='modal'>Content</div></div>"),
-		modal = container.find("#modal");
-	modal.dialog();
-	ok(!$.contains(container[0], modal[0]), "dialog should move modal element to outside container element");
-	modal.dialog("destroy");
-	ok($.contains(container[0], modal[0]), "dialog(destroy) should place element back in original DOM position");
-});
-
-test( "enable/disable disabled", function( assert ) {
-	expect( 3 );
-	var element = $( "<div></div>" ).dialog();
-	element.dialog( "disable" );
-	equal(element.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
-	assert.lacksClasses( element, "ui-dialog-disabled ui-state-disabled", "disable method doesn't add classes" );
-	ok( !element.dialog( "widget" ).attr( "aria-disabled" ), "disable method doesn't add aria-disabled" );
-});
-
-test("close", function() {
-	expect( 3 );
-
-	var element,
-		expected = $("<div></div>").dialog(),
-		actual = expected.dialog("close");
-	equal(actual, expected, "close is chainable");
-
-	element = $("<div></div>").dialog();
-	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog visible before close method called");
-	element.dialog("close");
-	ok(element.dialog("widget").is(":hidden") && !element.dialog("widget").is(":visible"), "dialog hidden after close method called");
-});
-
-test("isOpen", function() {
-	expect(4);
-
-	var element = $("<div></div>").dialog();
-	equal(element.dialog("isOpen"), true, "dialog is open after init");
-	element.dialog("close");
-	equal(element.dialog("isOpen"), false, "dialog is closed");
-	element.remove();
-
-	element = $("<div></div>").dialog({autoOpen: false});
-	equal(element.dialog("isOpen"), false, "dialog is closed after init");
-	element.dialog("open");
-	equal(element.dialog("isOpen"), true, "dialog is open");
-	element.remove();
-});
-
-test("moveToTop", function() {
-	expect( 5 );
-	function order() {
-		var actual = $( ".ui-dialog" ).map(function() {
-			return +$( this ).css( "z-index" );
-		}).get();
-		deepEqual( actual, $.makeArray( arguments ) );
-	}
-	var dialog1, dialog2,
-		focusOn = "dialog1";
-	dialog1 = $( "#dialog1" ).dialog({
-		focus: function() {
-			equal( focusOn, "dialog1" );
-		}
-	});
-	focusOn = "dialog2";
-	dialog2 = $( "#dialog2" ).dialog({
-		focus: function() {
-			equal( focusOn, "dialog2" );
-		}
-	});
-	order( 100, 101 );
-	focusOn = "dialog1";
-	dialog1.dialog( "moveToTop" );
-	order( 102, 101 );
-});
-
-test( "moveToTop: content scroll stays intact", function() {
-	expect( 2 );
-	var otherDialog = $( "#dialog1" ).dialog(),
-		scrollDialog = $( "#form-dialog" ).dialog({
-			height: 200
-		});
-	scrollDialog.scrollTop( 50 );
-	equal( scrollDialog.scrollTop(), 50 );
-
-	otherDialog.dialog( "moveToTop" );
-	equal( scrollDialog.scrollTop(), 50 );
-});
-
-test("open", function() {
-	expect( 3 );
-	var element,
-		expected = $("<div></div>").dialog(),
-		actual = expected.dialog("open");
-	equal(actual, expected, "open is chainable");
-
-	element = $("<div></div>").dialog({ autoOpen: false });
-	ok(element.dialog("widget").is(":hidden") && !element.dialog("widget").is(":visible"), "dialog hidden before open method called");
-	element.dialog("open");
-	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog visible after open method called");
-});
-
-// http://bugs.jqueryui.com/ticket/6137
-test("Ensure form elements don't reset when opening a dialog", function() {
-	expect(2);
-
-	var d1 = $("<form><input type='radio' name='radio' id='a' value='a' checked='checked'></input>" +
-				"<input type='radio' name='radio' id='b' value='b'>b</input></form>").appendTo( "body" ).dialog({autoOpen: false});
-
-	d1.find("#b").prop( "checked", true );
-	equal(d1.find("input:checked").val(), "b", "checkbox b is checked");
-
-	d1.dialog("open");
-	equal(d1.find("input:checked").val(), "b", "checkbox b is checked");
-
-	d1.remove();
-});
-
-asyncTest( "#8958: dialog can be opened while opening", function() {
-	expect( 1 );
-
-	var element = $( "<div>" ).dialog({
-		autoOpen: false,
-		modal: true,
-		open: function() {
-			equal( $( ".ui-widget-overlay" ).length, 1 );
-			start();
-		}
-	});
-
-	// Support: IE8
-	// For some reason the #favorite-color input doesn't get focus if we don't
-	// focus the body first, causing the test to hang.
-	$( "body" ).focus();
-
-	$( "#favorite-animal" )
-		// We focus the input to start the test. Once it receives focus, the
-		// dialog will open. Opening the dialog, will cause an element inside
-		// the dialog to gain focus, thus blurring the input.
-		.bind( "focus", function() {
-			element.dialog( "open" );
-		})
-		// When the input blurs, the dialog is in the process of opening. We
-		// try to open the dialog again, to make sure that dialogs properly
-		// handle a call to the open() method during the process of the dialog
-		// being opened.
-		.bind( "blur", function() {
-			element.dialog( "open" );
-		})
-		.focus();
-});
-
-test("#5531: dialog width should be at least minWidth on creation", function () {
-	expect( 4 );
-	var element = $("<div></div>").dialog({
-			width: 200,
-			minWidth: 300
-		});
-
-	equal(element.dialog("option", "width"), 300, "width is minWidth");
-	element.dialog("option", "width", 200);
-	equal(element.dialog("option", "width"), 300, "width unchanged when set to < minWidth");
-	element.dialog("option", "width", 320);
-	equal(element.dialog("option", "width"), 320, "width changed if set to > minWidth");
-	element.remove();
-
-	element = $("<div></div>").dialog({
-			minWidth: 300
-		});
-	ok(element.dialog("option", "width") >=  300, "width is at least 300");
-	element.remove();
-
-});
-
-} );
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
deleted file mode 100644
index 1b9af7a09..000000000
--- a/tests/unit/dialog/dialog_options.js
+++ /dev/null
@@ -1,557 +0,0 @@
-define( [
-	"jquery",
-	"./dialog_test_helpers",
-	"ui/dialog",
-	"ui/effect-blind",
-	"ui/effect-explode"
-], function( $, testHelper ) {
-
-module("dialog: options");
-
-test( "appendTo", function() {
-	expect( 16 );
-	var detached = $( "<div>" ),
-		element = $( "#dialog1" ).dialog({
-			modal: true
-		});
-	equal( element.dialog( "widget" ).parent()[0], document.body, "defaults to body" );
-	equal( $( ".ui-widget-overlay" ).parent()[0], document.body, "overlay defaults to body" );
-	element.dialog( "destroy" );
-
-	element.dialog({
-		appendTo: ".wrap",
-		modal: true
-	});
-	equal( element.dialog( "widget" ).parent()[0], $( "#wrap1" )[0], "first found element" );
-	equal( $( ".ui-widget-overlay" ).parent()[0], $( "#wrap1" )[0], "overlay first found element" );
-	equal( $( "#wrap2 .ui-dialog" ).length, 0, "only appends to one element" );
-	equal( $( "#wrap2 .ui-widget-overlay" ).length, 0, "overlay only appends to one element" );
-	element.dialog( "destroy" );
-
-	element.dialog({
-		appendTo: null,
-		modal: true
-	});
-	equal( element.dialog( "widget" ).parent()[0], document.body, "null" );
-	equal( $( ".ui-widget-overlay" ).parent()[0], document.body, "overlay null" );
-	element.dialog( "destroy" );
-
-	element.dialog({
-		autoOpen: false,
-		modal: true
-	}).dialog( "option", "appendTo", "#wrap1" ).dialog( "open" );
-	equal( element.dialog( "widget" ).parent()[0], $( "#wrap1" )[0], "modified after init" );
-	equal( $( ".ui-widget-overlay" ).parent()[0], $( "#wrap1" )[0], "overlay modified after init" );
-	element.dialog( "destroy" );
-
-	element.dialog({
-		appendTo: detached,
-		modal: true
-	});
-	equal( element.dialog( "widget" ).parent()[0], detached[0], "detached jQuery object" );
-	equal( detached.find( ".ui-widget-overlay" ).parent()[0], detached[0], "overlay detached jQuery object" );
-	element.dialog( "destroy" );
-
-	element.dialog({
-		appendTo: detached[0],
-		modal: true
-	});
-	equal( element.dialog( "widget" ).parent()[0], detached[0], "detached DOM element" );
-	equal( detached.find( ".ui-widget-overlay" ).parent()[0], detached[0], "overlay detached DOM element" );
-	element.dialog( "destroy" );
-
-	element.dialog({
-		autoOpen: false,
-		modal: true
-	}).dialog( "option", "appendTo", detached );
-	equal( element.dialog( "widget" ).parent()[0], detached[0], "detached DOM element via option()" );
-	equal( detached.find( ".ui-widget-overlay" ).length, 0, "overlay detached DOM element via option()" );
-	element.dialog( "destroy" );
-});
-
-test("autoOpen", function() {
-	expect(2);
-
-	var element = $("<div></div>").dialog({ autoOpen: false });
-	ok( !element.dialog("widget").is(":visible"), ".dialog({ autoOpen: false })");
-	element.remove();
-
-	element = $("<div></div>").dialog({ autoOpen: true });
-	ok( element.dialog("widget").is(":visible"), ".dialog({ autoOpen: true })");
-	element.remove();
-});
-
-test("buttons", function( assert ) {
-	expect(21);
-
-	var btn, i, newButtons,
-		buttons = {
-			"Ok": function( ev ) {
-				ok(true, "button click fires callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.target, btn[0], "event target");
-			},
-			"Cancel": function( ev ) {
-				ok(true, "button click fires callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.target, btn[1], "event target");
-			}
-		},
-		element = $("<div></div>").dialog({ buttons: buttons });
-
-	btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
-	equal(btn.length, 2, "number of buttons");
-
-	i = 0;
-	$.each(buttons, function( key ) {
-		equal(btn.eq(i).text(), key, "text of button " + (i+1));
-		i++;
-	});
-
-	assert.hasClasses( btn.parent(), "ui-dialog-buttonset" );
-	assert.hasClasses( element.parent(), "ui-dialog-buttons" );
-
-	btn.trigger("click");
-
-	newButtons = {
-		"Close": function( ev ) {
-			ok(true, "button click fires callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.target, btn[0], "event target");
-		}
-	};
-
-	deepEqual(element.dialog("option", "buttons"), buttons, ".dialog('option', 'buttons') getter");
-	element.dialog("option", "buttons", newButtons);
-	deepEqual(element.dialog("option", "buttons"), newButtons, ".dialog('option', 'buttons', ...) setter");
-
-	btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
-	equal(btn.length, 1, "number of buttons after setter");
-	btn.trigger("click");
-
-	i = 0;
-	$.each(newButtons, function( key ) {
-		equal(btn.eq(i).text(), key, "text of button " + (i+1));
-		i += 1;
-	});
-
-	element.dialog("option", "buttons", null);
-	btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
-	equal(btn.length, 0, "all buttons have been removed");
-	equal(element.find(".ui-dialog-buttonset").length, 0, "buttonset has been removed");
-	assert.lacksClasses( element.parent(), "ui-dialog-buttons" );
-	element.remove();
-});
-
-test("buttons - advanced", function( assert ) {
-	expect( 7 );
-
-	var buttons,
-		element = $("<div></div>").dialog({
-			buttons: [
-				{
-					text: "a button",
-					"class": "additional-class",
-					id: "my-button-id",
-					click: function() {
-						equal(this, element[0], "correct context");
-					},
-					icons: {
-						primary: "ui-icon-cancel"
-					},
-					showText: false
-				}
-			]
-		});
-
-	buttons = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
-	equal(buttons.length, 1, "correct number of buttons");
-	equal(buttons.attr("id"), "my-button-id", "correct id");
-	equal(buttons.text(), "a button", "correct label");
-	assert.hasClasses( buttons, "additional-class" );
-	deepEqual( buttons.button("option", "icons"), { primary: "ui-icon-cancel", secondary: null } );
-	equal( buttons.button( "option", "text" ), false );
-	buttons.click();
-
-	element.remove();
-});
-
-test("#9043: buttons with Array.prototype modification", function() {
-	expect( 1 );
-	Array.prototype.test = $.noop;
-	var element = $( "<div></div>" ).dialog();
-	equal( element.dialog( "widget" ).find( ".ui-dialog-buttonpane" ).length, 0,
-		"no button pane" );
-	element.remove();
-	delete Array.prototype.test;
-});
-
-test("closeOnEscape", function() {
-	expect( 6 );
-	var element = $("<div></div>").dialog({ closeOnEscape: false });
-	ok(true, "closeOnEscape: false");
-	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog is open before ESC");
-	element.simulate("keydown", { keyCode: $.ui.keyCode.ESCAPE })
-		.simulate("keypress", { keyCode: $.ui.keyCode.ESCAPE })
-		.simulate("keyup", { keyCode: $.ui.keyCode.ESCAPE });
-	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog is open after ESC");
-
-	element.remove();
-
-	element = $("<div></div>").dialog({ closeOnEscape: true });
-	ok(true, "closeOnEscape: true");
-	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog is open before ESC");
-	element.simulate("keydown", { keyCode: $.ui.keyCode.ESCAPE })
-		.simulate("keypress", { keyCode: $.ui.keyCode.ESCAPE })
-		.simulate("keyup", { keyCode: $.ui.keyCode.ESCAPE });
-	ok(element.dialog("widget").is(":hidden") && !element.dialog("widget").is(":visible"), "dialog is closed after ESC");
-});
-
-test("closeText", function() {
-	expect(3);
-
-	var element = $("<div></div>").dialog();
-		equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "Close",
-			"default close text");
-	element.remove();
-
-	element = $("<div></div>").dialog({ closeText: "foo" });
-		equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "foo",
-			"closeText on init");
-	element.remove();
-
-	element = $("<div></div>").dialog().dialog("option", "closeText", "bar");
-		equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "bar",
-			"closeText via option method");
-	element.remove();
-});
-
-test("draggable", function() {
-	expect(4);
-
-	var element = $("<div></div>").dialog({ draggable: false });
-
-		testHelper.testDrag(element, 50, -50, 0, 0);
-		element.dialog("option", "draggable", true);
-		testHelper.testDrag(element, 50, -50, 50, -50);
-	element.remove();
-
-	element = $("<div></div>").dialog({ draggable: true });
-		testHelper.testDrag(element, 50, -50, 50, -50);
-		element.dialog("option", "draggable", false);
-		testHelper.testDrag(element, 50, -50, 0, 0);
-	element.remove();
-});
-
-test("height", function() {
-	expect(4);
-
-	var element = $("<div></div>").dialog();
-		equal(element.dialog("widget").outerHeight(), 150, "default height");
-	element.remove();
-
-	element = $("<div></div>").dialog({ height: 237 });
-		equal(element.dialog("widget").outerHeight(), 237, "explicit height");
-	element.remove();
-
-	element = $("<div></div>").dialog();
-		element.dialog("option", "height", 238);
-		equal(element.dialog("widget").outerHeight(), 238, "explicit height set after init");
-	element.remove();
-
-	element = $("<div></div>").css("padding", "20px")
-		.dialog({ height: 240 });
-		equal(element.dialog("widget").outerHeight(), 240, "explicit height with padding");
-	element.remove();
-});
-
-test("maxHeight", function( assert ) {
-	expect(3);
-
-	var element = $("<div></div>").dialog({ maxHeight: 200 });
-		testHelper.drag(element, ".ui-resizable-s", 1000, 1000);
-		assert.close(element.dialog("widget").height(), 200, 1, "maxHeight");
-	element.remove();
-
-	element = $("<div></div>").dialog({ maxHeight: 200 });
-		testHelper.drag(element, ".ui-resizable-n", -1000, -1000);
-		assert.close(element.dialog("widget").height(), 200, 1, "maxHeight");
-	element.remove();
-
-	element = $("<div></div>").dialog({ maxHeight: 200 }).dialog("option", "maxHeight", 300);
-		testHelper.drag(element, ".ui-resizable-s", 1000, 1000);
-		assert.close(element.dialog("widget").height(), 300, 1, "maxHeight");
-	element.remove();
-});
-
-test("maxWidth", function( assert ) {
-	expect(3);
-
-	var element = $("<div></div>").dialog({ maxWidth: 200 });
-		testHelper.drag(element, ".ui-resizable-e", 1000, 1000);
-		assert.close(element.dialog("widget").width(), 200, 1, "maxWidth");
-	element.remove();
-
-	element = $("<div></div>").dialog({ maxWidth: 200 });
-		testHelper.drag(element, ".ui-resizable-w", -1000, -1000);
-		assert.close(element.dialog("widget").width(), 200, 1, "maxWidth");
-	element.remove();
-
-	element = $("<div></div>").dialog({ maxWidth: 200 }).dialog("option", "maxWidth", 300);
-		testHelper.drag(element, ".ui-resizable-w", -1000, -1000);
-		assert.close(element.dialog("widget").width(), 300, 1, "maxWidth");
-	element.remove();
-});
-
-test("minHeight", function( assert ) {
-	expect(3);
-
-	var element = $("<div></div>").dialog({ minHeight: 10 });
-		testHelper.drag(element, ".ui-resizable-s", -1000, -1000);
-		assert.close(element.dialog("widget").height(), 10, 1, "minHeight");
-	element.remove();
-
-	element = $("<div></div>").dialog({ minHeight: 10 });
-		testHelper.drag(element, ".ui-resizable-n", 1000, 1000);
-		assert.close(element.dialog("widget").height(), 10, 1, "minHeight");
-	element.remove();
-
-	element = $("<div></div>").dialog({ minHeight: 10 }).dialog("option", "minHeight", 30);
-		testHelper.drag(element, ".ui-resizable-n", 1000, 1000);
-		assert.close(element.dialog("widget").height(), 30, 1, "minHeight");
-	element.remove();
-});
-
-test("minWidth", function( assert ) {
-	expect(3);
-
-	var element = $("<div></div>").dialog({ minWidth: 10 });
-		testHelper.drag(element, ".ui-resizable-e", -1000, -1000);
-		assert.close(element.dialog("widget").width(), 10, 1, "minWidth");
-	element.remove();
-
-	element = $("<div></div>").dialog({ minWidth: 10 });
-		testHelper.drag(element, ".ui-resizable-w", 1000, 1000);
-		assert.close(element.dialog("widget").width(), 10, 1, "minWidth");
-	element.remove();
-
-	element = $("<div></div>").dialog({ minWidth: 30 }).dialog("option", "minWidth", 30);
-		testHelper.drag(element, ".ui-resizable-w", 1000, 1000);
-		assert.close(element.dialog("widget").width(), 30, 1, "minWidth");
-	element.remove();
-});
-
-test( "position, default center on window", function( assert ) {
-	expect( 2 );
-
-	// dialogs alter the window width and height in Firefox
-	// so we collect that information before creating the dialog
-	// Support: Firefox
-	var winWidth = $( window ).width(),
-		winHeight = $( window ).height(),
-		element = $("<div></div>").dialog(),
-		dialog = element.dialog("widget"),
-		offset = dialog.offset();
-	assert.close( offset.left, Math.round( winWidth / 2 - dialog.outerWidth() / 2 ) + $( window ).scrollLeft(), 1, "dialog left position of center on window on initilization" );
-	assert.close( offset.top, Math.round( winHeight / 2 - dialog.outerHeight() / 2 ) + $( window ).scrollTop(), 1, "dialog top position of center on window on initilization" );
-	element.remove();
-});
-
-test( "position, right bottom at right bottom via ui.position args", function( assert ) {
-	expect( 2 );
-
-	// dialogs alter the window width and height in Firefox
-	// so we collect that information before creating the dialog
-	// Support: Firefox
-	var winWidth = $( window ).width(),
-		winHeight = $( window ).height(),
-		element = $("<div></div>").dialog({
-			position: {
-				my: "right bottom",
-				at: "right bottom"
-			}
-		}),
-		dialog = element.dialog("widget"),
-		offset = dialog.offset();
-
-	assert.close( offset.left, winWidth - dialog.outerWidth() + $( window ).scrollLeft(), 1, "dialog left position of right bottom at right bottom on initilization" );
-	assert.close( offset.top, winHeight - dialog.outerHeight() + $( window ).scrollTop(), 1, "dialog top position of right bottom at right bottom on initilization" );
-	element.remove();
-});
-
-test( "position, at another element", function( assert ) {
-	expect( 4 );
-	var parent = $("<div></div>").css({
-			position: "absolute",
-			top: 400,
-			left: 600,
-			height: 10,
-			width: 10
-		}).appendTo("body"),
-
-		element = $("<div></div>").dialog({
-			position: {
-				my: "left top",
-				at: "left top",
-				of: parent,
-				collision: "none"
-			}
-		}),
-
-		dialog = element.dialog("widget"),
-		offset = dialog.offset();
-
-	assert.close( offset.left, 600, 1, "dialog left position at another element on initilization" );
-	assert.close( offset.top, 400, 1, "dialog top position at another element on initilization" );
-
-	element.dialog("option", "position", {
-			my: "left top",
-			at: "right bottom",
-			of: parent,
-			collision: "none"
-	});
-
-	offset = dialog.offset();
-
-	assert.close( offset.left, 610, 1, "dialog left position at another element via setting option" );
-	assert.close( offset.top, 410, 1, "dialog top position at another element via setting option" );
-
-	element.remove();
-	parent.remove();
-});
-
-test("resizable", function() {
-	expect(4);
-
-	var element = $("<div></div>").dialog();
-		testHelper.shouldResize(element, 50, 50, "[default]");
-		element.dialog("option", "resizable", false);
-		testHelper.shouldResize(element, 0, 0, "disabled after init");
-	element.remove();
-
-	element = $("<div></div>").dialog({ resizable: false });
-		testHelper.shouldResize(element, 0, 0, "disabled in init options");
-		element.dialog("option", "resizable", true);
-		testHelper.shouldResize(element, 50, 50, "enabled after init");
-	element.remove();
-});
-
-test( "title", function() {
-	expect( 11 );
-
-	function titleText() {
-		return element.dialog("widget").find( ".ui-dialog-title" ).html();
-	}
-
-	var element = $( "<div></div>" ).dialog();
-		// some browsers return a non-breaking space and some return "&nbsp;"
-		// so we generate a non-breaking space for comparison
-		equal( titleText(), $( "<span>&#160;</span>" ).html(), "[default]" );
-		equal( element.dialog( "option", "title" ), null, "option not changed" );
-	element.remove();
-
-	element = $( "<div title='foo'>" ).dialog();
-		equal( titleText(), "foo", "title in element attribute" );
-		equal( element.dialog( "option", "title"), "foo", "option updated from attribute" );
-	element.remove();
-
-	element = $( "<div></div>" ).dialog({ title: "foo" });
-		equal( titleText(), "foo", "title in init options" );
-		equal( element.dialog("option", "title"), "foo", "opiton set from options hash" );
-	element.remove();
-
-	element = $( "<div title='foo'>" ).dialog({ title: "bar" });
-		equal( titleText(), "bar", "title in init options should override title in element attribute" );
-		equal( element.dialog("option", "title"), "bar", "opiton set from options hash" );
-	element.remove();
-
-	element = $( "<div></div>" ).dialog().dialog( "option", "title", "foo" );
-		equal( titleText(), "foo", "title after init" );
-	element.remove();
-
-	// make sure attroperties are properly ignored - #5742 - .attr() might return a DOMElement
-	element = $( "<form><input name='title'></form>" ).dialog();
-		// some browsers return a non-breaking space and some return "&nbsp;"
-		// so we get the text to normalize to the actual non-breaking space
-		equal( titleText(), $( "<span>&#160;</span>" ).html(), "[default]" );
-		equal( element.dialog( "option", "title" ), null, "option not changed" );
-	element.remove();
-});
-
-test("width", function( assert ) {
-	expect(3);
-
-	var element = $("<div></div>").dialog();
-		assert.close(element.dialog("widget").width(), 300, 1, "default width");
-	element.remove();
-
-	element = $("<div></div>").dialog({width: 437 });
-		assert.close(element.dialog("widget").width(), 437, 1, "explicit width");
-		element.dialog("option", "width", 438);
-		assert.close(element.dialog("widget").width(), 438, 1, "explicit width after init");
-	element.remove();
-});
-
-test("#4826: setting resizable false toggles resizable on dialog", function() {
-	expect(6);
-	var i,
-		element = $("<div></div>").dialog({ resizable: false });
-
-	testHelper.shouldResize(element, 0, 0, "[default]");
-	for (i=0; i<2; i++) {
-		element.dialog("close").dialog("open");
-		testHelper.shouldResize(element, 0, 0, "initialized with resizable false toggle ("+ (i+1) +")");
-	}
-	element.remove();
-
-	element = $("<div></div>").dialog({ resizable: true });
-	testHelper.shouldResize(element, 50, 50, "[default]");
-	for (i=0; i<2; i++) {
-		element.dialog("close").dialog("option", "resizable", false).dialog("open");
-		testHelper.shouldResize(element, 0, 0, "set option resizable false toggle ("+ (i+1) +")");
-	}
-	element.remove();
-
-});
-
-asyncTest( "#8051 - 'Explode' dialog animation causes crash in IE 6, 7 and 8", function() {
-	expect( 1 );
-	var element = $( "<div></div>" ).dialog({
-		show: "explode",
-		focus: function() {
-			ok( true, "dialog opened with animation" );
-			element.remove();
-			start();
-		}
-	});
-});
-
-asyncTest( "#4421 - Focus lost from dialog which uses show-effect", function() {
-	expect( 1 );
-	var element = $( "<div></div>" ).dialog({
-		show: "blind",
-		focus: function() {
-			equal( element.dialog( "widget" ).find( document.activeElement ).length, 1, "dialog maintains focus" );
-			element.remove();
-			start();
-		}
-	});
-});
-
-asyncTest( "Open followed by close during show effect", function() {
-	expect( 1 );
-	var element = $( "<div></div>" ).dialog({
-		show: "blind",
-		close: function() {
-			ok( true, "dialog closed properly during animation" );
-			element.remove();
-			start();
-		}
-	});
-
-	setTimeout( function() {
-		element.dialog("close");
-	}, 100 );
-});
-
-} );
diff --git a/tests/unit/dialog/dialog_test_helpers.js b/tests/unit/dialog/dialog_test_helpers.js
deleted file mode 100644
index f84d1d624..000000000
--- a/tests/unit/dialog/dialog_test_helpers.js
+++ /dev/null
@@ -1,55 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper",
-	"ui/dialog"
-], function( $, helper ) {
-
-return $.extend( helper, {
-	drag: function(element, handle, dx, dy) {
-		var d = element.dialog("widget");
-		//this mouseover is to work around a limitation in resizable
-		//TODO: fix resizable so handle doesn't require mouseover in order to be used
-		$( handle, d ).simulate("mouseover").simulate( "drag", {
-			dx: dx,
-			dy: dy
-		});
-	},
-	testDrag: function(element, dx, dy, expectedDX, expectedDY, msg) {
-		var actualDX, actualDY, offsetAfter,
-			d = element.dialog("widget"),
-			handle = $(".ui-dialog-titlebar", d),
-			offsetBefore = d.offset();
-
-		this.drag(element, handle, dx, dy);
-
-		offsetAfter = d.offset();
-
-		msg = msg ? msg + "." : "";
-
-		actualDX = offsetAfter.left - offsetBefore.left;
-		actualDY = offsetAfter.top - offsetBefore.top;
-		ok( expectedDX - actualDX <= 1 && expectedDY - actualDY <= 1, "dragged[" + expectedDX + ", " + expectedDY + "] " + msg);
-	},
-	// TODO switch back to checking the size of the .ui-dialog element (var d)
-	// once we switch to using box-sizing: border-box (#9845) that should work fine
-	// using the element's dimensions to avoid subpixel errors
-	shouldResize: function(element, dw, dh, msg) {
-		var heightAfter, widthAfter, actual, expected,
-			d = element.dialog("widget"),
-			handle = $(".ui-resizable-se", d),
-			heightBefore = element.height(),
-			widthBefore = element.width();
-
-		this.drag(element, handle, 50, 50);
-
-		heightAfter = element.height();
-		widthAfter = element.width();
-
-		msg = msg ? msg + "." : "";
-		actual = { width: widthAfter, height: heightAfter },
-		expected = { width: widthBefore + dw, height: heightBefore + dh };
-		deepEqual(actual, expected, "resized[" + 50 + ", " + 50 + "] " + msg);
-	}
-} );
-
-} );
diff --git a/tests/unit/dialog/events.js b/tests/unit/dialog/events.js
new file mode 100644
index 000000000..5834b3481
--- /dev/null
+++ b/tests/unit/dialog/events.js
@@ -0,0 +1,370 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/dialog"
+], function( $, testHelper ) {
+
+module("dialog: events");
+
+test("open", function() {
+	expect(13);
+
+	var element = $("<div></div>");
+	element.dialog({
+		open: function(ev, ui) {
+			ok(element.dialog( "instance" )._isOpen, "interal _isOpen flag is set");
+			ok(true, "autoOpen: true fires open callback");
+			equal(this, element[0], "context of callback");
+			equal(ev.type, "dialogopen", "event type in callback");
+			deepEqual(ui, {}, "ui hash in callback");
+		}
+	});
+	element.remove();
+
+	element = $("<div></div>");
+	element.dialog({
+		autoOpen: false,
+		open: function(ev, ui) {
+			ok(true, ".dialog('open') fires open callback");
+			equal(this, element[0], "context of callback");
+			equal(ev.type, "dialogopen", "event type in callback");
+			deepEqual(ui, {}, "ui hash in callback");
+		}
+	}).bind("dialogopen", function(ev, ui) {
+		ok(element.dialog( "instance" )._isOpen, "interal _isOpen flag is set");
+		ok(true, "dialog('open') fires open event");
+		equal(this, element[0], "context of event");
+		deepEqual(ui, {}, "ui hash in event");
+	});
+	element.dialog("open");
+	element.remove();
+});
+
+test( "focus", function() {
+	expect( 5 );
+	var element, other;
+	element = $("#dialog1").dialog({
+		autoOpen: false
+	});
+	other = $("#dialog2").dialog({
+		autoOpen: false
+	});
+
+	element.one( "dialogopen", function() {
+		ok( true, "open, just once" );
+	});
+	element.one( "dialogfocus", function() {
+		ok( true, "focus on open" );
+	});
+	other.dialog( "open" );
+
+	element.one( "dialogfocus", function() {
+		ok( true, "when opening and already open and wasn't on top" );
+	});
+	other.dialog( "open" );
+	element.dialog( "open" );
+
+	element.one( "dialogfocus", function() {
+		ok( true, "when calling moveToTop and wasn't on top" );
+	});
+	other.dialog( "moveToTop" );
+	element.dialog( "moveToTop" );
+
+	element.bind( "dialogfocus", function() {
+		ok( true, "when mousedown anywhere on the dialog and it wasn't on top" );
+	});
+	other.dialog( "moveToTop" );
+	element.trigger( "mousedown" );
+
+	// triggers just once when already on top
+	element.dialog( "open" );
+	element.dialog( "moveToTop" );
+	element.trigger( "mousedown" );
+
+	element.add( other ).remove();
+});
+
+test("dragStart", function() {
+	expect(9);
+
+	var handle,
+		element = $("<div></div>").dialog({
+			dragStart: function(ev, ui) {
+				ok(true, "dragging fires dragStart callback");
+				equal(this, element[0], "context of callback");
+				equal(ev.type, "dialogdragstart", "event type in callback");
+				ok(ui.position !== undefined, "ui.position in callback");
+				ok(ui.offset !== undefined, "ui.offset in callback");
+			}
+		}).bind("dialogdragstart", function(ev, ui) {
+			ok(true, "dragging fires dialogdragstart event");
+			equal(this, element[0], "context of event");
+			ok(ui.position !== undefined, "ui.position in callback");
+			ok(ui.offset !== undefined, "ui.offset in callback");
+		});
+
+	handle = $(".ui-dialog-titlebar", element.dialog("widget"));
+	testHelper.drag(element, handle, 50, 50);
+	element.remove();
+});
+
+test("drag", function() {
+	expect(9);
+	var handle,
+		hasDragged = false,
+		element = $("<div></div>").dialog({
+			drag: function(ev, ui) {
+				if (!hasDragged) {
+					ok(true, "dragging fires drag callback");
+					equal(this, element[0], "context of callback");
+					equal(ev.type, "dialogdrag", "event type in callback");
+					ok(ui.position !== undefined, "ui.position in callback");
+					ok(ui.offset !== undefined, "ui.offset in callback");
+
+					hasDragged = true;
+				}
+			}
+		}).one("dialogdrag", function(ev, ui) {
+			ok(true, "dragging fires dialogdrag event");
+			equal(this, element[0], "context of event");
+			ok(ui.position !== undefined, "ui.position in callback");
+			ok(ui.offset !== undefined, "ui.offset in callback");
+		});
+
+	handle = $(".ui-dialog-titlebar", element.dialog("widget"));
+	testHelper.drag(element, handle, 50, 50);
+	element.remove();
+});
+
+test("dragStop", function() {
+	expect(9);
+
+	var handle,
+		element = $("<div></div>").dialog({
+			dragStop: function(ev, ui) {
+				ok(true, "dragging fires dragStop callback");
+				equal(this, element[0], "context of callback");
+				equal(ev.type, "dialogdragstop", "event type in callback");
+				ok(ui.position !== undefined, "ui.position in callback");
+				ok(ui.offset !== undefined, "ui.offset in callback");
+			}
+		}).bind("dialogdragstop", function(ev, ui) {
+			ok(true, "dragging fires dialogdragstop event");
+			equal(this, element[0], "context of event");
+			ok(ui.position !== undefined, "ui.position in callback");
+			ok(ui.offset !== undefined, "ui.offset in callback");
+		});
+
+	handle = $(".ui-dialog-titlebar", element.dialog("widget"));
+	testHelper.drag(element, handle, 50, 50);
+	element.remove();
+});
+
+test("resizeStart", function() {
+	expect(13);
+
+	var handle,
+		element = $("<div></div>").dialog({
+			resizeStart: function(ev, ui) {
+				ok(true, "resizing fires resizeStart callback");
+				equal(this, element[0], "context of callback");
+				equal(ev.type, "dialogresizestart", "event type in callback");
+				ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
+				ok(ui.originalSize !== undefined, "ui.originalSize in callback");
+				ok(ui.position !== undefined, "ui.position in callback");
+				ok(ui.size !== undefined, "ui.size in callback");
+			}
+		}).bind("dialogresizestart", function(ev, ui) {
+			ok(true, "resizing fires dialogresizestart event");
+			equal(this, element[0], "context of event");
+			ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
+			ok(ui.originalSize !== undefined, "ui.originalSize in callback");
+			ok(ui.position !== undefined, "ui.position in callback");
+			ok(ui.size !== undefined, "ui.size in callback");
+		});
+
+	handle = $(".ui-resizable-se", element.dialog("widget"));
+	testHelper.drag(element, handle, 50, 50);
+	element.remove();
+});
+
+test("resize", function() {
+	expect(13);
+	var handle,
+		hasResized = false,
+		element = $("<div></div>").dialog({
+			resize: function(ev, ui) {
+				if (!hasResized) {
+					ok(true, "resizing fires resize callback");
+					equal(this, element[0], "context of callback");
+					equal(ev.type, "dialogresize", "event type in callback");
+					ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
+					ok(ui.originalSize !== undefined, "ui.originalSize in callback");
+					ok(ui.position !== undefined, "ui.position in callback");
+					ok(ui.size !== undefined, "ui.size in callback");
+
+					hasResized = true;
+				}
+			}
+		}).one("dialogresize", function(ev, ui) {
+			ok(true, "resizing fires dialogresize event");
+			equal(this, element[0], "context of event");
+			ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
+			ok(ui.originalSize !== undefined, "ui.originalSize in callback");
+			ok(ui.position !== undefined, "ui.position in callback");
+			ok(ui.size !== undefined, "ui.size in callback");
+		});
+
+	handle = $(".ui-resizable-se", element.dialog("widget"));
+	testHelper.drag(element, handle, 50, 50);
+	element.remove();
+});
+
+test("resizeStop", function() {
+	expect(13);
+
+	var handle,
+		element = $("<div></div>").dialog({
+			resizeStop: function(ev, ui) {
+				ok(true, "resizing fires resizeStop callback");
+				equal(this, element[0], "context of callback");
+				equal(ev.type, "dialogresizestop", "event type in callback");
+				ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
+				ok(ui.originalSize !== undefined, "ui.originalSize in callback");
+				ok(ui.position !== undefined, "ui.position in callback");
+				ok(ui.size !== undefined, "ui.size in callback");
+			}
+		}).bind("dialogresizestop", function(ev, ui) {
+			ok(true, "resizing fires dialogresizestop event");
+			equal(this, element[0], "context of event");
+				ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
+				ok(ui.originalSize !== undefined, "ui.originalSize in callback");
+				ok(ui.position !== undefined, "ui.position in callback");
+				ok(ui.size !== undefined, "ui.size in callback");
+		});
+
+	handle = $(".ui-resizable-se", element.dialog("widget"));
+	testHelper.drag(element, handle, 50, 50);
+	element.remove();
+});
+
+asyncTest("close", function() {
+	expect(14);
+
+	var element = $("<div></div>").dialog({
+		close: function(ev, ui) {
+			ok(true, ".dialog('close') fires close callback");
+			equal(this, element[0], "context of callback");
+			equal(ev.type, "dialogclose", "event type in callback");
+			deepEqual(ui, {}, "ui hash in callback");
+		}
+	}).bind("dialogclose", function(ev, ui) {
+		ok(true, ".dialog('close') fires dialogclose event");
+		equal(this, element[0], "context of event");
+		deepEqual(ui, {}, "ui hash in event");
+	});
+	element.dialog("close");
+	element.remove();
+
+	// Close event with an effect
+	element = $("<div></div>").dialog({
+		hide: 10,
+		close: function(ev, ui) {
+			ok(true, ".dialog('close') fires close callback");
+			equal(this, element[0], "context of callback");
+			equal(ev.type, "dialogclose", "event type in callback");
+			deepEqual(ui, {}, "ui hash in callback");
+			start();
+		}
+	}).bind("dialogclose", function(ev, ui) {
+		ok(true, ".dialog('close') fires dialogclose event");
+		equal(this, element[0], "context of event");
+		deepEqual(ui, {}, "ui hash in event");
+	});
+	element.dialog("close");
+});
+
+test("beforeClose", function() {
+	expect(14);
+
+	var element = $("<div></div>").dialog({
+		beforeClose: function(ev, ui) {
+			ok(true, ".dialog('close') fires beforeClose callback");
+			equal(this, element[0], "context of callback");
+			equal(ev.type, "dialogbeforeclose", "event type in callback");
+			deepEqual(ui, {}, "ui hash in callback");
+			return false;
+		}
+	});
+
+	element.dialog("close");
+	ok( element.dialog("widget").is(":visible"), "beforeClose callback should prevent dialog from closing");
+	element.remove();
+
+	element = $("<div></div>").dialog();
+	element.dialog("option", "beforeClose", function(ev, ui) {
+		ok(true, ".dialog('close') fires beforeClose callback");
+		equal(this, element[0], "context of callback");
+		equal(ev.type, "dialogbeforeclose", "event type in callback");
+		deepEqual(ui, {}, "ui hash in callback");
+		return false;
+	});
+	element.dialog("close");
+
+	ok( element.dialog("widget").is(":visible"), "beforeClose callback should prevent dialog from closing");
+	element.remove();
+
+	element = $("<div></div>").dialog().bind("dialogbeforeclose", function(ev, ui) {
+		ok(true, ".dialog('close') triggers dialogbeforeclose event");
+		equal(this, element[0], "context of event");
+		deepEqual(ui, {}, "ui hash in event");
+		return false;
+	});
+	element.dialog("close");
+	ok( element.dialog("widget").is(":visible"), "dialogbeforeclose event should prevent dialog from closing");
+	element.remove();
+});
+
+// #8789 and #8838
+asyncTest("ensure dialog's container doesn't scroll on resize and focus", function() {
+	expect(2);
+
+	var element = $("#dialog1").dialog(),
+		initialScroll = $(window).scrollTop();
+	element.dialog("option", "height", 600);
+	equal($(window).scrollTop(), initialScroll, "scroll hasn't moved after height change");
+	setTimeout( function(){
+		$(".ui-dialog-titlebar-close").simulate("mousedown");
+		equal($(window).scrollTop(), initialScroll, "scroll hasn't moved after focus moved to dialog");
+		element.dialog("destroy");
+		start();
+	});
+});
+
+test("#5184: isOpen in dialogclose event is true", function() {
+	expect( 3 );
+
+	var element = $( "<div></div>" ).dialog({
+			close: function() {
+				ok( !element.dialog("isOpen"), "dialog is not open during close" );
+			}
+		});
+	ok( element.dialog("isOpen"), "dialog is open after init" );
+	element.dialog( "close" );
+	ok( !element.dialog("isOpen"), "dialog is not open after close" );
+	element.remove();
+});
+
+test("ensure dialog keeps focus when clicking modal overlay", function() {
+	expect( 2 );
+
+	var element = $( "<div></div>" ).dialog({
+			modal: true
+		});
+	equal( $( document.activeElement ).closest( ".ui-dialog" ).length, 1, "focus is in dialog" );
+	$(".ui-widget-overlay").simulate("mousedown");
+	equal( $( document.activeElement ).closest( ".ui-dialog" ).length, 1, "focus is still in dialog" );
+	element.remove();
+});
+
+} );
diff --git a/tests/unit/dialog/helper.js b/tests/unit/dialog/helper.js
new file mode 100644
index 000000000..f84d1d624
--- /dev/null
+++ b/tests/unit/dialog/helper.js
@@ -0,0 +1,55 @@
+define( [
+	"jquery",
+	"lib/helper",
+	"ui/dialog"
+], function( $, helper ) {
+
+return $.extend( helper, {
+	drag: function(element, handle, dx, dy) {
+		var d = element.dialog("widget");
+		//this mouseover is to work around a limitation in resizable
+		//TODO: fix resizable so handle doesn't require mouseover in order to be used
+		$( handle, d ).simulate("mouseover").simulate( "drag", {
+			dx: dx,
+			dy: dy
+		});
+	},
+	testDrag: function(element, dx, dy, expectedDX, expectedDY, msg) {
+		var actualDX, actualDY, offsetAfter,
+			d = element.dialog("widget"),
+			handle = $(".ui-dialog-titlebar", d),
+			offsetBefore = d.offset();
+
+		this.drag(element, handle, dx, dy);
+
+		offsetAfter = d.offset();
+
+		msg = msg ? msg + "." : "";
+
+		actualDX = offsetAfter.left - offsetBefore.left;
+		actualDY = offsetAfter.top - offsetBefore.top;
+		ok( expectedDX - actualDX <= 1 && expectedDY - actualDY <= 1, "dragged[" + expectedDX + ", " + expectedDY + "] " + msg);
+	},
+	// TODO switch back to checking the size of the .ui-dialog element (var d)
+	// once we switch to using box-sizing: border-box (#9845) that should work fine
+	// using the element's dimensions to avoid subpixel errors
+	shouldResize: function(element, dw, dh, msg) {
+		var heightAfter, widthAfter, actual, expected,
+			d = element.dialog("widget"),
+			handle = $(".ui-resizable-se", d),
+			heightBefore = element.height(),
+			widthBefore = element.width();
+
+		this.drag(element, handle, 50, 50);
+
+		heightAfter = element.height();
+		widthAfter = element.width();
+
+		msg = msg ? msg + "." : "";
+		actual = { width: widthAfter, height: heightAfter },
+		expected = { width: widthBefore + dw, height: heightBefore + dh };
+		deepEqual(actual, expected, "resized[" + 50 + ", " + 50 + "] " + msg);
+	}
+} );
+
+} );
diff --git a/tests/unit/dialog/methods.js b/tests/unit/dialog/methods.js
new file mode 100644
index 000000000..10b0fd7bb
--- /dev/null
+++ b/tests/unit/dialog/methods.js
@@ -0,0 +1,267 @@
+define( [
+	"jquery",
+	"ui/dialog"
+], function( $ ) {
+
+module("dialog: methods", {
+	teardown: function() {
+		$("body>.ui-dialog").remove();
+	}
+});
+
+test("init", function() {
+	expect(6);
+
+	$("<div></div>").appendTo("body").dialog().remove();
+	ok(true, ".dialog() called on element");
+
+	$([]).dialog().remove();
+	ok(true, ".dialog() called on empty collection");
+
+	$("<div></div>").dialog().remove();
+	ok(true, ".dialog() called on disconnected DOMElement - never connected");
+
+	$("<div></div>").appendTo("body").remove().dialog().remove();
+	ok(true, ".dialog() called on disconnected DOMElement - removed");
+
+	var element = $("<div></div>").dialog();
+	element.dialog("option", "foo");
+	element.remove();
+	ok(true, "arbitrary option getter after init");
+
+	$("<div></div>").dialog().dialog("option", "foo", "bar").remove();
+	ok(true, "arbitrary option setter after init");
+});
+
+test("destroy", function( assert ) {
+	expect( 17 );
+
+	var element, element2;
+
+	$( "#dialog1, #form-dialog" ).hide();
+	assert.domEqual( "#dialog1", function() {
+		var dialog = $( "#dialog1" ).dialog().dialog( "destroy" );
+		equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] );
+		equal( dialog.index(), 0 );
+	});
+	assert.domEqual( "#form-dialog", function() {
+		var dialog = $( "#form-dialog" ).dialog().dialog( "destroy" );
+		equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] );
+		equal( dialog.index(), 2 );
+	});
+
+	// Ensure dimensions are restored (#8119)
+	$( "#dialog1" ).show().css({
+		width: "400px",
+		minHeight: "100px",
+		height: "200px"
+	});
+	assert.domEqual( "#dialog1", function() {
+		$( "#dialog1" ).dialog().dialog( "destroy" );
+	});
+
+	// Don't throw errors when destroying a never opened modal dialog (#9004)
+	$( "#dialog1" ).dialog({ autoOpen: false, modal: true }).dialog( "destroy" );
+	equal( $( ".ui-widget-overlay" ).length, 0, "overlay does not exist" );
+	equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays");
+
+	element = $( "#dialog1" ).dialog({ modal: true }),
+	element2 = $( "#dialog2" ).dialog({ modal: true });
+	equal( $( ".ui-widget-overlay" ).length, 2, "overlays created when dialogs are open" );
+	equal( $( document ).data( "ui-dialog-overlays" ), 2, "ui-dialog-overlays equals the number of open overlays" );
+	element.dialog( "close" );
+	equal( $( ".ui-widget-overlay" ).length, 1, "overlay remains after closing one dialog" );
+	equal( $( document ).data( "ui-dialog-overlays" ), 1, "ui-dialog-overlays equals the number of open overlays" );
+	element.dialog( "destroy" );
+	equal( $( ".ui-widget-overlay" ).length, 1, "overlay remains after destroying one dialog" );
+	equal( $( document ).data( "ui-dialog-overlays" ), 1, "ui-dialog-overlays equals the number of open overlays" );
+	element2.dialog( "destroy" );
+	equal( $( ".ui-widget-overlay" ).length, 0, "overlays removed when all dialogs are destoryed" );
+	equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays" );
+});
+
+asyncTest("#9000: Dialog leaves broken event handler after close/destroy in certain cases", function() {
+	expect( 1 );
+	$( "#dialog1" ).dialog({ modal:true }).dialog( "close" ).dialog( "destroy" );
+	setTimeout(function() {
+		$( "#favorite-animal" ).focus();
+		ok( true, "close and destroy modal dialog before its really opened" );
+		start();
+	});
+});
+
+test("#4980: Destroy should place element back in original DOM position", function(){
+	expect( 2 );
+	var container = $("<div id='container'><div id='modal'>Content</div></div>"),
+		modal = container.find("#modal");
+	modal.dialog();
+	ok(!$.contains(container[0], modal[0]), "dialog should move modal element to outside container element");
+	modal.dialog("destroy");
+	ok($.contains(container[0], modal[0]), "dialog(destroy) should place element back in original DOM position");
+});
+
+test( "enable/disable disabled", function( assert ) {
+	expect( 3 );
+	var element = $( "<div></div>" ).dialog();
+	element.dialog( "disable" );
+	equal(element.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
+	assert.lacksClasses( element, "ui-dialog-disabled ui-state-disabled", "disable method doesn't add classes" );
+	ok( !element.dialog( "widget" ).attr( "aria-disabled" ), "disable method doesn't add aria-disabled" );
+});
+
+test("close", function() {
+	expect( 3 );
+
+	var element,
+		expected = $("<div></div>").dialog(),
+		actual = expected.dialog("close");
+	equal(actual, expected, "close is chainable");
+
+	element = $("<div></div>").dialog();
+	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog visible before close method called");
+	element.dialog("close");
+	ok(element.dialog("widget").is(":hidden") && !element.dialog("widget").is(":visible"), "dialog hidden after close method called");
+});
+
+test("isOpen", function() {
+	expect(4);
+
+	var element = $("<div></div>").dialog();
+	equal(element.dialog("isOpen"), true, "dialog is open after init");
+	element.dialog("close");
+	equal(element.dialog("isOpen"), false, "dialog is closed");
+	element.remove();
+
+	element = $("<div></div>").dialog({autoOpen: false});
+	equal(element.dialog("isOpen"), false, "dialog is closed after init");
+	element.dialog("open");
+	equal(element.dialog("isOpen"), true, "dialog is open");
+	element.remove();
+});
+
+test("moveToTop", function() {
+	expect( 5 );
+	function order() {
+		var actual = $( ".ui-dialog" ).map(function() {
+			return +$( this ).css( "z-index" );
+		}).get();
+		deepEqual( actual, $.makeArray( arguments ) );
+	}
+	var dialog1, dialog2,
+		focusOn = "dialog1";
+	dialog1 = $( "#dialog1" ).dialog({
+		focus: function() {
+			equal( focusOn, "dialog1" );
+		}
+	});
+	focusOn = "dialog2";
+	dialog2 = $( "#dialog2" ).dialog({
+		focus: function() {
+			equal( focusOn, "dialog2" );
+		}
+	});
+	order( 100, 101 );
+	focusOn = "dialog1";
+	dialog1.dialog( "moveToTop" );
+	order( 102, 101 );
+});
+
+test( "moveToTop: content scroll stays intact", function() {
+	expect( 2 );
+	var otherDialog = $( "#dialog1" ).dialog(),
+		scrollDialog = $( "#form-dialog" ).dialog({
+			height: 200
+		});
+	scrollDialog.scrollTop( 50 );
+	equal( scrollDialog.scrollTop(), 50 );
+
+	otherDialog.dialog( "moveToTop" );
+	equal( scrollDialog.scrollTop(), 50 );
+});
+
+test("open", function() {
+	expect( 3 );
+	var element,
+		expected = $("<div></div>").dialog(),
+		actual = expected.dialog("open");
+	equal(actual, expected, "open is chainable");
+
+	element = $("<div></div>").dialog({ autoOpen: false });
+	ok(element.dialog("widget").is(":hidden") && !element.dialog("widget").is(":visible"), "dialog hidden before open method called");
+	element.dialog("open");
+	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog visible after open method called");
+});
+
+// http://bugs.jqueryui.com/ticket/6137
+test("Ensure form elements don't reset when opening a dialog", function() {
+	expect(2);
+
+	var d1 = $("<form><input type='radio' name='radio' id='a' value='a' checked='checked'></input>" +
+				"<input type='radio' name='radio' id='b' value='b'>b</input></form>").appendTo( "body" ).dialog({autoOpen: false});
+
+	d1.find("#b").prop( "checked", true );
+	equal(d1.find("input:checked").val(), "b", "checkbox b is checked");
+
+	d1.dialog("open");
+	equal(d1.find("input:checked").val(), "b", "checkbox b is checked");
+
+	d1.remove();
+});
+
+asyncTest( "#8958: dialog can be opened while opening", function() {
+	expect( 1 );
+
+	var element = $( "<div>" ).dialog({
+		autoOpen: false,
+		modal: true,
+		open: function() {
+			equal( $( ".ui-widget-overlay" ).length, 1 );
+			start();
+		}
+	});
+
+	// Support: IE8
+	// For some reason the #favorite-color input doesn't get focus if we don't
+	// focus the body first, causing the test to hang.
+	$( "body" ).focus();
+
+	$( "#favorite-animal" )
+		// We focus the input to start the test. Once it receives focus, the
+		// dialog will open. Opening the dialog, will cause an element inside
+		// the dialog to gain focus, thus blurring the input.
+		.bind( "focus", function() {
+			element.dialog( "open" );
+		})
+		// When the input blurs, the dialog is in the process of opening. We
+		// try to open the dialog again, to make sure that dialogs properly
+		// handle a call to the open() method during the process of the dialog
+		// being opened.
+		.bind( "blur", function() {
+			element.dialog( "open" );
+		})
+		.focus();
+});
+
+test("#5531: dialog width should be at least minWidth on creation", function () {
+	expect( 4 );
+	var element = $("<div></div>").dialog({
+			width: 200,
+			minWidth: 300
+		});
+
+	equal(element.dialog("option", "width"), 300, "width is minWidth");
+	element.dialog("option", "width", 200);
+	equal(element.dialog("option", "width"), 300, "width unchanged when set to < minWidth");
+	element.dialog("option", "width", 320);
+	equal(element.dialog("option", "width"), 320, "width changed if set to > minWidth");
+	element.remove();
+
+	element = $("<div></div>").dialog({
+			minWidth: 300
+		});
+	ok(element.dialog("option", "width") >=  300, "width is at least 300");
+	element.remove();
+
+});
+
+} );
diff --git a/tests/unit/dialog/options.js b/tests/unit/dialog/options.js
new file mode 100644
index 000000000..c33a97c01
--- /dev/null
+++ b/tests/unit/dialog/options.js
@@ -0,0 +1,557 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/dialog",
+	"ui/effect-blind",
+	"ui/effect-explode"
+], function( $, testHelper ) {
+
+module("dialog: options");
+
+test( "appendTo", function() {
+	expect( 16 );
+	var detached = $( "<div>" ),
+		element = $( "#dialog1" ).dialog({
+			modal: true
+		});
+	equal( element.dialog( "widget" ).parent()[0], document.body, "defaults to body" );
+	equal( $( ".ui-widget-overlay" ).parent()[0], document.body, "overlay defaults to body" );
+	element.dialog( "destroy" );
+
+	element.dialog({
+		appendTo: ".wrap",
+		modal: true
+	});
+	equal( element.dialog( "widget" ).parent()[0], $( "#wrap1" )[0], "first found element" );
+	equal( $( ".ui-widget-overlay" ).parent()[0], $( "#wrap1" )[0], "overlay first found element" );
+	equal( $( "#wrap2 .ui-dialog" ).length, 0, "only appends to one element" );
+	equal( $( "#wrap2 .ui-widget-overlay" ).length, 0, "overlay only appends to one element" );
+	element.dialog( "destroy" );
+
+	element.dialog({
+		appendTo: null,
+		modal: true
+	});
+	equal( element.dialog( "widget" ).parent()[0], document.body, "null" );
+	equal( $( ".ui-widget-overlay" ).parent()[0], document.body, "overlay null" );
+	element.dialog( "destroy" );
+
+	element.dialog({
+		autoOpen: false,
+		modal: true
+	}).dialog( "option", "appendTo", "#wrap1" ).dialog( "open" );
+	equal( element.dialog( "widget" ).parent()[0], $( "#wrap1" )[0], "modified after init" );
+	equal( $( ".ui-widget-overlay" ).parent()[0], $( "#wrap1" )[0], "overlay modified after init" );
+	element.dialog( "destroy" );
+
+	element.dialog({
+		appendTo: detached,
+		modal: true
+	});
+	equal( element.dialog( "widget" ).parent()[0], detached[0], "detached jQuery object" );
+	equal( detached.find( ".ui-widget-overlay" ).parent()[0], detached[0], "overlay detached jQuery object" );
+	element.dialog( "destroy" );
+
+	element.dialog({
+		appendTo: detached[0],
+		modal: true
+	});
+	equal( element.dialog( "widget" ).parent()[0], detached[0], "detached DOM element" );
+	equal( detached.find( ".ui-widget-overlay" ).parent()[0], detached[0], "overlay detached DOM element" );
+	element.dialog( "destroy" );
+
+	element.dialog({
+		autoOpen: false,
+		modal: true
+	}).dialog( "option", "appendTo", detached );
+	equal( element.dialog( "widget" ).parent()[0], detached[0], "detached DOM element via option()" );
+	equal( detached.find( ".ui-widget-overlay" ).length, 0, "overlay detached DOM element via option()" );
+	element.dialog( "destroy" );
+});
+
+test("autoOpen", function() {
+	expect(2);
+
+	var element = $("<div></div>").dialog({ autoOpen: false });
+	ok( !element.dialog("widget").is(":visible"), ".dialog({ autoOpen: false })");
+	element.remove();
+
+	element = $("<div></div>").dialog({ autoOpen: true });
+	ok( element.dialog("widget").is(":visible"), ".dialog({ autoOpen: true })");
+	element.remove();
+});
+
+test("buttons", function( assert ) {
+	expect(21);
+
+	var btn, i, newButtons,
+		buttons = {
+			"Ok": function( ev ) {
+				ok(true, "button click fires callback");
+				equal(this, element[0], "context of callback");
+				equal(ev.target, btn[0], "event target");
+			},
+			"Cancel": function( ev ) {
+				ok(true, "button click fires callback");
+				equal(this, element[0], "context of callback");
+				equal(ev.target, btn[1], "event target");
+			}
+		},
+		element = $("<div></div>").dialog({ buttons: buttons });
+
+	btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
+	equal(btn.length, 2, "number of buttons");
+
+	i = 0;
+	$.each(buttons, function( key ) {
+		equal(btn.eq(i).text(), key, "text of button " + (i+1));
+		i++;
+	});
+
+	assert.hasClasses( btn.parent(), "ui-dialog-buttonset" );
+	assert.hasClasses( element.parent(), "ui-dialog-buttons" );
+
+	btn.trigger("click");
+
+	newButtons = {
+		"Close": function( ev ) {
+			ok(true, "button click fires callback");
+			equal(this, element[0], "context of callback");
+			equal(ev.target, btn[0], "event target");
+		}
+	};
+
+	deepEqual(element.dialog("option", "buttons"), buttons, ".dialog('option', 'buttons') getter");
+	element.dialog("option", "buttons", newButtons);
+	deepEqual(element.dialog("option", "buttons"), newButtons, ".dialog('option', 'buttons', ...) setter");
+
+	btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
+	equal(btn.length, 1, "number of buttons after setter");
+	btn.trigger("click");
+
+	i = 0;
+	$.each(newButtons, function( key ) {
+		equal(btn.eq(i).text(), key, "text of button " + (i+1));
+		i += 1;
+	});
+
+	element.dialog("option", "buttons", null);
+	btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
+	equal(btn.length, 0, "all buttons have been removed");
+	equal(element.find(".ui-dialog-buttonset").length, 0, "buttonset has been removed");
+	assert.lacksClasses( element.parent(), "ui-dialog-buttons" );
+	element.remove();
+});
+
+test("buttons - advanced", function( assert ) {
+	expect( 7 );
+
+	var buttons,
+		element = $("<div></div>").dialog({
+			buttons: [
+				{
+					text: "a button",
+					"class": "additional-class",
+					id: "my-button-id",
+					click: function() {
+						equal(this, element[0], "correct context");
+					},
+					icons: {
+						primary: "ui-icon-cancel"
+					},
+					showText: false
+				}
+			]
+		});
+
+	buttons = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
+	equal(buttons.length, 1, "correct number of buttons");
+	equal(buttons.attr("id"), "my-button-id", "correct id");
+	equal(buttons.text(), "a button", "correct label");
+	assert.hasClasses( buttons, "additional-class" );
+	deepEqual( buttons.button("option", "icons"), { primary: "ui-icon-cancel", secondary: null } );
+	equal( buttons.button( "option", "text" ), false );
+	buttons.click();
+
+	element.remove();
+});
+
+test("#9043: buttons with Array.prototype modification", function() {
+	expect( 1 );
+	Array.prototype.test = $.noop;
+	var element = $( "<div></div>" ).dialog();
+	equal( element.dialog( "widget" ).find( ".ui-dialog-buttonpane" ).length, 0,
+		"no button pane" );
+	element.remove();
+	delete Array.prototype.test;
+});
+
+test("closeOnEscape", function() {
+	expect( 6 );
+	var element = $("<div></div>").dialog({ closeOnEscape: false });
+	ok(true, "closeOnEscape: false");
+	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog is open before ESC");
+	element.simulate("keydown", { keyCode: $.ui.keyCode.ESCAPE })
+		.simulate("keypress", { keyCode: $.ui.keyCode.ESCAPE })
+		.simulate("keyup", { keyCode: $.ui.keyCode.ESCAPE });
+	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog is open after ESC");
+
+	element.remove();
+
+	element = $("<div></div>").dialog({ closeOnEscape: true });
+	ok(true, "closeOnEscape: true");
+	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog is open before ESC");
+	element.simulate("keydown", { keyCode: $.ui.keyCode.ESCAPE })
+		.simulate("keypress", { keyCode: $.ui.keyCode.ESCAPE })
+		.simulate("keyup", { keyCode: $.ui.keyCode.ESCAPE });
+	ok(element.dialog("widget").is(":hidden") && !element.dialog("widget").is(":visible"), "dialog is closed after ESC");
+});
+
+test("closeText", function() {
+	expect(3);
+
+	var element = $("<div></div>").dialog();
+		equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "Close",
+			"default close text");
+	element.remove();
+
+	element = $("<div></div>").dialog({ closeText: "foo" });
+		equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "foo",
+			"closeText on init");
+	element.remove();
+
+	element = $("<div></div>").dialog().dialog("option", "closeText", "bar");
+		equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "bar",
+			"closeText via option method");
+	element.remove();
+});
+
+test("draggable", function() {
+	expect(4);
+
+	var element = $("<div></div>").dialog({ draggable: false });
+
+		testHelper.testDrag(element, 50, -50, 0, 0);
+		element.dialog("option", "draggable", true);
+		testHelper.testDrag(element, 50, -50, 50, -50);
+	element.remove();
+
+	element = $("<div></div>").dialog({ draggable: true });
+		testHelper.testDrag(element, 50, -50, 50, -50);
+		element.dialog("option", "draggable", false);
+		testHelper.testDrag(element, 50, -50, 0, 0);
+	element.remove();
+});
+
+test("height", function() {
+	expect(4);
+
+	var element = $("<div></div>").dialog();
+		equal(element.dialog("widget").outerHeight(), 150, "default height");
+	element.remove();
+
+	element = $("<div></div>").dialog({ height: 237 });
+		equal(element.dialog("widget").outerHeight(), 237, "explicit height");
+	element.remove();
+
+	element = $("<div></div>").dialog();
+		element.dialog("option", "height", 238);
+		equal(element.dialog("widget").outerHeight(), 238, "explicit height set after init");
+	element.remove();
+
+	element = $("<div></div>").css("padding", "20px")
+		.dialog({ height: 240 });
+		equal(element.dialog("widget").outerHeight(), 240, "explicit height with padding");
+	element.remove();
+});
+
+test("maxHeight", function( assert ) {
+	expect(3);
+
+	var element = $("<div></div>").dialog({ maxHeight: 200 });
+		testHelper.drag(element, ".ui-resizable-s", 1000, 1000);
+		assert.close(element.dialog("widget").height(), 200, 1, "maxHeight");
+	element.remove();
+
+	element = $("<div></div>").dialog({ maxHeight: 200 });
+		testHelper.drag(element, ".ui-resizable-n", -1000, -1000);
+		assert.close(element.dialog("widget").height(), 200, 1, "maxHeight");
+	element.remove();
+
+	element = $("<div></div>").dialog({ maxHeight: 200 }).dialog("option", "maxHeight", 300);
+		testHelper.drag(element, ".ui-resizable-s", 1000, 1000);
+		assert.close(element.dialog("widget").height(), 300, 1, "maxHeight");
+	element.remove();
+});
+
+test("maxWidth", function( assert ) {
+	expect(3);
+
+	var element = $("<div></div>").dialog({ maxWidth: 200 });
+		testHelper.drag(element, ".ui-resizable-e", 1000, 1000);
+		assert.close(element.dialog("widget").width(), 200, 1, "maxWidth");
+	element.remove();
+
+	element = $("<div></div>").dialog({ maxWidth: 200 });
+		testHelper.drag(element, ".ui-resizable-w", -1000, -1000);
+		assert.close(element.dialog("widget").width(), 200, 1, "maxWidth");
+	element.remove();
+
+	element = $("<div></div>").dialog({ maxWidth: 200 }).dialog("option", "maxWidth", 300);
+		testHelper.drag(element, ".ui-resizable-w", -1000, -1000);
+		assert.close(element.dialog("widget").width(), 300, 1, "maxWidth");
+	element.remove();
+});
+
+test("minHeight", function( assert ) {
+	expect(3);
+
+	var element = $("<div></div>").dialog({ minHeight: 10 });
+		testHelper.drag(element, ".ui-resizable-s", -1000, -1000);
+		assert.close(element.dialog("widget").height(), 10, 1, "minHeight");
+	element.remove();
+
+	element = $("<div></div>").dialog({ minHeight: 10 });
+		testHelper.drag(element, ".ui-resizable-n", 1000, 1000);
+		assert.close(element.dialog("widget").height(), 10, 1, "minHeight");
+	element.remove();
+
+	element = $("<div></div>").dialog({ minHeight: 10 }).dialog("option", "minHeight", 30);
+		testHelper.drag(element, ".ui-resizable-n", 1000, 1000);
+		assert.close(element.dialog("widget").height(), 30, 1, "minHeight");
+	element.remove();
+});
+
+test("minWidth", function( assert ) {
+	expect(3);
+
+	var element = $("<div></div>").dialog({ minWidth: 10 });
+		testHelper.drag(element, ".ui-resizable-e", -1000, -1000);
+		assert.close(element.dialog("widget").width(), 10, 1, "minWidth");
+	element.remove();
+
+	element = $("<div></div>").dialog({ minWidth: 10 });
+		testHelper.drag(element, ".ui-resizable-w", 1000, 1000);
+		assert.close(element.dialog("widget").width(), 10, 1, "minWidth");
+	element.remove();
+
+	element = $("<div></div>").dialog({ minWidth: 30 }).dialog("option", "minWidth", 30);
+		testHelper.drag(element, ".ui-resizable-w", 1000, 1000);
+		assert.close(element.dialog("widget").width(), 30, 1, "minWidth");
+	element.remove();
+});
+
+test( "position, default center on window", function( assert ) {
+	expect( 2 );
+
+	// dialogs alter the window width and height in Firefox
+	// so we collect that information before creating the dialog
+	// Support: Firefox
+	var winWidth = $( window ).width(),
+		winHeight = $( window ).height(),
+		element = $("<div></div>").dialog(),
+		dialog = element.dialog("widget"),
+		offset = dialog.offset();
+	assert.close( offset.left, Math.round( winWidth / 2 - dialog.outerWidth() / 2 ) + $( window ).scrollLeft(), 1, "dialog left position of center on window on initilization" );
+	assert.close( offset.top, Math.round( winHeight / 2 - dialog.outerHeight() / 2 ) + $( window ).scrollTop(), 1, "dialog top position of center on window on initilization" );
+	element.remove();
+});
+
+test( "position, right bottom at right bottom via ui.position args", function( assert ) {
+	expect( 2 );
+
+	// dialogs alter the window width and height in Firefox
+	// so we collect that information before creating the dialog
+	// Support: Firefox
+	var winWidth = $( window ).width(),
+		winHeight = $( window ).height(),
+		element = $("<div></div>").dialog({
+			position: {
+				my: "right bottom",
+				at: "right bottom"
+			}
+		}),
+		dialog = element.dialog("widget"),
+		offset = dialog.offset();
+
+	assert.close( offset.left, winWidth - dialog.outerWidth() + $( window ).scrollLeft(), 1, "dialog left position of right bottom at right bottom on initilization" );
+	assert.close( offset.top, winHeight - dialog.outerHeight() + $( window ).scrollTop(), 1, "dialog top position of right bottom at right bottom on initilization" );
+	element.remove();
+});
+
+test( "position, at another element", function( assert ) {
+	expect( 4 );
+	var parent = $("<div></div>").css({
+			position: "absolute",
+			top: 400,
+			left: 600,
+			height: 10,
+			width: 10
+		}).appendTo("body"),
+
+		element = $("<div></div>").dialog({
+			position: {
+				my: "left top",
+				at: "left top",
+				of: parent,
+				collision: "none"
+			}
+		}),
+
+		dialog = element.dialog("widget"),
+		offset = dialog.offset();
+
+	assert.close( offset.left, 600, 1, "dialog left position at another element on initilization" );
+	assert.close( offset.top, 400, 1, "dialog top position at another element on initilization" );
+
+	element.dialog("option", "position", {
+			my: "left top",
+			at: "right bottom",
+			of: parent,
+			collision: "none"
+	});
+
+	offset = dialog.offset();
+
+	assert.close( offset.left, 610, 1, "dialog left position at another element via setting option" );
+	assert.close( offset.top, 410, 1, "dialog top position at another element via setting option" );
+
+	element.remove();
+	parent.remove();
+});
+
+test("resizable", function() {
+	expect(4);
+
+	var element = $("<div></div>").dialog();
+		testHelper.shouldResize(element, 50, 50, "[default]");
+		element.dialog("option", "resizable", false);
+		testHelper.shouldResize(element, 0, 0, "disabled after init");
+	element.remove();
+
+	element = $("<div></div>").dialog({ resizable: false });
+		testHelper.shouldResize(element, 0, 0, "disabled in init options");
+		element.dialog("option", "resizable", true);
+		testHelper.shouldResize(element, 50, 50, "enabled after init");
+	element.remove();
+});
+
+test( "title", function() {
+	expect( 11 );
+
+	function titleText() {
+		return element.dialog("widget").find( ".ui-dialog-title" ).html();
+	}
+
+	var element = $( "<div></div>" ).dialog();
+		// some browsers return a non-breaking space and some return "&nbsp;"
+		// so we generate a non-breaking space for comparison
+		equal( titleText(), $( "<span>&#160;</span>" ).html(), "[default]" );
+		equal( element.dialog( "option", "title" ), null, "option not changed" );
+	element.remove();
+
+	element = $( "<div title='foo'>" ).dialog();
+		equal( titleText(), "foo", "title in element attribute" );
+		equal( element.dialog( "option", "title"), "foo", "option updated from attribute" );
+	element.remove();
+
+	element = $( "<div></div>" ).dialog({ title: "foo" });
+		equal( titleText(), "foo", "title in init options" );
+		equal( element.dialog("option", "title"), "foo", "opiton set from options hash" );
+	element.remove();
+
+	element = $( "<div title='foo'>" ).dialog({ title: "bar" });
+		equal( titleText(), "bar", "title in init options should override title in element attribute" );
+		equal( element.dialog("option", "title"), "bar", "opiton set from options hash" );
+	element.remove();
+
+	element = $( "<div></div>" ).dialog().dialog( "option", "title", "foo" );
+		equal( titleText(), "foo", "title after init" );
+	element.remove();
+
+	// make sure attroperties are properly ignored - #5742 - .attr() might return a DOMElement
+	element = $( "<form><input name='title'></form>" ).dialog();
+		// some browsers return a non-breaking space and some return "&nbsp;"
+		// so we get the text to normalize to the actual non-breaking space
+		equal( titleText(), $( "<span>&#160;</span>" ).html(), "[default]" );
+		equal( element.dialog( "option", "title" ), null, "option not changed" );
+	element.remove();
+});
+
+test("width", function( assert ) {
+	expect(3);
+
+	var element = $("<div></div>").dialog();
+		assert.close(element.dialog("widget").width(), 300, 1, "default width");
+	element.remove();
+
+	element = $("<div></div>").dialog({width: 437 });
+		assert.close(element.dialog("widget").width(), 437, 1, "explicit width");
+		element.dialog("option", "width", 438);
+		assert.close(element.dialog("widget").width(), 438, 1, "explicit width after init");
+	element.remove();
+});
+
+test("#4826: setting resizable false toggles resizable on dialog", function() {
+	expect(6);
+	var i,
+		element = $("<div></div>").dialog({ resizable: false });
+
+	testHelper.shouldResize(element, 0, 0, "[default]");
+	for (i=0; i<2; i++) {
+		element.dialog("close").dialog("open");
+		testHelper.shouldResize(element, 0, 0, "initialized with resizable false toggle ("+ (i+1) +")");
+	}
+	element.remove();
+
+	element = $("<div></div>").dialog({ resizable: true });
+	testHelper.shouldResize(element, 50, 50, "[default]");
+	for (i=0; i<2; i++) {
+		element.dialog("close").dialog("option", "resizable", false).dialog("open");
+		testHelper.shouldResize(element, 0, 0, "set option resizable false toggle ("+ (i+1) +")");
+	}
+	element.remove();
+
+});
+
+asyncTest( "#8051 - 'Explode' dialog animation causes crash in IE 6, 7 and 8", function() {
+	expect( 1 );
+	var element = $( "<div></div>" ).dialog({
+		show: "explode",
+		focus: function() {
+			ok( true, "dialog opened with animation" );
+			element.remove();
+			start();
+		}
+	});
+});
+
+asyncTest( "#4421 - Focus lost from dialog which uses show-effect", function() {
+	expect( 1 );
+	var element = $( "<div></div>" ).dialog({
+		show: "blind",
+		focus: function() {
+			equal( element.dialog( "widget" ).find( document.activeElement ).length, 1, "dialog maintains focus" );
+			element.remove();
+			start();
+		}
+	});
+});
+
+asyncTest( "Open followed by close during show effect", function() {
+	expect( 1 );
+	var element = $( "<div></div>" ).dialog({
+		show: "blind",
+		close: function() {
+			ok( true, "dialog closed properly during animation" );
+			element.remove();
+			start();
+		}
+	});
+
+	setTimeout( function() {
+		element.dialog("close");
+	}, 100 );
+});
+
+} );
diff --git a/tests/unit/draggable/common.js b/tests/unit/draggable/common.js
new file mode 100644
index 000000000..7ae032c0f
--- /dev/null
+++ b/tests/unit/draggable/common.js
@@ -0,0 +1,48 @@
+define( [
+	"lib/common",
+	"ui/draggable"
+], function( common ) {
+
+common.testWidget( "draggable", {
+	defaults: {
+		appendTo: "parent",
+		axis: false,
+		cancel: "input, textarea, button, select, option",
+		classes: {},
+		connectToSortable: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		disabled: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		opacity: false,
+		refreshPositions: false,
+		revert: false,
+		revertDuration: 500,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		snap: false,
+		snapMode: "both",
+		snapTolerance: 20,
+		stack: false,
+		zIndex: false,
+
+		//todo: remove the following option checks when interactions are rewritten:
+		addClasses: true,
+		delay: 0,
+		distance: 1,
+		iframeFix: false,
+
+		// callbacks
+		create: null,
+		drag: null,
+		start: null,
+		stop: null
+	}
+});
+
+} );
diff --git a/tests/unit/draggable/core.js b/tests/unit/draggable/core.js
new file mode 100644
index 000000000..6e12b3521
--- /dev/null
+++ b/tests/unit/draggable/core.js
@@ -0,0 +1,346 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/draggable",
+	"ui/droppable",
+	"ui/resizable"
+], function( $, testHelper ) {
+
+module( "draggable: core" );
+
+test( "element types", function( assert ) {
+	var typeNames = (
+			"p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form" +
+			",table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr" +
+			",acronym,code,samp,kbd,var,img,hr" +
+			",input,button,label,select,iframe"
+		).split(",");
+
+	expect( typeNames.length * 2 );
+
+	$.each( typeNames, function( i ) {
+		var offsetBefore, offsetAfter,
+			typeName = typeNames[ i ],
+			el = $( document.createElement( typeName ) ).appendTo("#qunit-fixture");
+
+		if ( typeName === "table" ) {
+			el.append("<tr><td>content</td></tr>");
+		}
+
+		el.draggable({ cancel: "" });
+		offsetBefore = el.offset();
+		el.simulate( "drag", {
+			dx: 50,
+			dy: 50
+		});
+		offsetAfter = el.offset();
+
+		// Support: FF, Chrome, and IE9,
+		// there are some rounding errors in so we can't say equal, we have to settle for close enough
+		assert.close( offsetBefore.left, offsetAfter.left - 50, 1, "dragged[50, 50] " + "<" + typeName + "> left" );
+		assert.close( offsetBefore.top, offsetAfter.top - 50, 1, "dragged[50, 50] " + "<" + typeName + "> top" );
+		el.draggable("destroy");
+		el.remove();
+	});
+});
+
+test( "No options, relative", function() {
+	expect( 2 );
+	testHelper.shouldMove( $( "#draggable1" ).draggable(), "no options, relative" );
+});
+
+test( "No options, absolute", function() {
+	expect( 2 );
+	testHelper.shouldMove( $( "#draggable2" ).draggable(), "no options, absolute" );
+});
+
+test( "resizable handle with complex markup (#8756 / #8757)", function() {
+	expect( 2 );
+
+	$( "#draggable1" )
+		.append(
+			$("<div>")
+				.addClass("ui-resizable-handle ui-resizable-w")
+				.append( $("<div>") )
+		);
+
+	var handle = $(".ui-resizable-w div"),
+		target = $( "#draggable1" ).draggable().resizable({ handles: "all" });
+
+	// todo: fix resizable so it doesn't require a mouseover
+	handle.simulate("mouseover").simulate( "drag", { dx: -50 } );
+	equal( target.width(), 250, "compare width" );
+
+	// todo: fix resizable so it doesn't require a mouseover
+	handle.simulate("mouseover").simulate( "drag", { dx: 50 } );
+	equal( target.width(), 200, "compare width" );
+});
+
+test( "#8269: Removing draggable element on drop", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).wrap( "<div id='wrapper' />" ).draggable({
+			stop: function() {
+				ok( true, "stop still called despite element being removed from DOM on drop" );
+			}
+		}),
+		dropOffset = $( "#droppable" ).offset();
+
+	$( "#droppable" ).droppable({
+		drop: function() {
+			$( "#wrapper" ).remove();
+			ok( true, "element removed from DOM on drop" );
+		}
+	});
+
+	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
+	if ( testHelper.unreliableContains ) {
+		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
+		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
+	} else {
+		element.simulate( "drag", {
+			handle: "corner",
+			x: dropOffset.left,
+			y: dropOffset.top
+		});
+	}
+});
+
+// http://bugs.jqueryui.com/ticket/7778
+// drag element breaks in IE8 when its content is replaced onmousedown
+test( "Stray mousemove after mousedown still drags", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).draggable({ scroll: false });
+
+	// In IE8, when content is placed under the mouse (e.g. when draggable content is replaced
+	// on mousedown), mousemove is triggered on those elements even though the mouse hasn't moved.
+	// Support: IE <9
+	element.bind( "mousedown", function() {
+		$( document ).simulate( "mousemove", { button: -1 });
+	});
+
+	testHelper.shouldMove( element, "element is draggable" );
+});
+
+test( "#6258: not following mouse when scrolled and using overflow-y: scroll", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).draggable({
+			stop: function( event, ui ) {
+				equal( ui.position.left, 1, "left position is correct despite overflow on HTML" );
+				equal( ui.position.top, 1, "top position is correct despite overflow on HTML" );
+				$( "html" )
+					.css( "overflow-y", oldOverflowY )
+					.css( "overflow-x", oldOverflowX )
+					.scrollTop( 0 )
+					.scrollLeft( 0 );
+			}
+		}),
+		oldOverflowY = $( "html" ).css( "overflow-y" ),
+		oldOverflowX = $( "html" ).css( "overflow-x" );
+
+		testHelper.forceScrollableWindow();
+
+		$( "html" )
+			.css( "overflow-y", "scroll" )
+			.css( "overflow-x", "scroll" )
+			.scrollTop( 300 )
+			.scrollLeft( 300 );
+
+		element.simulate( "drag", {
+			dx: 1,
+			dy: 1,
+			moves: 1
+		});
+});
+
+test( "#9315: jumps down with offset of scrollbar", function() {
+	expect( 2 );
+
+	var element = $( "#draggable2" ).draggable({
+			stop: function( event, ui ) {
+				equal( ui.position.left, 11, "left position is correct when position is absolute" );
+				equal( ui.position.top, 11, "top position is correct when position is absolute" );
+				$( "html" ).scrollTop( 0 ).scrollLeft( 0 );
+			}
+		});
+
+		testHelper.forceScrollableWindow();
+
+		$( "html" ).scrollTop( 300 ).scrollLeft( 300 );
+
+		element.simulate( "drag", {
+			dx: 1,
+			dy: 1,
+			moves: 1
+		});
+});
+
+test( "scroll offset with fixed ancestors", function() {
+	expect( 2 );
+
+	var startValue = 300,
+		element = $( "#draggable1" )
+			// http://bugs.jqueryui.com/ticket/5009
+			// scroll not working with parent's position fixed
+			.wrap( "<div id='wrapper' />" )
+			// http://bugs.jqueryui.com/ticket/9612
+			// abspos elements inside of fixed elements moving away from the mouse when scrolling
+			.wrap( "<div id='wrapper2' />" )
+			.draggable({
+				drag: function() {
+					startValue += 100;
+					$( document ).scrollTop( startValue ).scrollLeft( startValue );
+				},
+				stop: function( event, ui ) {
+					equal( ui.position.left, 10, "left position is correct when parent position is fixed" );
+					equal( ui.position.top, 10, "top position is correct when parent position is fixed" );
+					$( document ).scrollTop( 0 ).scrollLeft( 0 );
+				}
+			});
+
+	testHelper.forceScrollableWindow();
+
+	$( "#wrapper" ).css( "position", "fixed" );
+	$( "#wrapper2" ).css( "position", "absolute" );
+
+	element.simulate( "drag", {
+		dx: 10,
+		dy: 10,
+		moves: 3
+	});
+});
+
+$( [ "hidden", "auto", "scroll" ] ).each(function() {
+	var overflow = this;
+
+	// http://bugs.jqueryui.com/ticket/9379 - position bug in scrollable div
+	// http://bugs.jqueryui.com/ticket/10147 - Wrong position in a parent with "overflow: hidden"
+	test( "position in scrollable parent with overflow: " + overflow, function() {
+		expect( 2 );
+
+		$( "#qunit-fixture" ).html( "<div id='outer'><div id='inner'></div><div id='dragged'>a</div></div>" );
+		$( "#inner" ).css({ position: "absolute", width: "500px", height: "500px" });
+		$( "#outer" ).css({ position: "absolute", width: "300px", height: "300px" });
+		$( "#dragged" ).css({ width: "10px", height: "10px" });
+
+		var moves = 3,
+			startValue = 0,
+			dragDelta = 20,
+			delta = 100,
+
+			// we scroll after each drag event, so subtract 1 from number of moves for expected
+			expected = delta + ( ( moves - 1 ) * dragDelta ),
+			element = $( "#dragged" ).draggable({
+				drag: function() {
+					startValue += dragDelta;
+					$( "#outer" ).scrollTop( startValue ).scrollLeft( startValue );
+				},
+				stop: function( event, ui ) {
+					equal( ui.position.left, expected, "left position is correct when grandparent is scrolled" );
+					equal( ui.position.top, expected, "top position is correct when grandparent is scrolled" );
+				}
+			});
+
+		$( "#outer" ).css( "overflow", overflow );
+
+		element.simulate( "drag", {
+			dy: delta,
+			dx: delta,
+			moves: moves
+		});
+	});
+});
+
+test( "#5727: draggable from iframe", function() {
+	expect( 1 );
+
+	var iframeBody, draggable1,
+		iframe = $( "<iframe />" ).appendTo( "#qunit-fixture" ),
+		iframeDoc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document;
+
+	iframeDoc.write( "<!doctype html><html><body>" );
+	iframeDoc.close();
+
+	iframeBody = $( iframeDoc.body ).append( "<div style='width: 2px; height: 2px;' />" );
+	draggable1 = iframeBody.find( "div" );
+
+	draggable1.draggable();
+
+	equal( draggable1.closest( iframeBody ).length, 1 );
+
+	// TODO: fix draggable within an IFRAME to fire events on the element properly
+	// and these testHelper.shouldMove relies on events for testing
+	//testHelper.shouldMove( draggable1, "draggable from an iframe" );
+});
+
+test( "#8399: A draggable should become the active element after you are finished interacting with it, but not before.", function() {
+	expect( 2 );
+
+	var element = $( "<a href='#'>link</a>" ).appendTo( "#qunit-fixture" ).draggable();
+
+	$( document ).one( "mousemove", function() {
+		notStrictEqual( document.activeElement, element.get( 0 ), "moving a draggable anchor did not make it the active element" );
+	});
+
+	testHelper.move( element, 50, 50 );
+
+	strictEqual( document.activeElement, element.get( 0 ), "finishing moving a draggable anchor made it the active element" );
+});
+
+asyncTest( "blur behavior", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).draggable(),
+		focusElement = $( "<div tabindex='1'></div>" ).appendTo( element );
+
+	testHelper.onFocus( focusElement, function() {
+		strictEqual( document.activeElement, focusElement.get( 0 ), "test element is focused before mousing down on a draggable" );
+
+		testHelper.move( focusElement, 1, 1 );
+
+		// http://bugs.jqueryui.com/ticket/10527
+		// Draggable: Can't select option in modal dialog (IE8)
+		strictEqual( document.activeElement, focusElement.get( 0 ), "test element is focused after mousing down on itself" );
+
+		testHelper.move( element, 50, 50 );
+
+		// http://bugs.jqueryui.com/ticket/4261
+		// active element should blur when mousing down on a draggable
+		notStrictEqual( document.activeElement, focusElement.get( 0 ), "test element is no longer focused after mousing down on a draggable" );
+		start();
+	});
+});
+
+test( "ui-draggable-handle assigned to appropriate element", function( assert ) {
+	expect( 5 );
+
+	var p = $( "<p>" ).appendTo( "#qunit-fixture" ),
+		element = $( "<div><p></p></div>" ).appendTo( "#qunit-fixture" ).draggable();
+	assert.hasClasses( element, "ui-draggable-handle" );
+
+	element.draggable( "option", "handle", "p" );
+	assert.lacksClasses( element, "ui-draggable-handle" );
+	assert.hasClasses( element.find( "p" ), "ui-draggable-handle",
+		"ensure handle class name is constrained within the draggble (#10212)" );
+	assert.lacksClasses( p, "ui-draggable-handle" );
+
+	element.draggable( "destroy" );
+	assert.lacksClasses( element.find( "p" ), "ui-draggable-handle" );
+});
+
+test( "ui-draggable-handle managed correctly in nested draggables", function( assert ) {
+	expect( 4 );
+	var parent = $( "<div><div></div></div>" ).draggable().appendTo( "#qunit-fixture" ),
+		child = parent.find( "div" ).draggable();
+
+	assert.hasClasses( parent, "ui-draggable-handle", "parent has class name on init" );
+	assert.hasClasses( child, "ui-draggable-handle", "child has class name on init" );
+
+	parent.draggable( "destroy" );
+	assert.lacksClasses( parent, "ui-draggable-handle", "parent loses class name on destroy" );
+	assert.hasClasses( child, "ui-draggable-handle", "child retains class name on destroy" );
+});
+
+} );
diff --git a/tests/unit/draggable/draggable_common.js b/tests/unit/draggable/draggable_common.js
deleted file mode 100644
index 7ae032c0f..000000000
--- a/tests/unit/draggable/draggable_common.js
+++ /dev/null
@@ -1,48 +0,0 @@
-define( [
-	"lib/common",
-	"ui/draggable"
-], function( common ) {
-
-common.testWidget( "draggable", {
-	defaults: {
-		appendTo: "parent",
-		axis: false,
-		cancel: "input, textarea, button, select, option",
-		classes: {},
-		connectToSortable: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		disabled: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		opacity: false,
-		refreshPositions: false,
-		revert: false,
-		revertDuration: 500,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		snap: false,
-		snapMode: "both",
-		snapTolerance: 20,
-		stack: false,
-		zIndex: false,
-
-		//todo: remove the following option checks when interactions are rewritten:
-		addClasses: true,
-		delay: 0,
-		distance: 1,
-		iframeFix: false,
-
-		// callbacks
-		create: null,
-		drag: null,
-		start: null,
-		stop: null
-	}
-});
-
-} );
diff --git a/tests/unit/draggable/draggable_core.js b/tests/unit/draggable/draggable_core.js
deleted file mode 100644
index 6f6dc1a14..000000000
--- a/tests/unit/draggable/draggable_core.js
+++ /dev/null
@@ -1,346 +0,0 @@
-define( [
-	"jquery",
-	"./draggable_test_helpers",
-	"ui/draggable",
-	"ui/droppable",
-	"ui/resizable"
-], function( $, testHelper ) {
-
-module( "draggable: core" );
-
-test( "element types", function( assert ) {
-	var typeNames = (
-			"p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form" +
-			",table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr" +
-			",acronym,code,samp,kbd,var,img,hr" +
-			",input,button,label,select,iframe"
-		).split(",");
-
-	expect( typeNames.length * 2 );
-
-	$.each( typeNames, function( i ) {
-		var offsetBefore, offsetAfter,
-			typeName = typeNames[ i ],
-			el = $( document.createElement( typeName ) ).appendTo("#qunit-fixture");
-
-		if ( typeName === "table" ) {
-			el.append("<tr><td>content</td></tr>");
-		}
-
-		el.draggable({ cancel: "" });
-		offsetBefore = el.offset();
-		el.simulate( "drag", {
-			dx: 50,
-			dy: 50
-		});
-		offsetAfter = el.offset();
-
-		// Support: FF, Chrome, and IE9,
-		// there are some rounding errors in so we can't say equal, we have to settle for close enough
-		assert.close( offsetBefore.left, offsetAfter.left - 50, 1, "dragged[50, 50] " + "<" + typeName + "> left" );
-		assert.close( offsetBefore.top, offsetAfter.top - 50, 1, "dragged[50, 50] " + "<" + typeName + "> top" );
-		el.draggable("destroy");
-		el.remove();
-	});
-});
-
-test( "No options, relative", function() {
-	expect( 2 );
-	testHelper.shouldMove( $( "#draggable1" ).draggable(), "no options, relative" );
-});
-
-test( "No options, absolute", function() {
-	expect( 2 );
-	testHelper.shouldMove( $( "#draggable2" ).draggable(), "no options, absolute" );
-});
-
-test( "resizable handle with complex markup (#8756 / #8757)", function() {
-	expect( 2 );
-
-	$( "#draggable1" )
-		.append(
-			$("<div>")
-				.addClass("ui-resizable-handle ui-resizable-w")
-				.append( $("<div>") )
-		);
-
-	var handle = $(".ui-resizable-w div"),
-		target = $( "#draggable1" ).draggable().resizable({ handles: "all" });
-
-	// todo: fix resizable so it doesn't require a mouseover
-	handle.simulate("mouseover").simulate( "drag", { dx: -50 } );
-	equal( target.width(), 250, "compare width" );
-
-	// todo: fix resizable so it doesn't require a mouseover
-	handle.simulate("mouseover").simulate( "drag", { dx: 50 } );
-	equal( target.width(), 200, "compare width" );
-});
-
-test( "#8269: Removing draggable element on drop", function() {
-	expect( 2 );
-
-	var element = $( "#draggable1" ).wrap( "<div id='wrapper' />" ).draggable({
-			stop: function() {
-				ok( true, "stop still called despite element being removed from DOM on drop" );
-			}
-		}),
-		dropOffset = $( "#droppable" ).offset();
-
-	$( "#droppable" ).droppable({
-		drop: function() {
-			$( "#wrapper" ).remove();
-			ok( true, "element removed from DOM on drop" );
-		}
-	});
-
-	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
-	if ( testHelper.unreliableContains ) {
-		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
-		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
-	} else {
-		element.simulate( "drag", {
-			handle: "corner",
-			x: dropOffset.left,
-			y: dropOffset.top
-		});
-	}
-});
-
-// http://bugs.jqueryui.com/ticket/7778
-// drag element breaks in IE8 when its content is replaced onmousedown
-test( "Stray mousemove after mousedown still drags", function() {
-	expect( 2 );
-
-	var element = $( "#draggable1" ).draggable({ scroll: false });
-
-	// In IE8, when content is placed under the mouse (e.g. when draggable content is replaced
-	// on mousedown), mousemove is triggered on those elements even though the mouse hasn't moved.
-	// Support: IE <9
-	element.bind( "mousedown", function() {
-		$( document ).simulate( "mousemove", { button: -1 });
-	});
-
-	testHelper.shouldMove( element, "element is draggable" );
-});
-
-test( "#6258: not following mouse when scrolled and using overflow-y: scroll", function() {
-	expect( 2 );
-
-	var element = $( "#draggable1" ).draggable({
-			stop: function( event, ui ) {
-				equal( ui.position.left, 1, "left position is correct despite overflow on HTML" );
-				equal( ui.position.top, 1, "top position is correct despite overflow on HTML" );
-				$( "html" )
-					.css( "overflow-y", oldOverflowY )
-					.css( "overflow-x", oldOverflowX )
-					.scrollTop( 0 )
-					.scrollLeft( 0 );
-			}
-		}),
-		oldOverflowY = $( "html" ).css( "overflow-y" ),
-		oldOverflowX = $( "html" ).css( "overflow-x" );
-
-		testHelper.forceScrollableWindow();
-
-		$( "html" )
-			.css( "overflow-y", "scroll" )
-			.css( "overflow-x", "scroll" )
-			.scrollTop( 300 )
-			.scrollLeft( 300 );
-
-		element.simulate( "drag", {
-			dx: 1,
-			dy: 1,
-			moves: 1
-		});
-});
-
-test( "#9315: jumps down with offset of scrollbar", function() {
-	expect( 2 );
-
-	var element = $( "#draggable2" ).draggable({
-			stop: function( event, ui ) {
-				equal( ui.position.left, 11, "left position is correct when position is absolute" );
-				equal( ui.position.top, 11, "top position is correct when position is absolute" );
-				$( "html" ).scrollTop( 0 ).scrollLeft( 0 );
-			}
-		});
-
-		testHelper.forceScrollableWindow();
-
-		$( "html" ).scrollTop( 300 ).scrollLeft( 300 );
-
-		element.simulate( "drag", {
-			dx: 1,
-			dy: 1,
-			moves: 1
-		});
-});
-
-test( "scroll offset with fixed ancestors", function() {
-	expect( 2 );
-
-	var startValue = 300,
-		element = $( "#draggable1" )
-			// http://bugs.jqueryui.com/ticket/5009
-			// scroll not working with parent's position fixed
-			.wrap( "<div id='wrapper' />" )
-			// http://bugs.jqueryui.com/ticket/9612
-			// abspos elements inside of fixed elements moving away from the mouse when scrolling
-			.wrap( "<div id='wrapper2' />" )
-			.draggable({
-				drag: function() {
-					startValue += 100;
-					$( document ).scrollTop( startValue ).scrollLeft( startValue );
-				},
-				stop: function( event, ui ) {
-					equal( ui.position.left, 10, "left position is correct when parent position is fixed" );
-					equal( ui.position.top, 10, "top position is correct when parent position is fixed" );
-					$( document ).scrollTop( 0 ).scrollLeft( 0 );
-				}
-			});
-
-	testHelper.forceScrollableWindow();
-
-	$( "#wrapper" ).css( "position", "fixed" );
-	$( "#wrapper2" ).css( "position", "absolute" );
-
-	element.simulate( "drag", {
-		dx: 10,
-		dy: 10,
-		moves: 3
-	});
-});
-
-$( [ "hidden", "auto", "scroll" ] ).each(function() {
-	var overflow = this;
-
-	// http://bugs.jqueryui.com/ticket/9379 - position bug in scrollable div
-	// http://bugs.jqueryui.com/ticket/10147 - Wrong position in a parent with "overflow: hidden"
-	test( "position in scrollable parent with overflow: " + overflow, function() {
-		expect( 2 );
-
-		$( "#qunit-fixture" ).html( "<div id='outer'><div id='inner'></div><div id='dragged'>a</div></div>" );
-		$( "#inner" ).css({ position: "absolute", width: "500px", height: "500px" });
-		$( "#outer" ).css({ position: "absolute", width: "300px", height: "300px" });
-		$( "#dragged" ).css({ width: "10px", height: "10px" });
-
-		var moves = 3,
-			startValue = 0,
-			dragDelta = 20,
-			delta = 100,
-
-			// we scroll after each drag event, so subtract 1 from number of moves for expected
-			expected = delta + ( ( moves - 1 ) * dragDelta ),
-			element = $( "#dragged" ).draggable({
-				drag: function() {
-					startValue += dragDelta;
-					$( "#outer" ).scrollTop( startValue ).scrollLeft( startValue );
-				},
-				stop: function( event, ui ) {
-					equal( ui.position.left, expected, "left position is correct when grandparent is scrolled" );
-					equal( ui.position.top, expected, "top position is correct when grandparent is scrolled" );
-				}
-			});
-
-		$( "#outer" ).css( "overflow", overflow );
-
-		element.simulate( "drag", {
-			dy: delta,
-			dx: delta,
-			moves: moves
-		});
-	});
-});
-
-test( "#5727: draggable from iframe", function() {
-	expect( 1 );
-
-	var iframeBody, draggable1,
-		iframe = $( "<iframe />" ).appendTo( "#qunit-fixture" ),
-		iframeDoc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document;
-
-	iframeDoc.write( "<!doctype html><html><body>" );
-	iframeDoc.close();
-
-	iframeBody = $( iframeDoc.body ).append( "<div style='width: 2px; height: 2px;' />" );
-	draggable1 = iframeBody.find( "div" );
-
-	draggable1.draggable();
-
-	equal( draggable1.closest( iframeBody ).length, 1 );
-
-	// TODO: fix draggable within an IFRAME to fire events on the element properly
-	// and these testHelper.shouldMove relies on events for testing
-	//testHelper.shouldMove( draggable1, "draggable from an iframe" );
-});
-
-test( "#8399: A draggable should become the active element after you are finished interacting with it, but not before.", function() {
-	expect( 2 );
-
-	var element = $( "<a href='#'>link</a>" ).appendTo( "#qunit-fixture" ).draggable();
-
-	$( document ).one( "mousemove", function() {
-		notStrictEqual( document.activeElement, element.get( 0 ), "moving a draggable anchor did not make it the active element" );
-	});
-
-	testHelper.move( element, 50, 50 );
-
-	strictEqual( document.activeElement, element.get( 0 ), "finishing moving a draggable anchor made it the active element" );
-});
-
-asyncTest( "blur behavior", function() {
-	expect( 3 );
-
-	var element = $( "#draggable1" ).draggable(),
-		focusElement = $( "<div tabindex='1'></div>" ).appendTo( element );
-
-	testHelper.onFocus( focusElement, function() {
-		strictEqual( document.activeElement, focusElement.get( 0 ), "test element is focused before mousing down on a draggable" );
-
-		testHelper.move( focusElement, 1, 1 );
-
-		// http://bugs.jqueryui.com/ticket/10527
-		// Draggable: Can't select option in modal dialog (IE8)
-		strictEqual( document.activeElement, focusElement.get( 0 ), "test element is focused after mousing down on itself" );
-
-		testHelper.move( element, 50, 50 );
-
-		// http://bugs.jqueryui.com/ticket/4261
-		// active element should blur when mousing down on a draggable
-		notStrictEqual( document.activeElement, focusElement.get( 0 ), "test element is no longer focused after mousing down on a draggable" );
-		start();
-	});
-});
-
-test( "ui-draggable-handle assigned to appropriate element", function( assert ) {
-	expect( 5 );
-
-	var p = $( "<p>" ).appendTo( "#qunit-fixture" ),
-		element = $( "<div><p></p></div>" ).appendTo( "#qunit-fixture" ).draggable();
-	assert.hasClasses( element, "ui-draggable-handle" );
-
-	element.draggable( "option", "handle", "p" );
-	assert.lacksClasses( element, "ui-draggable-handle" );
-	assert.hasClasses( element.find( "p" ), "ui-draggable-handle",
-		"ensure handle class name is constrained within the draggble (#10212)" );
-	assert.lacksClasses( p, "ui-draggable-handle" );
-
-	element.draggable( "destroy" );
-	assert.lacksClasses( element.find( "p" ), "ui-draggable-handle" );
-});
-
-test( "ui-draggable-handle managed correctly in nested draggables", function( assert ) {
-	expect( 4 );
-	var parent = $( "<div><div></div></div>" ).draggable().appendTo( "#qunit-fixture" ),
-		child = parent.find( "div" ).draggable();
-
-	assert.hasClasses( parent, "ui-draggable-handle", "parent has class name on init" );
-	assert.hasClasses( child, "ui-draggable-handle", "child has class name on init" );
-
-	parent.draggable( "destroy" );
-	assert.lacksClasses( parent, "ui-draggable-handle", "parent loses class name on destroy" );
-	assert.hasClasses( child, "ui-draggable-handle", "child retains class name on destroy" );
-});
-
-} );
diff --git a/tests/unit/draggable/draggable_events.js b/tests/unit/draggable/draggable_events.js
deleted file mode 100644
index ebbf606ef..000000000
--- a/tests/unit/draggable/draggable_events.js
+++ /dev/null
@@ -1,164 +0,0 @@
-define( [
-	"jquery",
-	"ui/draggable"
-], function( $ ) {
-
-var element;
-
-module( "draggable: events", {
-	setup: function() {
-		element = $("<div>").appendTo("#qunit-fixture");
-	},
-	teardown: function() {
-		element.draggable("destroy");
-	}
-});
-
-test( "callbacks occurrence count", function() {
-	expect( 3 );
-
-	var start = 0,
-		stop = 0,
-		dragc = 0;
-
-	element.draggable({
-		start: function() {
-			start++;
-		},
-		drag: function() {
-			dragc++;
-		},
-		stop: function() {
-			stop++;
-		}
-	});
-
-	element.simulate( "drag", {
-		dx: 10,
-		dy: 10
-	});
-
-	equal( start, 1, "start callback should happen exactly once" );
-	equal( dragc, 3, "drag callback should happen exactly once per mousemove" );
-	equal( stop, 1, "stop callback should happen exactly once" );
-});
-
-test( "stopping the start callback", function() {
-	expect( 3 );
-
-	var start = 0,
-		stop = 0,
-		dragc = 0;
-
-	element.draggable({
-		start: function() {
-			start++;
-			return false;
-		},
-		drag: function() {
-			dragc++;
-		},
-		stop: function() {
-			stop++;
-		}
-	});
-
-	element.simulate( "drag", {
-		dx: 10,
-		dy: 10
-	});
-
-	equal( start, 1, "start callback should happen exactly once" );
-	equal( dragc, 0, "drag callback should not happen at all" );
-	equal( stop, 0, "stop callback should not happen if there wasnt even a start" );
-});
-
-test( "stopping the drag callback", function() {
-	expect( 2 );
-
-	var start = 0,
-		stop = 0,
-		dragc = 0;
-
-	element.draggable({
-		start: function() {
-			start++;
-		},
-		drag: function() {
-			dragc++;
-			return false;
-		},
-		stop: function() {
-			stop++;
-		}
-	});
-
-	element.simulate( "drag", {
-		dx: 10,
-		dy: 10
-	});
-
-	equal( start, 1, "start callback should happen exactly once" );
-	equal( stop, 1, "stop callback should happen, as we need to actively stop the drag" );
-});
-
-test( "stopping the stop callback", function() {
-	expect( 1 );
-
-	element.draggable({
-		helper: "clone",
-		stop: function() {
-			return false;
-		}
-	});
-
-	element.simulate( "drag", {
-		dx: 10,
-		dy: 10
-	});
-
-	ok( element.draggable( "instance" ).helper, "the clone should not be deleted if the stop callback is stopped" );
-});
-
-// http://bugs.jqueryui.com/ticket/6884
-// Draggable: ui.offset.left differs between the "start" and "drag" hooks
-test( "position and offset in hash is consistent between start, drag, and stop", function() {
-	expect( 4 );
-
-	var startPos, startOffset, dragPos, dragOffset, stopPos, stopOffset;
-
-	element = $( "<div style='margin: 2px;'></div>" ).appendTo( "#qunit-fixture" );
-
-	element.draggable({
-		start: function( event, ui ) {
-			startPos = ui.position;
-			startOffset = ui.offset;
-		},
-		drag: function( event, ui ) {
-			dragPos = ui.position;
-			dragOffset = ui.offset;
-		},
-		stop: function( event, ui ) {
-			stopPos = ui.position;
-			stopOffset = ui.offset;
-		}
-	});
-
-	element.simulate( "drag", {
-		dx: 10,
-		dy: 10,
-		moves: 1
-	});
-
-	startPos.left += 10;
-	startPos.top += 10;
-	startOffset.left += 10;
-	startOffset.top += 10;
-
-	deepEqual( startPos, dragPos, "start position equals drag position plus distance" );
-	deepEqual( dragPos, stopPos, "drag position equals stop position" );
-	deepEqual( startOffset, dragOffset, "start offset equals drag offset plus distance" );
-	deepEqual( dragOffset, stopOffset, "drag offset equals stop offset" );
-});
-
-} );
diff --git a/tests/unit/draggable/draggable_methods.js b/tests/unit/draggable/draggable_methods.js
deleted file mode 100644
index 74c5b67e8..000000000
--- a/tests/unit/draggable/draggable_methods.js
+++ /dev/null
@@ -1,104 +0,0 @@
-define( [
-	"jquery",
-	"./draggable_test_helpers",
-	"ui/draggable"
-], function( $, testHelper ) {
-
-var element;
-
-module( "draggable: methods", {
-	setup: function() {
-		element = $("<div style='background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;'><span>Absolute</span></div>").appendTo("#qunit-fixture");
-	},
-	teardown: function() {
-		element.remove();
-	}
-});
-
-test( "init", function() {
-	expect( 5 );
-
-	element.draggable();
-	ok( true, ".draggable() called on element" );
-
-	$([]).draggable();
-	ok( true, ".draggable() called on empty collection" );
-
-	$("<div></div>").draggable();
-	ok( true, ".draggable() called on disconnected DOMElement" );
-
-	element.draggable( "option", "foo" );
-	ok( true, "arbitrary option getter after init" );
-
-	element.draggable( "option", "foo", "bar" );
-	ok( true, "arbitrary option setter after init" );
-});
-
-test( "destroy", function() {
-	expect( 4 );
-
-	element.draggable().draggable("destroy");
-	ok( true, ".draggable('destroy') called on element" );
-
-	$([]).draggable().draggable("destroy");
-	ok( true, ".draggable('destroy') called on empty collection" );
-
-	element.draggable().draggable("destroy");
-	ok( true, ".draggable('destroy') called on disconnected DOMElement" );
-
-	var expected = element.draggable(),
-		actual = expected.draggable("destroy");
-	equal( actual, expected, "destroy is chainable" );
-});
-
-test( "enable", function() {
-	expect( 11 );
-
-	element.draggable({ disabled: true });
-	testHelper.shouldNotDrag( element, ".draggable({ disabled: true })" );
-
-	element.draggable("enable");
-	testHelper.shouldMove( element, ".draggable('enable')" );
-	equal( element.draggable( "option", "disabled" ), false, "disabled option getter" );
-
-	element.draggable("destroy");
-	element.draggable({ disabled: true });
-	testHelper.shouldNotDrag( element, ".draggable({ disabled: true })" );
-
-	element.draggable( "option", "disabled", false );
-	equal(element.draggable( "option", "disabled" ), false, "disabled option setter" );
-	testHelper.shouldMove( element, ".draggable('option', 'disabled', false)" );
-
-	var expected = element.draggable(),
-		actual = expected.draggable("enable");
-	equal( actual, expected, "enable is chainable" );
-});
-
-test( "disable", function( assert ) {
-	expect( 14 );
-
-	element = $( "#draggable2" ).draggable({ disabled: false });
-	testHelper.shouldMove( element, ".draggable({ disabled: false })" );
-
-	element.draggable( "disable" );
-	testHelper.shouldNotDrag( element, ".draggable('disable')" );
-	equal( element.draggable( "option", "disabled" ), true, "disabled option getter" );
-
-	element.draggable( "destroy" );
-	element.draggable({ disabled: false });
-	testHelper.shouldMove( element, ".draggable({ disabled: false })" );
-
-	element.draggable( "option", "disabled", true );
-	equal( element.draggable( "option", "disabled" ), true, "disabled option setter" );
-	testHelper.shouldNotDrag( element, ".draggable('option', 'disabled', true)" );
-
-	assert.lacksClasses( element.draggable( "widget" ), "ui-state-disabled" );
-	ok( !element.draggable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
-	assert.hasClasses( element.draggable( "widget" ), "ui-draggable-disabled" );
-
-	var expected = element.draggable(),
-		actual = expected.draggable( "disable" );
-	equal( actual, expected, "disable is chainable" );
-});
-
-} );
diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js
deleted file mode 100644
index 5368103b7..000000000
--- a/tests/unit/draggable/draggable_options.js
+++ /dev/null
@@ -1,1493 +0,0 @@
-define( [
-	"jquery",
-	"./draggable_test_helpers",
-	"ui/draggable",
-	"ui/droppable",
-	"ui/sortable"
-], function( $, testHelper ) {
-
-// TODO: This doesn't actually test whether append happened, possibly remove
-test( "{ appendTo: 'parent' }, default, no clone", function() {
-	expect( 4 );
-	var element = $( "#draggable2" ).draggable({ appendTo: "parent" });
-	testHelper.shouldMove( element, "absolute appendTo: parent" );
-
-	element = $( "#draggable1" ).draggable({ appendTo: "parent" });
-	testHelper.shouldMove( element, "relative appendTo: parent" );
-});
-
-// TODO: This doesn't actually test whether append happened, possibly remove
-test( "{ appendTo: Element }, no clone", function() {
-	expect( 4 );
-	var element = $( "#draggable2" ).draggable({ appendTo: $( "#draggable2" ).parent()[ 0 ] });
-
-	testHelper.shouldMove( element, "absolute appendTo: Element" );
-
-	element = $( "#draggable1" ).draggable({ appendTo: $( "#draggable2" ).parent()[ 0 ] });
-	testHelper.shouldMove( element, "relative appendTo: Element" );
-});
-
-// TODO: This doesn't actually test whether append happened, possibly remove
-test( "{ appendTo: Selector }, no clone", function() {
-	expect( 4 );
-	var element = $( "#draggable2" ).draggable({ appendTo: "#main" });
-	testHelper.shouldMove( element, "absolute appendTo: Selector" );
-
-	element = $( "#draggable1" ).draggable({ appendTo: "#main" });
-	testHelper.shouldMove( element, "relative appendTo: Selector" );
-});
-
-test( "{ appendTo: 'parent' }, default", function() {
-	expect( 2 );
-
-	var element = $( "#draggable1" ).draggable();
-
-	testHelper.trackAppendedParent( element );
-
-	equal( element.draggable( "option", "appendTo" ), "parent" );
-
-	testHelper.move( element, 1, 1 );
-	equal( element.data( "last_dragged_parent" ), $( "#main" )[ 0 ] );
-});
-
-test( "{ appendTo: Element }", function() {
-	expect( 1 );
-
-	var appendTo = $( "#draggable2" ).parent()[ 0 ],
-		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
-
-	testHelper.trackAppendedParent( element );
-
-	testHelper.move( element, 1, 1 );
-	equal( element.data( "last_dragged_parent" ), appendTo );
-});
-
-test( "{ appendTo: jQuery }", function() {
-	expect( 1 );
-
-	var appendTo = $( "#draggable2" ).parent(),
-		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
-
-	testHelper.trackAppendedParent( element );
-
-	testHelper.move( element, 1, 1 );
-	equal( element.data( "last_dragged_parent" ), appendTo[ 0 ] );
-});
-
-test( "{ appendTo: Selector }", function() {
-	expect( 1 );
-
-	var appendTo = "#main",
-		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
-
-	testHelper.trackAppendedParent( element );
-
-	testHelper.move( element, 1, 1 );
-	equal( element.data( "last_dragged_parent" ), $(appendTo)[ 0 ] );
-});
-
-test( "appendTo, default, switching after initialization", function() {
-	expect( 2 );
-
-	var element = $( "#draggable1" ).draggable({ helper: "clone" });
-
-	testHelper.trackAppendedParent( element );
-
-	// Move and make sure element was appended to fixture
-	testHelper.move( element, 1, 1 );
-	equal( element.data( "last_dragged_parent" ), $( "#main" )[ 0 ] );
-
-	// Move and make sure element was appended to main
-	element.draggable( "option", "appendTo", $( "#qunit-fixture" ) );
-	testHelper.move( element, 2, 2 );
-	equal( element.data( "last_dragged_parent" ), $( "#qunit-fixture" )[ 0 ] );
-});
-
-test( "{ axis: false }, default", function() {
-	expect( 2 );
-	var element = $( "#draggable2" ).draggable({ axis: false });
-	testHelper.shouldMove( element, "axis: false" );
-});
-
-test( "{ axis: 'x' }", function() {
-	expect( 2 );
-	var element = $( "#draggable2" ).draggable({ axis: "x" });
-	testHelper.testDrag( element, element, 50, 50, 50, 0, "axis: x" );
-});
-
-test( "{ axis: 'y' }", function() {
-	expect( 2 );
-	var element = $( "#draggable2" ).draggable({ axis: "y" });
-	testHelper.testDrag( element, element, 50, 50, 0, 50, "axis: y" );
-});
-
-test( "{ axis: ? }, unexpected", function() {
-	var element,
-		unexpected = {
-			"true": true,
-			"{}": {},
-			"[]": [],
-			"null": null,
-			"undefined": undefined,
-			"function() {}": function() {}
-		};
-
-	expect( 12 );
-
-	$.each(unexpected, function(key, val) {
-		element = $( "#draggable2" ).draggable({ axis: val });
-		testHelper.shouldMove( element, "axis: " + key );
-		element.draggable( "destroy" );
-	});
-});
-
-test( "axis, default, switching after initialization", function() {
-	expect( 6 );
-
-	var element = $( "#draggable1" ).draggable({ axis: false });
-
-	// Any Direction
-	testHelper.shouldMove( element, "axis: default" );
-
-	// Only horizontal
-	element.draggable( "option", "axis", "x" );
-	testHelper.testDrag( element, element, 50, 50, 50, 0, "axis: x as option" );
-
-	// Vertical only
-	element.draggable( "option", "axis", "y" );
-	testHelper.testDrag( element, element, 50, 50, 0, 50, "axis: y as option" );
-
-});
-
-test( "{ cancel: 'input,textarea,button,select,option' }, default", function() {
-	expect( 4 );
-
-	$( "<div id='draggable-option-cancel-default'><input type='text'></div>" ).appendTo( "#qunit-fixture" );
-
-	var element = $( "#draggable-option-cancel-default" ).draggable({ cancel: "input,textarea,button,select,option" });
-	testHelper.shouldMove( element, "cancel: default, element dragged" );
-
-	element.draggable( "destroy" );
-
-	element = $( "#draggable-option-cancel-default" ).draggable({ cancel: "input,textarea,button,select,option" });
-	testHelper.shouldNotDrag( element, "cancel: default, input dragged", "#draggable-option-cancel-default input" );
-	element.draggable( "destroy" );
-});
-
-test( "{ cancel: 'span' }", function() {
-	expect( 4 );
-
-	var element = $( "#draggable2" ).draggable();
-	testHelper.shouldMove( element, "cancel: default, span dragged", "#draggable2 span" );
-
-	element.draggable( "destroy" );
-
-	element = $( "#draggable2" ).draggable({ cancel: "span" });
-	testHelper.shouldNotDrag( element, "cancel: span, span dragged", "#draggable2 span" );
-});
-
-test( "{ cancel: ? }, unexpected", function() {
-	expect( 12 );
-
-	var element,
-		unexpected = {
-			"true": true,
-			"false": false,
-			"{}": {},
-			"[]": [],
-			"null": null,
-			"undefined": undefined
-		};
-
-	$.each( unexpected, function( key, val ) {
-		element = $( "#draggable2" ).draggable({ cancel: val });
-		testHelper.shouldMove( element, "cancel: " + key );
-		element.draggable( "destroy" );
-	});
-});
-
-/*
-test( "{ cancel: Selectors }, matching parent selector", function() {
-
-	expect( 4 );
-
-	var element = $( "#draggable2" ).draggable({ cancel: "span a" });
-
-	$( "#qunit-fixture" ).append( "<span id='wrapping'><a></a></span>" );
-
-	element.find( "span" ).append( "<a>" );
-
-	$( "#wrapping a" ).append( element );
-
-	testHelper.shouldMove( element, "drag span child", "#draggable2 span" );
-	testHelper.shouldNotDrag( $( "#draggable2 span a" ), "drag span a" );
-	testHelper.shouldNotDrag( $( "#wrapping a" ), "drag wrapping a" );
-
-	$( "#draggable2" ).draggable( "option", "cancel", "span > a" );
-	$( "#draggable2" ).find( "a" ).append( "<a>" );
-
-	testHelper.shouldMove( element, "drag span child", $( "#draggable2 span a" ).last() );
-	testHelper.shouldNotDrag( $( "#draggable2 span a" ).first(), "drag span a first child" );
-});
-*/
-
-test( "cancelement, default, switching after initialization", function() {
-	expect( 6 );
-
-	$( "<div id='draggable-option-cancel-default'><input type='text'></div>" ).appendTo( "#qunit-fixture" );
-
-	var input = $( "#draggable-option-cancel-default input" ),
-		element = $( "#draggable-option-cancel-default" ).draggable();
-
-	testHelper.shouldNotDrag( element, "cancel: default, input dragged", input );
-
-	element.draggable( "option", "cancel", "textarea" );
-	testHelper.shouldMove( element, "cancel: textarea, input dragged", input );
-
-	element.draggable( "option", "cancel", "input" );
-	testHelper.shouldNotDrag( element, "cancel: input, input dragged", input );
-});
-
-test( "connectToSortable, dragging out of a sortable", function() {
-	expect( 4 );
-
-	var sortItem, dragHelper,
-		element = $( "#draggableSortable" ).draggable({
-			scroll: false,
-			connectToSortable: "#sortable"
-		}),
-		sortable = $( "#sortable" ).sortable({ revert: 100 }),
-		dx = 50,
-		dy = 50,
-		offsetBefore = element.offset(),
-		offsetExpected = {
-			left: offsetBefore.left + dx,
-			top: offsetBefore.top + dy
-		};
-
-	$( sortable ).one( "sortstart", function( event, ui ) {
-		sortItem = ui.item;
-	});
-
-	$( element ).one( "drag", function( event, ui ) {
-		dragHelper = ui.helper;
-	});
-
-	$( element ).one( "dragstop", function( event, ui ) {
-		// http://bugs.jqueryui.com/ticket/8809
-		// Position issue when connected to sortable
-		deepEqual( ui.helper.offset(), offsetExpected, "draggable offset is correct" );
-
-		// http://bugs.jqueryui.com/ticket/7734
-		// HTML IDs are removed when dragging to a Sortable
-		equal( sortItem[ 0 ], dragHelper[ 0 ], "both have the same helper" );
-		equal( sortItem.attr( "id" ), dragHelper.attr( "id" ), "both have the same id" );
-
-		// http://bugs.jqueryui.com/ticket/9481
-		// connectToSortable causes sortable revert to fail on second attempt
-		equal( sortable.sortable( "option", "revert" ), 100, "sortable revert behavior is preserved" );
-	});
-
-	element.simulate( "drag", {
-		dx: dx,
-		dy: dy
-	});
-});
-
-asyncTest( "connectToSortable, dragging clone into sortable", function() {
-	expect( 3 );
-
-	var offsetPlaceholder,
-		element = $( "#draggableSortableClone" ).draggable({
-			scroll: false,
-			connectToSortable: "#sortable",
-			helper: "clone"
-		}),
-		sortable = $( "#sortable" ).sortable({ revert: 100 }),
-		offsetSortable = sortable.offset();
-
-	$( sortable ).one( "sort", function( event, ui ) {
-		offsetPlaceholder = ui.placeholder.offset();
-		// http://bugs.jqueryui.com/ticket/8809
-		// Position issue when connected to sortable
-		deepEqual( ui.helper.offset(), offsetSortable, "sortable offset is correct" );
-		notDeepEqual( ui.helper.offset(), offsetPlaceholder, "offset not equal to placeholder" );
-	});
-
-	$( sortable ).one( "sortstop", function( event, ui ) {
-		// http://bugs.jqueryui.com/ticket/9675
-		// Animation issue with revert and connectToSortable
-		deepEqual( ui.item.offset(), offsetPlaceholder, "offset eventually equals placeholder" );
-		start();
-	});
-
-	element.simulate( "drag", {
-		x: offsetSortable.left + 1,
-		y: offsetSortable.top + 1,
-		moves: 1
-	});
-});
-
-test( "connectToSortable, dragging multiple elements in and out of sortable", function() {
-	expect( 1 );
-
-	var element = $( "#draggableSortableClone" ).draggable({
-			scroll: false,
-			connectToSortable: "#sortable",
-			helper: "clone"
-		}),
-		element2 = $( "#draggableSortable" ).draggable({
-			scroll: false,
-			connectToSortable: "#sortable"
-		}),
-		sortable = $( "#sortable" ).sortable({ revert: false }),
-		sortableOffset = sortable.offset();
-
-	// Move element into sortable
-	element.simulate( "drag", {
-		x: sortableOffset.left + 1,
-		y: sortableOffset.top + 1,
-		moves: 10
-	});
-
-	// Move element in sortable out
-	element2.simulate( "drag", {
-		dx: 200,
-		dy: 200,
-		moves: 10
-	});
-
-	// http://bugs.jqueryui.com/ticket/9675
-	// Animation issue with revert and connectToSortable
-	sortable.one( "sortstop", function( event, ui ) {
-		ok( !$.contains( document, ui.placeholder[ 0 ] ), "placeholder was removed" );
-	});
-
-	// Move the clone of the first element back out
-	$( "#sortable .sortable2Item" ).simulate( "drag", {
-		dx: 200,
-		dy: 200,
-		moves: 10
-	});
-});
-
-test( "connectToSortable, dragging through one sortable to a second", function() {
-	expect( 2 );
-
-	var overCount = 0,
-		element = $( "#draggableSortable" ).draggable({
-			scroll: false,
-			connectToSortable: ".sortable"
-		}),
-		delta = 200,
-		sortable = $( "#sortable" ).sortable({ revert: false }),
-		sortable2 = $( "#sortable2" ).sortable({ revert: false }),
-		sortable2Offset = sortable2.offset(),
-		dragParams = {
-			x: sortable2Offset.left + 25,
-			y: sortable2Offset.top + sortable.outerHeight() + delta,
-			moves: 10
-		};
-
-	$( sortable ).one( "sortover", function() {
-		overCount++;
-		sortable2.css( "top", "+=" + delta );
-	});
-
-	$( sortable2 ).on( "sortupdate", function() {
-		ok( true, "second sortable is updated" );
-	});
-
-	$( sortable2 ).one( "sortover", function() {
-		overCount++;
-	});
-
-	$( sortable2 ).one( "sortstop", function() {
-		equal( overCount, 2, "went over both sortables" );
-	});
-
-	element.simulate( "drag", dragParams );
-});
-
-test( "connectToSortable, dragging through a sortable", function() {
-	expect( 1 );
-
-	var draggable = $( "#draggableSortable" ).draggable({
-			scroll: false,
-			connectToSortable: "#sortable2"
-		}),
-		sortable = $( "#sortable2" ).sortable(),
-		sortableOffset = sortable.offset();
-
-	// http://bugs.jqueryui.com/ticket/10669
-	// Draggable: Position issue with connectToSortable
-	draggable.one( "dragstop", function() {
-		equal( draggable.parent().attr( "id" ), "sortable", "restored draggable to original parent" );
-	});
-
-	draggable.simulate( "drag", {
-		x: sortableOffset.left + 25,
-		y: sortableOffset.top + sortable.outerHeight() + 400,
-		moves: 20
-	});
-});
-
-test( "{ containment: Element }", function() {
-	expect( 1 );
-
-	var offsetAfter,
-		element = $( "#draggable1" ).draggable({ containment: $( "#draggable1" ).parent()[ 0 ] }),
-		p = element.parent(),
-		po = p.offset(),
-		expected = {
-			left: po.left + testHelper.border( p, "left" ) + testHelper.margin( element, "left" ),
-			top: po.top + testHelper.border( p, "top" ) + testHelper.margin( element, "top" )
-		};
-
-	element.simulate( "drag", {
-		dx: -100,
-		dy: -100
-	});
-	offsetAfter = element.offset();
-	deepEqual( offsetAfter, expected, "compare offset to parent" );
-});
-
-test( "{ containment: Selector }", function() {
-	expect( 1 );
-
-	var offsetAfter,
-		element = $( "#draggable1" ).draggable({ containment: $( "#qunit-fixture" ) }),
-		p = element.parent(),
-		po = p.offset(),
-		expected = {
-			left: po.left + testHelper.border( p, "left" ) + testHelper.margin( element, "left" ),
-			top: po.top + testHelper.border( p, "top" ) + testHelper.margin( element, "top" )
-		};
-
-	element.simulate( "drag", {
-		dx: -100,
-		dy: -100
-	});
-	offsetAfter = element.offset();
-	deepEqual( offsetAfter, expected, "compare offset to parent" );
-});
-
-test( "{ containment: [x1, y1, x2, y2] }", function() {
-	expect( 2 );
-
-	var element = $( "#draggable1" ).draggable(),
-		eo = element.offset();
-
-	element.draggable( "option", "containment", [ eo.left, eo.top, eo.left + element.width() + 5, eo.top + element.height() + 5 ] );
-
-	testHelper.testDrag( element, element, -100, -100, 0, 0, "containment: [x1, y1, x2, y2]" );
-});
-
-test( "{ containment: 'parent' }, relative", function() {
-	expect( 1 );
-
-	var offsetAfter,
-		element = $( "#draggable1" ).draggable({ containment: "parent" }),
-		p = element.parent(),
-		po = p.offset(),
-		expected = {
-			left: po.left + testHelper.border( p, "left" ) + testHelper.margin( element, "left" ),
-			top: po.top + testHelper.border( p, "top" ) + testHelper.margin( element, "top" )
-		};
-
-	element.simulate( "drag", {
-		dx: -100,
-		dy: -100
-	});
-	offsetAfter = element.offset();
-	deepEqual( offsetAfter, expected, "compare offset to parent" );
-});
-
-test( "{ containment: 'parent' }, absolute", function() {
-	expect( 1 );
-
-	var offsetAfter,
-		element = $( "#draggable2" ).draggable({ containment: "parent" }),
-		p = element.parent(),
-		po = p.offset(),
-		expected = {
-			left: po.left + testHelper.border( p, "left" ) + testHelper.margin( element, "left" ),
-			top: po.top + testHelper.border( p, "top" ) + testHelper.margin( element, "top" )
-		};
-
-	element.simulate( "drag", {
-		dx: -100,
-		dy: -100
-	});
-	offsetAfter = element.offset();
-	deepEqual( offsetAfter, expected, "compare offset to parent" );
-});
-
-test( "containment, account for border", function( assert ) {
-	expect( 2 );
-
-	var el = $( "#draggable1" ).appendTo( "#scrollParent" ),
-		parent = el.parent().css({
-			height: "100px",
-			width: "100px",
-			borderStyle: "solid",
-			borderWidth: "5px 10px 15px 20px"
-		}),
-		parentBottom = parent.offset().top + parent.outerHeight(),
-		parentRight = parent.offset().left + parent.outerWidth(),
-		parentBorderBottom = testHelper.border( parent, "bottom" ),
-		parentBorderRight = testHelper.border( parent, "right" );
-
-	el.css({
-		height: "5px",
-		width: "5px"
-	}).draggable({ containment: "parent", scroll: false });
-
-	el.simulate( "drag", {
-		dx: 100,
-		dy: 100
-	});
-
-	assert.close( el.offset().top, parentBottom - parentBorderBottom - el.height(), 1,
-		"The draggable should be on top of its parent's bottom border" );
-	assert.close( el.offset().left, parentRight - parentBorderRight - el.width(), 1,
-		"The draggable should be to the right of its parent's right border" );
-});
-
-// http://bugs.jqueryui.com/ticket/7016
-// draggable can be pulled out of containment in Chrome and IE8
-test( "containment, element cant be pulled out of container", function() {
-	expect( 1 );
-
-	var offsetBefore,
-		parent = $( "<div>").css({ width: 200, height: 200 }).appendTo( "#qunit-fixture" ),
-		element = $( "#draggable1" ).appendTo( parent );
-
-	element
-		.css({
-			height: "5px",
-			width: "5px"
-		})
-		.draggable({ containment: "parent" })
-		.simulate( "drag", {
-			dx: 500,
-			dy: 500
-		});
-
-	offsetBefore = element.offset();
-
-	element.simulate( "drag", {
-		dx: 200,
-		dy: 200
-	});
-
-	deepEqual( element.offset(), offsetBefore, "The draggable should not move past bottom right edge" );
-});
-
-test( "containment, default, switching after initialization", function() {
-	expect( 8 );
-
-	var element = $( "#draggable1" ).draggable({ containment: false, scroll: false }),
-		po = element.parent().offset(),
-		containment = [ po.left - 100, po.top - 100, po.left + 500, po.top + 500 ];
-
-	testHelper.testDrag( element, element, -100, -100, -100, -100, "containment: default" );
-
-	element.draggable( "option", "containment", "parent" ).css({ top: 0, left: 0 });
-	testHelper.testDrag( element, element, -100, -100, 0, 0, "containment: parent as option" );
-
-	element.draggable( "option", "containment", containment ).css({ top: 0, left: 0 });
-	testHelper.testDrag( element, element, -100, -100, -100, -100, "containment: array as option" );
-
-	element.draggable( "option", "containment", false );
-	testHelper.testDrag( element, element, -100, -100, -100, -100, "containment: false as option" );
-});
-
-test( "{ cursor: 'auto' }, default", function() {
-	function getCursor() {
-		return $( "#draggable2" ).css( "cursor" );
-	}
-
-	expect( 2 );
-
-	var actual, after,
-		expected = "auto",
-		element = $( "#draggable2" ).draggable({
-			cursor: expected,
-			start: function() {
-				actual = getCursor();
-			}
-		}),
-		before = getCursor();
-
-	element.simulate( "drag", {
-		dx: -1,
-		dy: -1
-	});
-	after = getCursor();
-
-	equal( actual, expected, "start callback: cursor '" + expected + "'" );
-	equal( after, before, "after drag: cursor restored" );
-});
-
-test( "{ cursor: 'move' }", function() {
-	function getCursor() {
-		return $( "body" ).css( "cursor" );
-	}
-
-	expect( 2 );
-
-	var actual, after,
-		expected = "move",
-		element = $( "#draggable2" ).draggable({
-			cursor: expected,
-			start: function() {
-				actual = getCursor();
-			}
-		}),
-		before = getCursor();
-
-	element.simulate( "drag", {
-		dx: -1,
-		dy: -1
-	});
-	after = getCursor();
-
-	equal( actual, expected, "start callback: cursor '" + expected + "'" );
-	equal( after, before, "after drag: cursor restored" );
-});
-
-test( "#6889: Cursor doesn't revert to pre-dragging state after revert action when original element is removed", function() {
-	function getCursor() {
-		return $( "body" ).css( "cursor" );
-	}
-
-	expect( 2 );
-
-	var element = $( "#draggable1" ).wrap( "<div id='wrapper' />" ).draggable({
-			cursor: "move",
-			revert: true,
-			revertDuration: 0,
-			start: function() {
-				notEqual( getCursor(), expected, "start callback: cursor '" + expected + "'" );
-				$( "#wrapper" ).remove();
-			},
-			stop: function() {
-				equal( getCursor(), expected, "after drag: cursor restored" );
-			}
-		}),
-		expected = getCursor();
-
-	if ( testHelper.unreliableContains ) {
-		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
-		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
-	} else {
-		element.simulate( "drag", {
-			dx: -1,
-			dy: -1
-		});
-	}
-});
-
-test( "cursor, default, switching after initialization", function() {
-	expect( 3 );
-
-	var element = $( "#draggable1" ).draggable();
-
-	testHelper.trackMouseCss( element );
-
-	testHelper.move( element, 1, 1 );
-	equal( element.data( "last_dragged_cursor" ), "auto" );
-
-	element.draggable( "option", "cursor", "move" );
-	testHelper.move( element, 1, 1 );
-	equal( element.data( "last_dragged_cursor" ), "move" );
-
-	element.draggable( "option", "cursor", "ns-resize" );
-	testHelper.move( element, 1, 1 );
-	equal( element.data( "last_dragged_cursor" ), "ns-resize" );
-});
-
-test( "cursorAt", function() {
-	expect( 24 );
-
-	var deltaX = -3,
-		deltaY = -3,
-		tests = {
-			"false": { cursorAt: false },
-			"{ left: -5, top: -5 }": { x: -5, y: -5, cursorAt: { left: -5, top: -5 } },
-			"[ 10, 20 ]": { x: 10, y: 20, cursorAt: [ 10, 20 ] },
-			"'10 20'": { x: 10, y: 20, cursorAt: "10 20" },
-			"{ left: 20, top: 40 }": { x: 20, y: 40, cursorAt: { left: 20, top: 40 } },
-			"{ right: 10, bottom: 20 }": { x: 10, y: 20, cursorAt: { right: 10, bottom: 20 } }
-		};
-
-	$.each( tests, function( testName, testData ) {
-		$.each( [ "relative", "absolute" ], function( i, position ) {
-			var element = $( "#draggable" + ( i + 1 ) ).draggable({
-					cursorAt: testData.cursorAt,
-					drag: function( event, ui ) {
-						if ( !testData.cursorAt ) {
-							equal( ui.position.left - ui.originalPosition.left, deltaX, testName + " " + position + " left" );
-							equal( ui.position.top - ui.originalPosition.top, deltaY, testName + " " + position + " top" );
-						} else if ( testData.cursorAt.right ) {
-							equal( ui.helper.width() - ( event.clientX - ui.offset.left ), testData.x - testHelper.unreliableOffset, testName + " " + position + " left" );
-							equal( ui.helper.height() - ( event.clientY - ui.offset.top ), testData.y - testHelper.unreliableOffset, testName + " " + position + " top" );
-						} else {
-							equal( event.clientX - ui.offset.left, testData.x + testHelper.unreliableOffset, testName + " " + position + " left" );
-							equal( event.clientY - ui.offset.top, testData.y + testHelper.unreliableOffset, testName + " " + position + " top" );
-						}
-					}
-			});
-
-			element.simulate( "drag", {
-				moves: 1,
-				dx: deltaX,
-				dy: deltaY
-			});
-		});
-	});
-});
-
-test( "cursorAt, switching after initialization", function() {
-	expect( 24 );
-
-	var deltaX = -3,
-		deltaY = -3,
-		tests = {
-			"false": { cursorAt: false },
-			"{ left: -5, top: -5 }": { x: -5, y: -5, cursorAt: { left: -5, top: -5 } },
-			"[ 10, 20 ]": { x: 10, y: 20, cursorAt: [ 10, 20 ] },
-			"'10 20'": { x: 10, y: 20, cursorAt: "10 20" },
-			"{ left: 20, top: 40 }": { x: 20, y: 40, cursorAt: { left: 20, top: 40 } },
-			"{ right: 10, bottom: 20 }": { x: 10, y: 20, cursorAt: { right: 10, bottom: 20 } }
-		};
-
-	$.each( tests, function( testName, testData ) {
-		$.each( [ "relative", "absolute" ], function( i, position ) {
-			var element = $( "#draggable" + ( i + 1 ) );
-
-			element.draggable({
-					drag: function( event, ui ) {
-						if ( !testData.cursorAt ) {
-							equal( ui.position.left - ui.originalPosition.left, deltaX, testName + " " + position + " left" );
-							equal( ui.position.top - ui.originalPosition.top, deltaY, testName + " " + position + " top" );
-						} else if ( testData.cursorAt.right ) {
-							equal( ui.helper.width() - ( event.clientX - ui.offset.left ), testData.x - testHelper.unreliableOffset, testName + " " + position + " left" );
-							equal( ui.helper.height() - ( event.clientY - ui.offset.top ), testData.y - testHelper.unreliableOffset, testName + " " + position + " top" );
-						} else {
-							equal( event.clientX - ui.offset.left, testData.x + testHelper.unreliableOffset, testName + " " + position + " left" );
-							equal( event.clientY - ui.offset.top, testData.y + testHelper.unreliableOffset, testName + " " + position + " top" );
-						}
-					}
-			});
-
-			element.draggable( "option", "cursorAt", false );
-			element.draggable( "option", "cursorAt", testData.cursorAt );
-
-			element.simulate( "drag", {
-				moves: 1,
-				dx: deltaX,
-				dy: deltaY
-			});
-		});
-	});
-});
-
-test( "disabled", function() {
-	expect( 6 );
-
-	var element = $( "#draggable1" ).draggable();
-
-	testHelper.shouldMove( element, "disabled: default" );
-
-	element.draggable( "option", "disabled", true );
-	testHelper.shouldNotDrag( element, "option: disabled true" );
-
-	element.draggable( "option", "disabled", false );
-	testHelper.shouldMove( element, "option: disabled false" );
-});
-
-test( "{ grid: [50, 50] }, relative", function() {
-	expect( 4 );
-
-	var element = $( "#draggable1" ).draggable({ grid: [ 50, 50 ] });
-	testHelper.testDrag( element, element, 24, 24, 0, 0, "grid: [50, 50] relative" );
-	testHelper.testDrag( element, element, 26, 25, 50, 50, "grid: [50, 50] relative" );
-});
-
-test( "{ grid: [50, 50] }, absolute", function() {
-	expect( 4 );
-
-	var element = $( "#draggable2" ).draggable({ grid: [ 50, 50 ] });
-	testHelper.testDrag( element, element, 24, 24, 0, 0, "grid: [50, 50] absolute" );
-	testHelper.testDrag( element, element, 26, 25, 50, 50, "grid: [50, 50] absolute" );
-});
-
-test( "grid, switching after initialization", function() {
-	expect( 8 );
-
-	var element = $( "#draggable1" ).draggable();
-
-	// Forward
-	testHelper.testDrag( element, element, 24, 24, 24, 24, "grid: default" );
-	testHelper.testDrag( element, element, 0, 0, 0, 0, "grid: default" );
-
-	element.draggable( "option", "grid", [ 50, 50 ] );
-
-	testHelper.testDrag( element, element, 24, 24, 0, 0, "grid: [50, 50] as option" );
-	testHelper.testDrag( element, element, 26, 25, 50, 50, "grid: [50, 50] as option" );
-});
-
-test( "{ handle: 'span' }", function() {
-	expect( 6 );
-
-	var element = $( "#draggable2" ).draggable({ handle: "span" });
-
-	testHelper.shouldMove( element, "handle: span", "#draggable2 span");
-	testHelper.shouldMove( element, "handle: span child", "#draggable2 span em" );
-	testHelper.shouldNotDrag( element, "handle: span element" );
-});
-
-test( "handle, default, switching after initialization", function() {
-	expect( 12 );
-
-	var element = $( "#draggable2" ).draggable();
-
-	testHelper.shouldMove( element, "handle: default, element dragged" );
-	testHelper.shouldMove( element, "handle: default, span dragged", "#draggable2 span" );
-
-	// Switch
-	element.draggable( "option", "handle", "span" );
-	testHelper.shouldNotDrag( element, "handle: span as option, element dragged" );
-	testHelper.shouldMove( element, "handle: span as option, span dragged", "#draggable2 span" );
-
-	// And back
-	element.draggable( "option", "handle", false );
-	testHelper.shouldMove( element, "handle: false as option, element dragged" );
-	testHelper.shouldMove( element, "handle: false as option, span dragged", "#draggable2 span" );
-});
-
-test( "helper, default, switching after initialization", function() {
-	expect( 6 );
-
-	var element = $( "#draggable1" ).draggable();
-	testHelper.shouldMove( element, "helper: default" );
-
-	element.draggable( "option", "helper", "clone" );
-	testHelper.shouldMove( element, "helper: clone" );
-
-	element.draggable( "option", "helper", "original" );
-	testHelper.shouldMove( element, "helper: original" );
-});
-
-// http://bugs.jqueryui.com/ticket/9446
-// Draggable: helper function cannot emulate default behavior
-test( "helper, function returning original element", function() {
-	expect( 1 );
-
-	var element = $( "#draggable1" ).css( "position", "static" ).draggable({
-		helper: function() {
-			return this;
-		}
-	});
-
-	testHelper.testDragHelperOffset( element, 100, 100, 100, 100, "original element is draggable" );
-
-	element.simulate( "drag", {
-		dx: 100,
-		dy: 100
-	});
-});
-
-function testHelperPosition( scrollPositions, position, helper, scrollElements, scrollElementsTitle ) {
-	test( "{ helper: '" + helper + "' }, " + position + ", with scroll offset on " + scrollElementsTitle, function() {
-		expect( scrollPositions.length * 2 );
-
-		var i, j,
-			element = $( "#draggable1" ).css({ position: position, top: 0, left: 0 }).draggable({
-				helper: helper,
-				scroll: false
-			});
-
-		if ( scrollElements.length === 1 && scrollElements[ 0 ] === "#scrollParent" ) {
-			testHelper.setScrollable( "#main", false );
-			testHelper.setScrollable( "#scrollParent", true );
-		}
-
-		for ( j = 0; j < scrollPositions.length; j++ ) {
-			for ( i = 0; i < scrollElements.length; i++ ) {
-				testHelper.setScroll( scrollElements[ i ] );
-			}
-
-			testHelper.testScroll( element, scrollPositions[ j ] );
-
-			for ( i = 0; i < scrollElements.length; i++ ) {
-				testHelper.restoreScroll( scrollElements[ i ] );
-			}
-		}
-
-		if ( scrollElements.length === 1 && scrollElements[ 1 ] === "#scrollParent" ) {
-			testHelper.setScrollable( "#main", true );
-			testHelper.setScrollable( "#scrollParent", false );
-		}
-	});
-}
-
-(function() {
-	var scrollElementsMap = {
-			"no elements": [],
-			"parent": [ "#main" ],
-			"root": [ document ],
-			"parent and root": [ "#main", document ],
-			"grandparent": [ "#scrollParent" ]
-		},
-		positions = [ "absolute", "fixed", "relative", "static" ],
-		helpers = [ "original", "clone" ],
-		// static is not an option here since the fixture is in an absolute container
-		scrollPositions = [ "relative", "absolute", "fixed" ];
-
-	$.each( helpers, function() {
-		var helper = this;
-		$.each( positions, function() {
-			var position = this;
-			$.each( scrollElementsMap, function( scrollElementsTitle, scrollElements ) {
-				testHelperPosition( scrollPositions, position, helper, scrollElements, scrollElementsTitle );
-			});
-		});
-	});
-})();
-
-test( "{ opacity: 0.5 }", function() {
-	expect( 1 );
-
-	var opacity = null,
-		element = $( "#draggable2" ).draggable({
-			opacity: 0.5,
-			start: function() {
-				opacity = $(this).css( "opacity" );
-			}
-		});
-
-	element.simulate( "drag", {
-		dx: -1,
-		dy: -1
-	});
-
-	equal( opacity, 0.5, "start callback: opacity is" );
-});
-
-test( "opacity, default, switching after initialization", function() {
-	expect( 3 );
-
-	var opacity = null,
-		element = $( "#draggable2" ).draggable({
-			start: function() {
-				opacity = $(this).css( "opacity" );
-			}
-		});
-
-	testHelper.move( element, 1, 1 );
-	equal( opacity, 1 );
-
-	element.draggable( "option", "opacity", 0.5 );
-	testHelper.move( element, 2, 1 );
-	equal( opacity, 0.5 );
-
-	element.draggable( "option", "opacity", false );
-	testHelper.move( element, 3, 1 );
-	equal( opacity, 1 );
-});
-
-asyncTest( "revert and revertDuration", function() {
-	expect( 7 );
-
-	var element = $( "#draggable2" ).draggable({
-		revert: true,
-		revertDuration: 0
-	});
-	testHelper.shouldMovePositionButNotOffset( element, "revert: true, revertDuration: 0 should revert immediately" );
-
-	$( "#draggable2" ).draggable( "option", "revert", "invalid" );
-	testHelper.shouldMovePositionButNotOffset( element, "revert: invalid, revertDuration: 0 should revert immediately" );
-
-	$( "#draggable2" ).draggable( "option", "revert", false );
-	testHelper.shouldMove( element, "revert: false should allow movement" );
-
-	$( "#draggable2" ).draggable( "option", {
-		revert: true,
-		revertDuration: 200,
-		stop: function() {
-			start();
-		}
-	});
-
-	// animation are async, so test for it asynchronously
-	testHelper.move( element, 50, 50 );
-	setTimeout( function() {
-		ok( $( "#draggable2" ).is( ":animated" ), "revert: true with revertDuration should animate" );
-	});
-});
-
-test( "revert: valid", function() {
-	expect( 2 );
-
-	var element = $( "#draggable2" ).draggable({
-			revert: "valid",
-			revertDuration: 0
-		});
-
-	$( "#droppable" ).droppable();
-
-	testHelper.shouldMovePositionButNotOffset( element, "revert: valid reverts when dropped on a droppable" );
-});
-
-test( "scope", function() {
-	expect( 4 );
-
-	var element = $( "#draggable2" ).draggable({
-		scope: "tasks",
-		revert: "valid",
-		revertDuration: 0
-	});
-
-	$( "#droppable" ).droppable({ scope: "tasks" });
-
-	testHelper.shouldMovePositionButNotOffset( element, "revert: valid reverts when dropped on a droppable in scope" );
-
-	$( "#droppable" ).droppable( "destroy" ).droppable({ scope: "nottasks" });
-
-	testHelper.shouldMove( element, "revert: valid reverts when dropped on a droppable out of scope" );
-});
-
-test( "scroll, scrollSensitivity, and scrollSpeed", function() {
-	expect( 2 );
-
-	testHelper.setScrollable( "#main", false );
-
-	var currentScrollTop,
-		viewportHeight = $( window ).height(),
-		element = $( "#draggable1" ).draggable({ scroll: true }).appendTo( "#qunit-fixture" ),
-		scrollSensitivity = element.draggable( "option", "scrollSensitivity" ),
-		scrollSpeed = element.draggable( "option", "scrollSpeed" );
-
-	element.offset({
-		top: viewportHeight - scrollSensitivity - 1,
-		left: 1
-	});
-
-	$( element ).one( "drag", function() {
-		equal( $( window ).scrollTop(), 0, "scroll: true doesn't scroll when the element is dragged outside of scrollSensitivity" );
-	});
-
-	element.simulate( "drag", {
-		dx: 1,
-		y: viewportHeight - scrollSensitivity - 1,
-		moves: 1
-	});
-
-	element.draggable( "option", "scrollSensitivity", scrollSensitivity + 10 );
-
-	element.offset({
-		top: viewportHeight - scrollSensitivity - 1,
-		left: 1
-	});
-
-	currentScrollTop = $( window ).scrollTop();
-
-	$( element ).one( "drag", function() {
-		ok( $( window ).scrollTop() - currentScrollTop, scrollSpeed, "scroll: true scrolls when the element is dragged within scrollSensitivity" );
-	});
-
-	element.simulate( "drag", {
-		dx: 1,
-		y: viewportHeight - scrollSensitivity - 1,
-		moves: 1
-	});
-
-	testHelper.restoreScroll( document );
-});
-
-test( "scroll ignores containers that are overflow: hidden", function() {
-	expect( 2 );
-
-	var scrollParent = $( "#scrollParent" ),
-		element = $( "#draggable1" ).draggable().appendTo( scrollParent );
-
-	element.draggable( "option", "scroll", false );
-
-	element.simulate( "drag", {
-		dx: 1300,
-		dy: 1300
-	});
-
-	// IE8 natively scrolls when dragging an element inside a overflow:hidden
-	// container, so skip this test if native scroll occurs.
-	// Support: IE <9
-	if ( scrollParent.scrollTop() > 0 ) {
-		ok( true, "overflow:hidden container natively scrolls" );
-		ok( true, "overflow:hidden container natively scrolls" );
-		return;
-	}
-
-	element.css({ top: 0, left: 0 }).draggable( "option", "scroll", true );
-
-	element.simulate( "drag", {
-		dx: 1300,
-		dy: 1300
-	});
-
-	equal( scrollParent.scrollTop(), 0, "container doesn't scroll vertically" );
-	equal( scrollParent.scrollLeft(), 0, "container doesn't scroll horizontally" );
-});
-
-test( "#6817: auto scroll goes double distance when dragging", function( assert ) {
-	expect( 2 );
-
-	testHelper.restoreScroll( document );
-
-	var offsetBefore,
-		distance = 10,
-		viewportHeight = $( window ).height(),
-		element = $( "#draggable1" ).draggable({
-			scroll: true,
-			stop: function( e, ui ) {
-				equal( ui.offset.top, newY, "offset of item matches pointer position after scroll" );
-				// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
-				assert.close( ui.offset.top - offsetBefore.top, distance, 1, "offset of item only moves expected distance after scroll" );
-			}
-		}),
-		scrollSensitivity = element.draggable( "option", "scrollSensitivity" ),
-		oldY = viewportHeight - scrollSensitivity,
-		newY = oldY + distance;
-
-	element.offset({
-		top: oldY,
-		left: 1
-	});
-
-	offsetBefore = element.offset();
-
-	element.simulate( "drag", {
-		handle: "corner",
-		dx: 1,
-		y: newY,
-		moves: 1
-	});
-
-	testHelper.restoreScroll( document );
-});
-
-test( "snap, snapMode, and snapTolerance", function( assert ) {
-	expect( 10 );
-
-	var newX, newY,
-		snapTolerance = 15,
-		element = $( "#draggable1" ).draggable({
-			snap: true,
-			scroll: false,
-			snapMode: "both",
-			snapTolerance: snapTolerance
-		}),
-		element2 = $( "#draggable2" ).draggable();
-
-	// http://bugs.jqueryui.com/ticket/9724
-	// Draggable: Snapping coordinates thrown off by margin on draggable
-	element.css( "margin", "3px" );
-
-	element.offset({
-		top: 1,
-		left: 1
-	});
-
-	newX = element2.offset().left - element.outerWidth() - snapTolerance - 2;
-	newY = element2.offset().top;
-
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		y: newY,
-		moves: 1
-	});
-
-	// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
-	assert.close( element.offset().left, newX, 1, "doesn't snap outside the snapTolerance" );
-	assert.close( element.offset().top, newY, 1, "doesn't snap outside the snapTolerance" );
-
-	newX += 3;
-
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		y: newY,
-		moves: 1
-	});
-
-	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps inside the snapTolerance" );
-
-	element.draggable( "option", "snap", "#draggable2" );
-
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		y: newY,
-		moves: 1
-	});
-
-	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps based on selector" );
-
-	element.draggable( "option", "snap", "#draggable3" );
-
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		y: newY,
-		moves: 1
-	});
-
-	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap based on invalid selector" );
-
-	element.draggable( "option", "snap", true );
-	element.draggable( "option", "snapTolerance", snapTolerance - 2 );
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		y: newY,
-		moves: 1
-	});
-
-	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap outside the modified snapTolerance" );
-
-	element.draggable( "option", "snapTolerance", snapTolerance );
-	element.draggable( "option", "snapMode", "inner" );
-
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		y: newY,
-		moves: 1
-	});
-
-	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap inside the outer snapTolerance area when snapMode is inner" );
-
-	newX = element2.offset().left - snapTolerance - 1;
-	newY = element2.offset().top;
-
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		y: newY,
-		moves: 1
-	});
-
-	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap inside the outer snapTolerance area when snapMode is inner" );
-
-	newX++;
-
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		y: newY,
-		moves: 1
-	});
-
-	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps inside the inner snapTolerance area when snapMode is inner" );
-
-	element.draggable( "option", "snapMode", "outer" );
-
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		y: newY,
-		moves: 1
-	});
-
-	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap on the inner snapTolerance area when snapMode is outer" );
-});
-
-test( "#8459: element can snap to an element that was removed during drag", function( assert ) {
-	expect( 2 );
-
-	var newX, newY,
-		snapTolerance = 15,
-		element = $( "#draggable1" ).draggable({
-			snap: true,
-			scroll: false,
-			snapMode: "both",
-			snapTolerance: snapTolerance,
-			start: function() {
-				element2.remove();
-			}
-		}),
-		element2 = $( "#draggable2" ).draggable();
-
-	element.offset({
-		top: 1,
-		left: 1
-	});
-
-	newX = element2.offset().left - element.outerWidth() - snapTolerance + 1;
-	newY = element2.offset().top;
-
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		y: newY,
-		moves: 1
-	});
-
-	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
-	if ( testHelper.unreliableContains ) {
-		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
-		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
-	} else {
-		// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
-		assert.close( element.offset().left, newX, 1, "doesn't snap to a removed element" );
-		assert.close( element.offset().top, newY, 1, "doesn't snap to a removed element" );
-	}
-});
-
-test( "#8165: Snapping large rectangles to small rectangles doesn't snap properly", function() {
-	expect( 1 );
-
-	var snapTolerance = 20,
-		y = 1,
-		element = $( "#draggable1" )
-			.css({
-				width: "50px",
-				height: "200px"
-			}).offset({
-				top: y,
-				left: 1
-			}),
-		element2 = $( "#draggable2" )
-			.css({
-				width: "50px",
-				height: "50px"
-			}).offset({
-				top: y + snapTolerance + 1,
-				left: 200
-			}),
-		newX = element2.offset().left - element.outerWidth() - snapTolerance + 1;
-
-	$( "#draggable1, #draggable2" ).draggable({
-		snap: true,
-		snapTolerance: snapTolerance
-	});
-
-	element.simulate( "drag", {
-		handle: "corner",
-		x: newX,
-		moves: 1
-	});
-
-	notDeepEqual( element.offset(), { top: y, left: newX }, "snaps even if only a side (not a corner) is inside the snapTolerance" );
-});
-
-test( "stack", function() {
-	expect( 2 );
-
-	var element = $( "#draggable1" ).draggable({
-			stack: "#draggable1, #draggable2"
-		}),
-		element2 = $( "#draggable2" ).draggable({
-			stack: "#draggable1, #draggable2"
-		});
-
-	testHelper.move( element, 1, 1 );
-	equal( element.css( "zIndex" ), "2", "stack increments zIndex correctly" );
-
-	testHelper.move( element2, 1, 1 );
-	equal( element2.css( "zIndex" ), "3", "stack increments zIndex correctly" );
-});
-
-test( "{ zIndex: 10 }", function() {
-	expect( 1 );
-
-	var actual,
-		expected = 10,
-		element = $( "#draggable2" ).draggable({
-			zIndex: expected,
-			start: function() {
-				actual = $(this).css( "zIndex" );
-			}
-		});
-
-	element.simulate( "drag", {
-		dx: -1,
-		dy: -1
-	});
-
-	equal( actual, expected, "start callback: zIndex is" );
-
-});
-
-test( "zIndex, default, switching after initialization", function() {
-
-	expect( 3 );
-
-	var zindex = null,
-		element = $( "#draggable2" ).draggable({
-			start: function() {
-				zindex = $(this).css( "z-index" );
-			}
-		});
-
-	element.css( "z-index", 1 );
-
-	testHelper.move( element, 1, 1 );
-	equal( zindex, 1 );
-
-	element.draggable( "option", "zIndex", 5 );
-	testHelper.move( element, 2, 1 );
-	equal( zindex, 5 );
-
-	element.draggable( "option", "zIndex", false );
-	testHelper.move( element, 3, 1 );
-	equal( zindex, 1 );
-
-});
-
-test( "iframeFix", function() {
-	expect( 5 );
-
-	var element = $( "<div>" ).appendTo( "#qunit-fixture" ).draggable({ iframeFix: true }),
-		element2 = $( "<div>" ).appendTo( "#qunit-fixture" ).draggable({ iframeFix: ".iframe" }),
-		iframe = $( "<iframe>" ).appendTo( element );
-
-	element2
-		.append( "<iframe class='iframe'></iframe>" )
-		.append( "<iframe>" );
-
-	iframe.css({
-		width: 1,
-		height: 1
-	});
-
-	element.one( "drag", function() {
-		var div = $( this ).children().not( "iframe" );
-		// http://bugs.jqueryui.com/ticket/9671
-		// iframeFix doesn't handle iframes that move
-		equal( div.length, 1, "blocking div added as sibling" );
-		equal( div.outerWidth(), iframe.outerWidth(), "blocking div is wide enough" );
-		equal( div.outerHeight(), iframe.outerHeight(), "blocking div is tall enough" );
-		deepEqual( div.offset(), iframe.offset(), "blocking div is tall enough" );
-	});
-
-	element.simulate( "drag", {
-		dx: 1,
-		dy: 1
-	});
-
-	element2.one( "drag", function() {
-		var div = $( this ).children().not( "iframe" );
-		equal( div.length, 1, "blocking div added as sibling only to matching selector" );
-	});
-
-	element2.simulate( "drag", {
-		dx: 1,
-		dy: 1
-	});
-});
-
-} );
diff --git a/tests/unit/draggable/draggable_test_helpers.js b/tests/unit/draggable/draggable_test_helpers.js
deleted file mode 100644
index 1858e187b..000000000
--- a/tests/unit/draggable/draggable_test_helpers.js
+++ /dev/null
@@ -1,158 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper",
-	"ui/draggable"
-], function( $, helper ) {
-
-return $.extend( helper, {
-
-	// TODO: remove the unreliable offset hacks
-	unreliableOffset: $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0,
-	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
-
-	unreliableContains: (function() {
-		var element = $( "<div>" );
-		return $.contains( element[ 0 ].ownerDocument, element[ 0 ] );
-	})(),
-
-	testDragPosition: function( el, dx, dy, expectedDX, expectedDY, msg ) {
-		msg = msg ? msg + "." : "";
-
-		$( el ).one( "dragstop", function( event, ui ) {
-			var positionExpected = { left: ui.originalPosition.left + expectedDX, top: ui.originalPosition.top + expectedDY };
-			deepEqual( ui.position, positionExpected, "position dragged[" + dx + ", " + dy + "] " + msg );
-		});
-	},
-
-	testDragOffset: function( el, dx, dy, expectedDX, expectedDY, msg ) {
-		msg = msg ? msg + "." : "";
-
-		var offsetBefore = el.offset(),
-			offsetExpected = { left: offsetBefore.left + expectedDX, top: offsetBefore.top + expectedDY };
-
-		$( el ).one( "dragstop", function( event, ui ) {
-			deepEqual( ui.offset, offsetExpected, "offset dragged[" + dx + ", " + dy + "] " + msg );
-		});
-	},
-
-	testDragHelperOffset: function( el, dx, dy, expectedDX, expectedDY, msg ) {
-		msg = msg ? msg + "." : "";
-
-		var offsetBefore = el.offset(),
-			offsetExpected = { left: offsetBefore.left + expectedDX, top: offsetBefore.top + expectedDY };
-
-		$( el ).one( "dragstop", function( event, ui ) {
-			deepEqual( ui.helper.offset(), offsetExpected, "offset dragged[" + dx + ", " + dy + "] " + msg );
-		});
-	},
-
-	testDrag: function( el, handle, dx, dy, expectedDX, expectedDY, msg ) {
-		this.testDragPosition( el, dx, dy, expectedDX, expectedDY, msg );
-		this.testDragOffset( el, dx, dy, expectedDX, expectedDY, msg );
-
-		$( handle ).simulate( "drag", {
-			dx: dx,
-			dy: dy
-		});
-	},
-
-	shouldMovePositionButNotOffset: function( el, msg, handle ) {
-		handle = handle || el;
-		this.testDragPosition( el, 100, 100, 100, 100, msg );
-		this.testDragHelperOffset( el, 100, 100, 0, 0, msg );
-
-		$( handle ).simulate( "drag", {
-			dx: 100,
-			dy: 100
-		});
-	},
-
-	shouldMove: function( el, msg, handle ) {
-		handle = handle || el;
-		this.testDrag( el, handle, 100, 100, 100, 100, msg );
-	},
-
-	shouldNotMove: function( el, msg, handle ) {
-		handle = handle || el;
-		this.testDrag( el, handle, 100, 100, 0, 0, msg );
-	},
-
-	shouldNotDrag: function( el, msg, handle ) {
-		handle = handle || el;
-
-		var newOffset,
-			element = $( el ),
-			beginOffset = element.offset();
-
-		element.bind( "dragstop", function() {
-			ok( false, "should not drag " + msg );
-		});
-
-		$( handle ).simulate( "drag", {
-			dx: 100,
-			dy: 100
-		});
-
-		newOffset = element.offset();
-
-		// Also assert that draggable did not move, to ensure it isn't just
-		// that drag did not fire and draggable still somehow moved
-		equal( newOffset.left, beginOffset.left, "Offset left should not be different" );
-		equal( newOffset.top, beginOffset.top, "Offset top should not be different" );
-
-		element.unbind( "dragstop" );
-	},
-
-	setScrollable: function( what, isScrollable ) {
-		var overflow = isScrollable ? "scroll" : "hidden";
-		$( what ).css({ overflow: overflow, overflowX: overflow, overflowY: overflow });
-	},
-
-	testScroll: function( el, position ) {
-		var oldPosition = $( "#main" ).css( "position" );
-		$( "#main" ).css({ position: position, top: "0px", left: "0px" });
-		this.shouldMove( el, position + " parent" );
-		$( "#main" ).css( "position", oldPosition );
-	},
-
-	restoreScroll: function( what ) {
-		$( what ).scrollTop( 0 ).scrollLeft( 0 );
-	},
-
-	setScroll: function( what ) {
-		$( what ).scrollTop( 100 ).scrollLeft( 100 );
-	},
-
-	border: function( el, side ) {
-		return parseInt( el.css( "border-" + side + "-width" ), 10 ) || 0;
-	},
-
-	margin: function( el, side ) {
-		return parseInt( el.css( "margin-" + side ), 10 ) || 0;
-	},
-
-	move: function( el, x, y ) {
-		$( el ).simulate( "drag", {
-			dx: x,
-			dy: y
-		});
-	},
-
-	trackMouseCss: function( el ) {
-		el.bind( "drag", function() {
-			el.data( "last_dragged_cursor", $( "body" ).css( "cursor" ) );
-		});
-	},
-
-	trackAppendedParent: function( el ) {
-		// TODO: appendTo is currently ignored if helper is original (see #7044)
-		el.draggable( "option", "helper", "clone" );
-
-		// Get what parent is at time of drag
-		el.bind( "drag", function(e, ui) {
-			el.data( "last_dragged_parent", ui.helper.parent()[ 0 ] );
-		});
-	}
-} );
-
-} );
diff --git a/tests/unit/draggable/events.js b/tests/unit/draggable/events.js
new file mode 100644
index 000000000..ebbf606ef
--- /dev/null
+++ b/tests/unit/draggable/events.js
@@ -0,0 +1,164 @@
+define( [
+	"jquery",
+	"ui/draggable"
+], function( $ ) {
+
+var element;
+
+module( "draggable: events", {
+	setup: function() {
+		element = $("<div>").appendTo("#qunit-fixture");
+	},
+	teardown: function() {
+		element.draggable("destroy");
+	}
+});
+
+test( "callbacks occurrence count", function() {
+	expect( 3 );
+
+	var start = 0,
+		stop = 0,
+		dragc = 0;
+
+	element.draggable({
+		start: function() {
+			start++;
+		},
+		drag: function() {
+			dragc++;
+		},
+		stop: function() {
+			stop++;
+		}
+	});
+
+	element.simulate( "drag", {
+		dx: 10,
+		dy: 10
+	});
+
+	equal( start, 1, "start callback should happen exactly once" );
+	equal( dragc, 3, "drag callback should happen exactly once per mousemove" );
+	equal( stop, 1, "stop callback should happen exactly once" );
+});
+
+test( "stopping the start callback", function() {
+	expect( 3 );
+
+	var start = 0,
+		stop = 0,
+		dragc = 0;
+
+	element.draggable({
+		start: function() {
+			start++;
+			return false;
+		},
+		drag: function() {
+			dragc++;
+		},
+		stop: function() {
+			stop++;
+		}
+	});
+
+	element.simulate( "drag", {
+		dx: 10,
+		dy: 10
+	});
+
+	equal( start, 1, "start callback should happen exactly once" );
+	equal( dragc, 0, "drag callback should not happen at all" );
+	equal( stop, 0, "stop callback should not happen if there wasnt even a start" );
+});
+
+test( "stopping the drag callback", function() {
+	expect( 2 );
+
+	var start = 0,
+		stop = 0,
+		dragc = 0;
+
+	element.draggable({
+		start: function() {
+			start++;
+		},
+		drag: function() {
+			dragc++;
+			return false;
+		},
+		stop: function() {
+			stop++;
+		}
+	});
+
+	element.simulate( "drag", {
+		dx: 10,
+		dy: 10
+	});
+
+	equal( start, 1, "start callback should happen exactly once" );
+	equal( stop, 1, "stop callback should happen, as we need to actively stop the drag" );
+});
+
+test( "stopping the stop callback", function() {
+	expect( 1 );
+
+	element.draggable({
+		helper: "clone",
+		stop: function() {
+			return false;
+		}
+	});
+
+	element.simulate( "drag", {
+		dx: 10,
+		dy: 10
+	});
+
+	ok( element.draggable( "instance" ).helper, "the clone should not be deleted if the stop callback is stopped" );
+});
+
+// http://bugs.jqueryui.com/ticket/6884
+// Draggable: ui.offset.left differs between the "start" and "drag" hooks
+test( "position and offset in hash is consistent between start, drag, and stop", function() {
+	expect( 4 );
+
+	var startPos, startOffset, dragPos, dragOffset, stopPos, stopOffset;
+
+	element = $( "<div style='margin: 2px;'></div>" ).appendTo( "#qunit-fixture" );
+
+	element.draggable({
+		start: function( event, ui ) {
+			startPos = ui.position;
+			startOffset = ui.offset;
+		},
+		drag: function( event, ui ) {
+			dragPos = ui.position;
+			dragOffset = ui.offset;
+		},
+		stop: function( event, ui ) {
+			stopPos = ui.position;
+			stopOffset = ui.offset;
+		}
+	});
+
+	element.simulate( "drag", {
+		dx: 10,
+		dy: 10,
+		moves: 1
+	});
+
+	startPos.left += 10;
+	startPos.top += 10;
+	startOffset.left += 10;
+	startOffset.top += 10;
+
+	deepEqual( startPos, dragPos, "start position equals drag position plus distance" );
+	deepEqual( dragPos, stopPos, "drag position equals stop position" );
+	deepEqual( startOffset, dragOffset, "start offset equals drag offset plus distance" );
+	deepEqual( dragOffset, stopOffset, "drag offset equals stop offset" );
+});
+
+} );
diff --git a/tests/unit/draggable/helper.js b/tests/unit/draggable/helper.js
new file mode 100644
index 000000000..1858e187b
--- /dev/null
+++ b/tests/unit/draggable/helper.js
@@ -0,0 +1,158 @@
+define( [
+	"jquery",
+	"lib/helper",
+	"ui/draggable"
+], function( $, helper ) {
+
+return $.extend( helper, {
+
+	// TODO: remove the unreliable offset hacks
+	unreliableOffset: $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0,
+	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
+
+	unreliableContains: (function() {
+		var element = $( "<div>" );
+		return $.contains( element[ 0 ].ownerDocument, element[ 0 ] );
+	})(),
+
+	testDragPosition: function( el, dx, dy, expectedDX, expectedDY, msg ) {
+		msg = msg ? msg + "." : "";
+
+		$( el ).one( "dragstop", function( event, ui ) {
+			var positionExpected = { left: ui.originalPosition.left + expectedDX, top: ui.originalPosition.top + expectedDY };
+			deepEqual( ui.position, positionExpected, "position dragged[" + dx + ", " + dy + "] " + msg );
+		});
+	},
+
+	testDragOffset: function( el, dx, dy, expectedDX, expectedDY, msg ) {
+		msg = msg ? msg + "." : "";
+
+		var offsetBefore = el.offset(),
+			offsetExpected = { left: offsetBefore.left + expectedDX, top: offsetBefore.top + expectedDY };
+
+		$( el ).one( "dragstop", function( event, ui ) {
+			deepEqual( ui.offset, offsetExpected, "offset dragged[" + dx + ", " + dy + "] " + msg );
+		});
+	},
+
+	testDragHelperOffset: function( el, dx, dy, expectedDX, expectedDY, msg ) {
+		msg = msg ? msg + "." : "";
+
+		var offsetBefore = el.offset(),
+			offsetExpected = { left: offsetBefore.left + expectedDX, top: offsetBefore.top + expectedDY };
+
+		$( el ).one( "dragstop", function( event, ui ) {
+			deepEqual( ui.helper.offset(), offsetExpected, "offset dragged[" + dx + ", " + dy + "] " + msg );
+		});
+	},
+
+	testDrag: function( el, handle, dx, dy, expectedDX, expectedDY, msg ) {
+		this.testDragPosition( el, dx, dy, expectedDX, expectedDY, msg );
+		this.testDragOffset( el, dx, dy, expectedDX, expectedDY, msg );
+
+		$( handle ).simulate( "drag", {
+			dx: dx,
+			dy: dy
+		});
+	},
+
+	shouldMovePositionButNotOffset: function( el, msg, handle ) {
+		handle = handle || el;
+		this.testDragPosition( el, 100, 100, 100, 100, msg );
+		this.testDragHelperOffset( el, 100, 100, 0, 0, msg );
+
+		$( handle ).simulate( "drag", {
+			dx: 100,
+			dy: 100
+		});
+	},
+
+	shouldMove: function( el, msg, handle ) {
+		handle = handle || el;
+		this.testDrag( el, handle, 100, 100, 100, 100, msg );
+	},
+
+	shouldNotMove: function( el, msg, handle ) {
+		handle = handle || el;
+		this.testDrag( el, handle, 100, 100, 0, 0, msg );
+	},
+
+	shouldNotDrag: function( el, msg, handle ) {
+		handle = handle || el;
+
+		var newOffset,
+			element = $( el ),
+			beginOffset = element.offset();
+
+		element.bind( "dragstop", function() {
+			ok( false, "should not drag " + msg );
+		});
+
+		$( handle ).simulate( "drag", {
+			dx: 100,
+			dy: 100
+		});
+
+		newOffset = element.offset();
+
+		// Also assert that draggable did not move, to ensure it isn't just
+		// that drag did not fire and draggable still somehow moved
+		equal( newOffset.left, beginOffset.left, "Offset left should not be different" );
+		equal( newOffset.top, beginOffset.top, "Offset top should not be different" );
+
+		element.unbind( "dragstop" );
+	},
+
+	setScrollable: function( what, isScrollable ) {
+		var overflow = isScrollable ? "scroll" : "hidden";
+		$( what ).css({ overflow: overflow, overflowX: overflow, overflowY: overflow });
+	},
+
+	testScroll: function( el, position ) {
+		var oldPosition = $( "#main" ).css( "position" );
+		$( "#main" ).css({ position: position, top: "0px", left: "0px" });
+		this.shouldMove( el, position + " parent" );
+		$( "#main" ).css( "position", oldPosition );
+	},
+
+	restoreScroll: function( what ) {
+		$( what ).scrollTop( 0 ).scrollLeft( 0 );
+	},
+
+	setScroll: function( what ) {
+		$( what ).scrollTop( 100 ).scrollLeft( 100 );
+	},
+
+	border: function( el, side ) {
+		return parseInt( el.css( "border-" + side + "-width" ), 10 ) || 0;
+	},
+
+	margin: function( el, side ) {
+		return parseInt( el.css( "margin-" + side ), 10 ) || 0;
+	},
+
+	move: function( el, x, y ) {
+		$( el ).simulate( "drag", {
+			dx: x,
+			dy: y
+		});
+	},
+
+	trackMouseCss: function( el ) {
+		el.bind( "drag", function() {
+			el.data( "last_dragged_cursor", $( "body" ).css( "cursor" ) );
+		});
+	},
+
+	trackAppendedParent: function( el ) {
+		// TODO: appendTo is currently ignored if helper is original (see #7044)
+		el.draggable( "option", "helper", "clone" );
+
+		// Get what parent is at time of drag
+		el.bind( "drag", function(e, ui) {
+			el.data( "last_dragged_parent", ui.helper.parent()[ 0 ] );
+		});
+	}
+} );
+
+} );
diff --git a/tests/unit/draggable/methods.js b/tests/unit/draggable/methods.js
new file mode 100644
index 000000000..195e9e2fb
--- /dev/null
+++ b/tests/unit/draggable/methods.js
@@ -0,0 +1,104 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/draggable"
+], function( $, testHelper ) {
+
+var element;
+
+module( "draggable: methods", {
+	setup: function() {
+		element = $("<div style='background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;'><span>Absolute</span></div>").appendTo("#qunit-fixture");
+	},
+	teardown: function() {
+		element.remove();
+	}
+});
+
+test( "init", function() {
+	expect( 5 );
+
+	element.draggable();
+	ok( true, ".draggable() called on element" );
+
+	$([]).draggable();
+	ok( true, ".draggable() called on empty collection" );
+
+	$("<div></div>").draggable();
+	ok( true, ".draggable() called on disconnected DOMElement" );
+
+	element.draggable( "option", "foo" );
+	ok( true, "arbitrary option getter after init" );
+
+	element.draggable( "option", "foo", "bar" );
+	ok( true, "arbitrary option setter after init" );
+});
+
+test( "destroy", function() {
+	expect( 4 );
+
+	element.draggable().draggable("destroy");
+	ok( true, ".draggable('destroy') called on element" );
+
+	$([]).draggable().draggable("destroy");
+	ok( true, ".draggable('destroy') called on empty collection" );
+
+	element.draggable().draggable("destroy");
+	ok( true, ".draggable('destroy') called on disconnected DOMElement" );
+
+	var expected = element.draggable(),
+		actual = expected.draggable("destroy");
+	equal( actual, expected, "destroy is chainable" );
+});
+
+test( "enable", function() {
+	expect( 11 );
+
+	element.draggable({ disabled: true });
+	testHelper.shouldNotDrag( element, ".draggable({ disabled: true })" );
+
+	element.draggable("enable");
+	testHelper.shouldMove( element, ".draggable('enable')" );
+	equal( element.draggable( "option", "disabled" ), false, "disabled option getter" );
+
+	element.draggable("destroy");
+	element.draggable({ disabled: true });
+	testHelper.shouldNotDrag( element, ".draggable({ disabled: true })" );
+
+	element.draggable( "option", "disabled", false );
+	equal(element.draggable( "option", "disabled" ), false, "disabled option setter" );
+	testHelper.shouldMove( element, ".draggable('option', 'disabled', false)" );
+
+	var expected = element.draggable(),
+		actual = expected.draggable("enable");
+	equal( actual, expected, "enable is chainable" );
+});
+
+test( "disable", function( assert ) {
+	expect( 14 );
+
+	element = $( "#draggable2" ).draggable({ disabled: false });
+	testHelper.shouldMove( element, ".draggable({ disabled: false })" );
+
+	element.draggable( "disable" );
+	testHelper.shouldNotDrag( element, ".draggable('disable')" );
+	equal( element.draggable( "option", "disabled" ), true, "disabled option getter" );
+
+	element.draggable( "destroy" );
+	element.draggable({ disabled: false });
+	testHelper.shouldMove( element, ".draggable({ disabled: false })" );
+
+	element.draggable( "option", "disabled", true );
+	equal( element.draggable( "option", "disabled" ), true, "disabled option setter" );
+	testHelper.shouldNotDrag( element, ".draggable('option', 'disabled', true)" );
+
+	assert.lacksClasses( element.draggable( "widget" ), "ui-state-disabled" );
+	ok( !element.draggable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
+	assert.hasClasses( element.draggable( "widget" ), "ui-draggable-disabled" );
+
+	var expected = element.draggable(),
+		actual = expected.draggable( "disable" );
+	equal( actual, expected, "disable is chainable" );
+});
+
+} );
diff --git a/tests/unit/draggable/options.js b/tests/unit/draggable/options.js
new file mode 100644
index 000000000..877b4275c
--- /dev/null
+++ b/tests/unit/draggable/options.js
@@ -0,0 +1,1493 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/draggable",
+	"ui/droppable",
+	"ui/sortable"
+], function( $, testHelper ) {
+
+// TODO: This doesn't actually test whether append happened, possibly remove
+test( "{ appendTo: 'parent' }, default, no clone", function() {
+	expect( 4 );
+	var element = $( "#draggable2" ).draggable({ appendTo: "parent" });
+	testHelper.shouldMove( element, "absolute appendTo: parent" );
+
+	element = $( "#draggable1" ).draggable({ appendTo: "parent" });
+	testHelper.shouldMove( element, "relative appendTo: parent" );
+});
+
+// TODO: This doesn't actually test whether append happened, possibly remove
+test( "{ appendTo: Element }, no clone", function() {
+	expect( 4 );
+	var element = $( "#draggable2" ).draggable({ appendTo: $( "#draggable2" ).parent()[ 0 ] });
+
+	testHelper.shouldMove( element, "absolute appendTo: Element" );
+
+	element = $( "#draggable1" ).draggable({ appendTo: $( "#draggable2" ).parent()[ 0 ] });
+	testHelper.shouldMove( element, "relative appendTo: Element" );
+});
+
+// TODO: This doesn't actually test whether append happened, possibly remove
+test( "{ appendTo: Selector }, no clone", function() {
+	expect( 4 );
+	var element = $( "#draggable2" ).draggable({ appendTo: "#main" });
+	testHelper.shouldMove( element, "absolute appendTo: Selector" );
+
+	element = $( "#draggable1" ).draggable({ appendTo: "#main" });
+	testHelper.shouldMove( element, "relative appendTo: Selector" );
+});
+
+test( "{ appendTo: 'parent' }, default", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).draggable();
+
+	testHelper.trackAppendedParent( element );
+
+	equal( element.draggable( "option", "appendTo" ), "parent" );
+
+	testHelper.move( element, 1, 1 );
+	equal( element.data( "last_dragged_parent" ), $( "#main" )[ 0 ] );
+});
+
+test( "{ appendTo: Element }", function() {
+	expect( 1 );
+
+	var appendTo = $( "#draggable2" ).parent()[ 0 ],
+		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
+
+	testHelper.trackAppendedParent( element );
+
+	testHelper.move( element, 1, 1 );
+	equal( element.data( "last_dragged_parent" ), appendTo );
+});
+
+test( "{ appendTo: jQuery }", function() {
+	expect( 1 );
+
+	var appendTo = $( "#draggable2" ).parent(),
+		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
+
+	testHelper.trackAppendedParent( element );
+
+	testHelper.move( element, 1, 1 );
+	equal( element.data( "last_dragged_parent" ), appendTo[ 0 ] );
+});
+
+test( "{ appendTo: Selector }", function() {
+	expect( 1 );
+
+	var appendTo = "#main",
+		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
+
+	testHelper.trackAppendedParent( element );
+
+	testHelper.move( element, 1, 1 );
+	equal( element.data( "last_dragged_parent" ), $(appendTo)[ 0 ] );
+});
+
+test( "appendTo, default, switching after initialization", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).draggable({ helper: "clone" });
+
+	testHelper.trackAppendedParent( element );
+
+	// Move and make sure element was appended to fixture
+	testHelper.move( element, 1, 1 );
+	equal( element.data( "last_dragged_parent" ), $( "#main" )[ 0 ] );
+
+	// Move and make sure element was appended to main
+	element.draggable( "option", "appendTo", $( "#qunit-fixture" ) );
+	testHelper.move( element, 2, 2 );
+	equal( element.data( "last_dragged_parent" ), $( "#qunit-fixture" )[ 0 ] );
+});
+
+test( "{ axis: false }, default", function() {
+	expect( 2 );
+	var element = $( "#draggable2" ).draggable({ axis: false });
+	testHelper.shouldMove( element, "axis: false" );
+});
+
+test( "{ axis: 'x' }", function() {
+	expect( 2 );
+	var element = $( "#draggable2" ).draggable({ axis: "x" });
+	testHelper.testDrag( element, element, 50, 50, 50, 0, "axis: x" );
+});
+
+test( "{ axis: 'y' }", function() {
+	expect( 2 );
+	var element = $( "#draggable2" ).draggable({ axis: "y" });
+	testHelper.testDrag( element, element, 50, 50, 0, 50, "axis: y" );
+});
+
+test( "{ axis: ? }, unexpected", function() {
+	var element,
+		unexpected = {
+			"true": true,
+			"{}": {},
+			"[]": [],
+			"null": null,
+			"undefined": undefined,
+			"function() {}": function() {}
+		};
+
+	expect( 12 );
+
+	$.each(unexpected, function(key, val) {
+		element = $( "#draggable2" ).draggable({ axis: val });
+		testHelper.shouldMove( element, "axis: " + key );
+		element.draggable( "destroy" );
+	});
+});
+
+test( "axis, default, switching after initialization", function() {
+	expect( 6 );
+
+	var element = $( "#draggable1" ).draggable({ axis: false });
+
+	// Any Direction
+	testHelper.shouldMove( element, "axis: default" );
+
+	// Only horizontal
+	element.draggable( "option", "axis", "x" );
+	testHelper.testDrag( element, element, 50, 50, 50, 0, "axis: x as option" );
+
+	// Vertical only
+	element.draggable( "option", "axis", "y" );
+	testHelper.testDrag( element, element, 50, 50, 0, 50, "axis: y as option" );
+
+});
+
+test( "{ cancel: 'input,textarea,button,select,option' }, default", function() {
+	expect( 4 );
+
+	$( "<div id='draggable-option-cancel-default'><input type='text'></div>" ).appendTo( "#qunit-fixture" );
+
+	var element = $( "#draggable-option-cancel-default" ).draggable({ cancel: "input,textarea,button,select,option" });
+	testHelper.shouldMove( element, "cancel: default, element dragged" );
+
+	element.draggable( "destroy" );
+
+	element = $( "#draggable-option-cancel-default" ).draggable({ cancel: "input,textarea,button,select,option" });
+	testHelper.shouldNotDrag( element, "cancel: default, input dragged", "#draggable-option-cancel-default input" );
+	element.draggable( "destroy" );
+});
+
+test( "{ cancel: 'span' }", function() {
+	expect( 4 );
+
+	var element = $( "#draggable2" ).draggable();
+	testHelper.shouldMove( element, "cancel: default, span dragged", "#draggable2 span" );
+
+	element.draggable( "destroy" );
+
+	element = $( "#draggable2" ).draggable({ cancel: "span" });
+	testHelper.shouldNotDrag( element, "cancel: span, span dragged", "#draggable2 span" );
+});
+
+test( "{ cancel: ? }, unexpected", function() {
+	expect( 12 );
+
+	var element,
+		unexpected = {
+			"true": true,
+			"false": false,
+			"{}": {},
+			"[]": [],
+			"null": null,
+			"undefined": undefined
+		};
+
+	$.each( unexpected, function( key, val ) {
+		element = $( "#draggable2" ).draggable({ cancel: val });
+		testHelper.shouldMove( element, "cancel: " + key );
+		element.draggable( "destroy" );
+	});
+});
+
+/*
+test( "{ cancel: Selectors }, matching parent selector", function() {
+
+	expect( 4 );
+
+	var element = $( "#draggable2" ).draggable({ cancel: "span a" });
+
+	$( "#qunit-fixture" ).append( "<span id='wrapping'><a></a></span>" );
+
+	element.find( "span" ).append( "<a>" );
+
+	$( "#wrapping a" ).append( element );
+
+	testHelper.shouldMove( element, "drag span child", "#draggable2 span" );
+	testHelper.shouldNotDrag( $( "#draggable2 span a" ), "drag span a" );
+	testHelper.shouldNotDrag( $( "#wrapping a" ), "drag wrapping a" );
+
+	$( "#draggable2" ).draggable( "option", "cancel", "span > a" );
+	$( "#draggable2" ).find( "a" ).append( "<a>" );
+
+	testHelper.shouldMove( element, "drag span child", $( "#draggable2 span a" ).last() );
+	testHelper.shouldNotDrag( $( "#draggable2 span a" ).first(), "drag span a first child" );
+});
+*/
+
+test( "cancelement, default, switching after initialization", function() {
+	expect( 6 );
+
+	$( "<div id='draggable-option-cancel-default'><input type='text'></div>" ).appendTo( "#qunit-fixture" );
+
+	var input = $( "#draggable-option-cancel-default input" ),
+		element = $( "#draggable-option-cancel-default" ).draggable();
+
+	testHelper.shouldNotDrag( element, "cancel: default, input dragged", input );
+
+	element.draggable( "option", "cancel", "textarea" );
+	testHelper.shouldMove( element, "cancel: textarea, input dragged", input );
+
+	element.draggable( "option", "cancel", "input" );
+	testHelper.shouldNotDrag( element, "cancel: input, input dragged", input );
+});
+
+test( "connectToSortable, dragging out of a sortable", function() {
+	expect( 4 );
+
+	var sortItem, dragHelper,
+		element = $( "#draggableSortable" ).draggable({
+			scroll: false,
+			connectToSortable: "#sortable"
+		}),
+		sortable = $( "#sortable" ).sortable({ revert: 100 }),
+		dx = 50,
+		dy = 50,
+		offsetBefore = element.offset(),
+		offsetExpected = {
+			left: offsetBefore.left + dx,
+			top: offsetBefore.top + dy
+		};
+
+	$( sortable ).one( "sortstart", function( event, ui ) {
+		sortItem = ui.item;
+	});
+
+	$( element ).one( "drag", function( event, ui ) {
+		dragHelper = ui.helper;
+	});
+
+	$( element ).one( "dragstop", function( event, ui ) {
+		// http://bugs.jqueryui.com/ticket/8809
+		// Position issue when connected to sortable
+		deepEqual( ui.helper.offset(), offsetExpected, "draggable offset is correct" );
+
+		// http://bugs.jqueryui.com/ticket/7734
+		// HTML IDs are removed when dragging to a Sortable
+		equal( sortItem[ 0 ], dragHelper[ 0 ], "both have the same helper" );
+		equal( sortItem.attr( "id" ), dragHelper.attr( "id" ), "both have the same id" );
+
+		// http://bugs.jqueryui.com/ticket/9481
+		// connectToSortable causes sortable revert to fail on second attempt
+		equal( sortable.sortable( "option", "revert" ), 100, "sortable revert behavior is preserved" );
+	});
+
+	element.simulate( "drag", {
+		dx: dx,
+		dy: dy
+	});
+});
+
+asyncTest( "connectToSortable, dragging clone into sortable", function() {
+	expect( 3 );
+
+	var offsetPlaceholder,
+		element = $( "#draggableSortableClone" ).draggable({
+			scroll: false,
+			connectToSortable: "#sortable",
+			helper: "clone"
+		}),
+		sortable = $( "#sortable" ).sortable({ revert: 100 }),
+		offsetSortable = sortable.offset();
+
+	$( sortable ).one( "sort", function( event, ui ) {
+		offsetPlaceholder = ui.placeholder.offset();
+		// http://bugs.jqueryui.com/ticket/8809
+		// Position issue when connected to sortable
+		deepEqual( ui.helper.offset(), offsetSortable, "sortable offset is correct" );
+		notDeepEqual( ui.helper.offset(), offsetPlaceholder, "offset not equal to placeholder" );
+	});
+
+	$( sortable ).one( "sortstop", function( event, ui ) {
+		// http://bugs.jqueryui.com/ticket/9675
+		// Animation issue with revert and connectToSortable
+		deepEqual( ui.item.offset(), offsetPlaceholder, "offset eventually equals placeholder" );
+		start();
+	});
+
+	element.simulate( "drag", {
+		x: offsetSortable.left + 1,
+		y: offsetSortable.top + 1,
+		moves: 1
+	});
+});
+
+test( "connectToSortable, dragging multiple elements in and out of sortable", function() {
+	expect( 1 );
+
+	var element = $( "#draggableSortableClone" ).draggable({
+			scroll: false,
+			connectToSortable: "#sortable",
+			helper: "clone"
+		}),
+		element2 = $( "#draggableSortable" ).draggable({
+			scroll: false,
+			connectToSortable: "#sortable"
+		}),
+		sortable = $( "#sortable" ).sortable({ revert: false }),
+		sortableOffset = sortable.offset();
+
+	// Move element into sortable
+	element.simulate( "drag", {
+		x: sortableOffset.left + 1,
+		y: sortableOffset.top + 1,
+		moves: 10
+	});
+
+	// Move element in sortable out
+	element2.simulate( "drag", {
+		dx: 200,
+		dy: 200,
+		moves: 10
+	});
+
+	// http://bugs.jqueryui.com/ticket/9675
+	// Animation issue with revert and connectToSortable
+	sortable.one( "sortstop", function( event, ui ) {
+		ok( !$.contains( document, ui.placeholder[ 0 ] ), "placeholder was removed" );
+	});
+
+	// Move the clone of the first element back out
+	$( "#sortable .sortable2Item" ).simulate( "drag", {
+		dx: 200,
+		dy: 200,
+		moves: 10
+	});
+});
+
+test( "connectToSortable, dragging through one sortable to a second", function() {
+	expect( 2 );
+
+	var overCount = 0,
+		element = $( "#draggableSortable" ).draggable({
+			scroll: false,
+			connectToSortable: ".sortable"
+		}),
+		delta = 200,
+		sortable = $( "#sortable" ).sortable({ revert: false }),
+		sortable2 = $( "#sortable2" ).sortable({ revert: false }),
+		sortable2Offset = sortable2.offset(),
+		dragParams = {
+			x: sortable2Offset.left + 25,
+			y: sortable2Offset.top + sortable.outerHeight() + delta,
+			moves: 10
+		};
+
+	$( sortable ).one( "sortover", function() {
+		overCount++;
+		sortable2.css( "top", "+=" + delta );
+	});
+
+	$( sortable2 ).on( "sortupdate", function() {
+		ok( true, "second sortable is updated" );
+	});
+
+	$( sortable2 ).one( "sortover", function() {
+		overCount++;
+	});
+
+	$( sortable2 ).one( "sortstop", function() {
+		equal( overCount, 2, "went over both sortables" );
+	});
+
+	element.simulate( "drag", dragParams );
+});
+
+test( "connectToSortable, dragging through a sortable", function() {
+	expect( 1 );
+
+	var draggable = $( "#draggableSortable" ).draggable({
+			scroll: false,
+			connectToSortable: "#sortable2"
+		}),
+		sortable = $( "#sortable2" ).sortable(),
+		sortableOffset = sortable.offset();
+
+	// http://bugs.jqueryui.com/ticket/10669
+	// Draggable: Position issue with connectToSortable
+	draggable.one( "dragstop", function() {
+		equal( draggable.parent().attr( "id" ), "sortable", "restored draggable to original parent" );
+	});
+
+	draggable.simulate( "drag", {
+		x: sortableOffset.left + 25,
+		y: sortableOffset.top + sortable.outerHeight() + 400,
+		moves: 20
+	});
+});
+
+test( "{ containment: Element }", function() {
+	expect( 1 );
+
+	var offsetAfter,
+		element = $( "#draggable1" ).draggable({ containment: $( "#draggable1" ).parent()[ 0 ] }),
+		p = element.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + testHelper.border( p, "left" ) + testHelper.margin( element, "left" ),
+			top: po.top + testHelper.border( p, "top" ) + testHelper.margin( element, "top" )
+		};
+
+	element.simulate( "drag", {
+		dx: -100,
+		dy: -100
+	});
+	offsetAfter = element.offset();
+	deepEqual( offsetAfter, expected, "compare offset to parent" );
+});
+
+test( "{ containment: Selector }", function() {
+	expect( 1 );
+
+	var offsetAfter,
+		element = $( "#draggable1" ).draggable({ containment: $( "#qunit-fixture" ) }),
+		p = element.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + testHelper.border( p, "left" ) + testHelper.margin( element, "left" ),
+			top: po.top + testHelper.border( p, "top" ) + testHelper.margin( element, "top" )
+		};
+
+	element.simulate( "drag", {
+		dx: -100,
+		dy: -100
+	});
+	offsetAfter = element.offset();
+	deepEqual( offsetAfter, expected, "compare offset to parent" );
+});
+
+test( "{ containment: [x1, y1, x2, y2] }", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).draggable(),
+		eo = element.offset();
+
+	element.draggable( "option", "containment", [ eo.left, eo.top, eo.left + element.width() + 5, eo.top + element.height() + 5 ] );
+
+	testHelper.testDrag( element, element, -100, -100, 0, 0, "containment: [x1, y1, x2, y2]" );
+});
+
+test( "{ containment: 'parent' }, relative", function() {
+	expect( 1 );
+
+	var offsetAfter,
+		element = $( "#draggable1" ).draggable({ containment: "parent" }),
+		p = element.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + testHelper.border( p, "left" ) + testHelper.margin( element, "left" ),
+			top: po.top + testHelper.border( p, "top" ) + testHelper.margin( element, "top" )
+		};
+
+	element.simulate( "drag", {
+		dx: -100,
+		dy: -100
+	});
+	offsetAfter = element.offset();
+	deepEqual( offsetAfter, expected, "compare offset to parent" );
+});
+
+test( "{ containment: 'parent' }, absolute", function() {
+	expect( 1 );
+
+	var offsetAfter,
+		element = $( "#draggable2" ).draggable({ containment: "parent" }),
+		p = element.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + testHelper.border( p, "left" ) + testHelper.margin( element, "left" ),
+			top: po.top + testHelper.border( p, "top" ) + testHelper.margin( element, "top" )
+		};
+
+	element.simulate( "drag", {
+		dx: -100,
+		dy: -100
+	});
+	offsetAfter = element.offset();
+	deepEqual( offsetAfter, expected, "compare offset to parent" );
+});
+
+test( "containment, account for border", function( assert ) {
+	expect( 2 );
+
+	var el = $( "#draggable1" ).appendTo( "#scrollParent" ),
+		parent = el.parent().css({
+			height: "100px",
+			width: "100px",
+			borderStyle: "solid",
+			borderWidth: "5px 10px 15px 20px"
+		}),
+		parentBottom = parent.offset().top + parent.outerHeight(),
+		parentRight = parent.offset().left + parent.outerWidth(),
+		parentBorderBottom = testHelper.border( parent, "bottom" ),
+		parentBorderRight = testHelper.border( parent, "right" );
+
+	el.css({
+		height: "5px",
+		width: "5px"
+	}).draggable({ containment: "parent", scroll: false });
+
+	el.simulate( "drag", {
+		dx: 100,
+		dy: 100
+	});
+
+	assert.close( el.offset().top, parentBottom - parentBorderBottom - el.height(), 1,
+		"The draggable should be on top of its parent's bottom border" );
+	assert.close( el.offset().left, parentRight - parentBorderRight - el.width(), 1,
+		"The draggable should be to the right of its parent's right border" );
+});
+
+// http://bugs.jqueryui.com/ticket/7016
+// draggable can be pulled out of containment in Chrome and IE8
+test( "containment, element cant be pulled out of container", function() {
+	expect( 1 );
+
+	var offsetBefore,
+		parent = $( "<div>").css({ width: 200, height: 200 }).appendTo( "#qunit-fixture" ),
+		element = $( "#draggable1" ).appendTo( parent );
+
+	element
+		.css({
+			height: "5px",
+			width: "5px"
+		})
+		.draggable({ containment: "parent" })
+		.simulate( "drag", {
+			dx: 500,
+			dy: 500
+		});
+
+	offsetBefore = element.offset();
+
+	element.simulate( "drag", {
+		dx: 200,
+		dy: 200
+	});
+
+	deepEqual( element.offset(), offsetBefore, "The draggable should not move past bottom right edge" );
+});
+
+test( "containment, default, switching after initialization", function() {
+	expect( 8 );
+
+	var element = $( "#draggable1" ).draggable({ containment: false, scroll: false }),
+		po = element.parent().offset(),
+		containment = [ po.left - 100, po.top - 100, po.left + 500, po.top + 500 ];
+
+	testHelper.testDrag( element, element, -100, -100, -100, -100, "containment: default" );
+
+	element.draggable( "option", "containment", "parent" ).css({ top: 0, left: 0 });
+	testHelper.testDrag( element, element, -100, -100, 0, 0, "containment: parent as option" );
+
+	element.draggable( "option", "containment", containment ).css({ top: 0, left: 0 });
+	testHelper.testDrag( element, element, -100, -100, -100, -100, "containment: array as option" );
+
+	element.draggable( "option", "containment", false );
+	testHelper.testDrag( element, element, -100, -100, -100, -100, "containment: false as option" );
+});
+
+test( "{ cursor: 'auto' }, default", function() {
+	function getCursor() {
+		return $( "#draggable2" ).css( "cursor" );
+	}
+
+	expect( 2 );
+
+	var actual, after,
+		expected = "auto",
+		element = $( "#draggable2" ).draggable({
+			cursor: expected,
+			start: function() {
+				actual = getCursor();
+			}
+		}),
+		before = getCursor();
+
+	element.simulate( "drag", {
+		dx: -1,
+		dy: -1
+	});
+	after = getCursor();
+
+	equal( actual, expected, "start callback: cursor '" + expected + "'" );
+	equal( after, before, "after drag: cursor restored" );
+});
+
+test( "{ cursor: 'move' }", function() {
+	function getCursor() {
+		return $( "body" ).css( "cursor" );
+	}
+
+	expect( 2 );
+
+	var actual, after,
+		expected = "move",
+		element = $( "#draggable2" ).draggable({
+			cursor: expected,
+			start: function() {
+				actual = getCursor();
+			}
+		}),
+		before = getCursor();
+
+	element.simulate( "drag", {
+		dx: -1,
+		dy: -1
+	});
+	after = getCursor();
+
+	equal( actual, expected, "start callback: cursor '" + expected + "'" );
+	equal( after, before, "after drag: cursor restored" );
+});
+
+test( "#6889: Cursor doesn't revert to pre-dragging state after revert action when original element is removed", function() {
+	function getCursor() {
+		return $( "body" ).css( "cursor" );
+	}
+
+	expect( 2 );
+
+	var element = $( "#draggable1" ).wrap( "<div id='wrapper' />" ).draggable({
+			cursor: "move",
+			revert: true,
+			revertDuration: 0,
+			start: function() {
+				notEqual( getCursor(), expected, "start callback: cursor '" + expected + "'" );
+				$( "#wrapper" ).remove();
+			},
+			stop: function() {
+				equal( getCursor(), expected, "after drag: cursor restored" );
+			}
+		}),
+		expected = getCursor();
+
+	if ( testHelper.unreliableContains ) {
+		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
+		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
+	} else {
+		element.simulate( "drag", {
+			dx: -1,
+			dy: -1
+		});
+	}
+});
+
+test( "cursor, default, switching after initialization", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).draggable();
+
+	testHelper.trackMouseCss( element );
+
+	testHelper.move( element, 1, 1 );
+	equal( element.data( "last_dragged_cursor" ), "auto" );
+
+	element.draggable( "option", "cursor", "move" );
+	testHelper.move( element, 1, 1 );
+	equal( element.data( "last_dragged_cursor" ), "move" );
+
+	element.draggable( "option", "cursor", "ns-resize" );
+	testHelper.move( element, 1, 1 );
+	equal( element.data( "last_dragged_cursor" ), "ns-resize" );
+});
+
+test( "cursorAt", function() {
+	expect( 24 );
+
+	var deltaX = -3,
+		deltaY = -3,
+		tests = {
+			"false": { cursorAt: false },
+			"{ left: -5, top: -5 }": { x: -5, y: -5, cursorAt: { left: -5, top: -5 } },
+			"[ 10, 20 ]": { x: 10, y: 20, cursorAt: [ 10, 20 ] },
+			"'10 20'": { x: 10, y: 20, cursorAt: "10 20" },
+			"{ left: 20, top: 40 }": { x: 20, y: 40, cursorAt: { left: 20, top: 40 } },
+			"{ right: 10, bottom: 20 }": { x: 10, y: 20, cursorAt: { right: 10, bottom: 20 } }
+		};
+
+	$.each( tests, function( testName, testData ) {
+		$.each( [ "relative", "absolute" ], function( i, position ) {
+			var element = $( "#draggable" + ( i + 1 ) ).draggable({
+					cursorAt: testData.cursorAt,
+					drag: function( event, ui ) {
+						if ( !testData.cursorAt ) {
+							equal( ui.position.left - ui.originalPosition.left, deltaX, testName + " " + position + " left" );
+							equal( ui.position.top - ui.originalPosition.top, deltaY, testName + " " + position + " top" );
+						} else if ( testData.cursorAt.right ) {
+							equal( ui.helper.width() - ( event.clientX - ui.offset.left ), testData.x - testHelper.unreliableOffset, testName + " " + position + " left" );
+							equal( ui.helper.height() - ( event.clientY - ui.offset.top ), testData.y - testHelper.unreliableOffset, testName + " " + position + " top" );
+						} else {
+							equal( event.clientX - ui.offset.left, testData.x + testHelper.unreliableOffset, testName + " " + position + " left" );
+							equal( event.clientY - ui.offset.top, testData.y + testHelper.unreliableOffset, testName + " " + position + " top" );
+						}
+					}
+			});
+
+			element.simulate( "drag", {
+				moves: 1,
+				dx: deltaX,
+				dy: deltaY
+			});
+		});
+	});
+});
+
+test( "cursorAt, switching after initialization", function() {
+	expect( 24 );
+
+	var deltaX = -3,
+		deltaY = -3,
+		tests = {
+			"false": { cursorAt: false },
+			"{ left: -5, top: -5 }": { x: -5, y: -5, cursorAt: { left: -5, top: -5 } },
+			"[ 10, 20 ]": { x: 10, y: 20, cursorAt: [ 10, 20 ] },
+			"'10 20'": { x: 10, y: 20, cursorAt: "10 20" },
+			"{ left: 20, top: 40 }": { x: 20, y: 40, cursorAt: { left: 20, top: 40 } },
+			"{ right: 10, bottom: 20 }": { x: 10, y: 20, cursorAt: { right: 10, bottom: 20 } }
+		};
+
+	$.each( tests, function( testName, testData ) {
+		$.each( [ "relative", "absolute" ], function( i, position ) {
+			var element = $( "#draggable" + ( i + 1 ) );
+
+			element.draggable({
+					drag: function( event, ui ) {
+						if ( !testData.cursorAt ) {
+							equal( ui.position.left - ui.originalPosition.left, deltaX, testName + " " + position + " left" );
+							equal( ui.position.top - ui.originalPosition.top, deltaY, testName + " " + position + " top" );
+						} else if ( testData.cursorAt.right ) {
+							equal( ui.helper.width() - ( event.clientX - ui.offset.left ), testData.x - testHelper.unreliableOffset, testName + " " + position + " left" );
+							equal( ui.helper.height() - ( event.clientY - ui.offset.top ), testData.y - testHelper.unreliableOffset, testName + " " + position + " top" );
+						} else {
+							equal( event.clientX - ui.offset.left, testData.x + testHelper.unreliableOffset, testName + " " + position + " left" );
+							equal( event.clientY - ui.offset.top, testData.y + testHelper.unreliableOffset, testName + " " + position + " top" );
+						}
+					}
+			});
+
+			element.draggable( "option", "cursorAt", false );
+			element.draggable( "option", "cursorAt", testData.cursorAt );
+
+			element.simulate( "drag", {
+				moves: 1,
+				dx: deltaX,
+				dy: deltaY
+			});
+		});
+	});
+});
+
+test( "disabled", function() {
+	expect( 6 );
+
+	var element = $( "#draggable1" ).draggable();
+
+	testHelper.shouldMove( element, "disabled: default" );
+
+	element.draggable( "option", "disabled", true );
+	testHelper.shouldNotDrag( element, "option: disabled true" );
+
+	element.draggable( "option", "disabled", false );
+	testHelper.shouldMove( element, "option: disabled false" );
+});
+
+test( "{ grid: [50, 50] }, relative", function() {
+	expect( 4 );
+
+	var element = $( "#draggable1" ).draggable({ grid: [ 50, 50 ] });
+	testHelper.testDrag( element, element, 24, 24, 0, 0, "grid: [50, 50] relative" );
+	testHelper.testDrag( element, element, 26, 25, 50, 50, "grid: [50, 50] relative" );
+});
+
+test( "{ grid: [50, 50] }, absolute", function() {
+	expect( 4 );
+
+	var element = $( "#draggable2" ).draggable({ grid: [ 50, 50 ] });
+	testHelper.testDrag( element, element, 24, 24, 0, 0, "grid: [50, 50] absolute" );
+	testHelper.testDrag( element, element, 26, 25, 50, 50, "grid: [50, 50] absolute" );
+});
+
+test( "grid, switching after initialization", function() {
+	expect( 8 );
+
+	var element = $( "#draggable1" ).draggable();
+
+	// Forward
+	testHelper.testDrag( element, element, 24, 24, 24, 24, "grid: default" );
+	testHelper.testDrag( element, element, 0, 0, 0, 0, "grid: default" );
+
+	element.draggable( "option", "grid", [ 50, 50 ] );
+
+	testHelper.testDrag( element, element, 24, 24, 0, 0, "grid: [50, 50] as option" );
+	testHelper.testDrag( element, element, 26, 25, 50, 50, "grid: [50, 50] as option" );
+});
+
+test( "{ handle: 'span' }", function() {
+	expect( 6 );
+
+	var element = $( "#draggable2" ).draggable({ handle: "span" });
+
+	testHelper.shouldMove( element, "handle: span", "#draggable2 span");
+	testHelper.shouldMove( element, "handle: span child", "#draggable2 span em" );
+	testHelper.shouldNotDrag( element, "handle: span element" );
+});
+
+test( "handle, default, switching after initialization", function() {
+	expect( 12 );
+
+	var element = $( "#draggable2" ).draggable();
+
+	testHelper.shouldMove( element, "handle: default, element dragged" );
+	testHelper.shouldMove( element, "handle: default, span dragged", "#draggable2 span" );
+
+	// Switch
+	element.draggable( "option", "handle", "span" );
+	testHelper.shouldNotDrag( element, "handle: span as option, element dragged" );
+	testHelper.shouldMove( element, "handle: span as option, span dragged", "#draggable2 span" );
+
+	// And back
+	element.draggable( "option", "handle", false );
+	testHelper.shouldMove( element, "handle: false as option, element dragged" );
+	testHelper.shouldMove( element, "handle: false as option, span dragged", "#draggable2 span" );
+});
+
+test( "helper, default, switching after initialization", function() {
+	expect( 6 );
+
+	var element = $( "#draggable1" ).draggable();
+	testHelper.shouldMove( element, "helper: default" );
+
+	element.draggable( "option", "helper", "clone" );
+	testHelper.shouldMove( element, "helper: clone" );
+
+	element.draggable( "option", "helper", "original" );
+	testHelper.shouldMove( element, "helper: original" );
+});
+
+// http://bugs.jqueryui.com/ticket/9446
+// Draggable: helper function cannot emulate default behavior
+test( "helper, function returning original element", function() {
+	expect( 1 );
+
+	var element = $( "#draggable1" ).css( "position", "static" ).draggable({
+		helper: function() {
+			return this;
+		}
+	});
+
+	testHelper.testDragHelperOffset( element, 100, 100, 100, 100, "original element is draggable" );
+
+	element.simulate( "drag", {
+		dx: 100,
+		dy: 100
+	});
+});
+
+function testHelperPosition( scrollPositions, position, helper, scrollElements, scrollElementsTitle ) {
+	test( "{ helper: '" + helper + "' }, " + position + ", with scroll offset on " + scrollElementsTitle, function() {
+		expect( scrollPositions.length * 2 );
+
+		var i, j,
+			element = $( "#draggable1" ).css({ position: position, top: 0, left: 0 }).draggable({
+				helper: helper,
+				scroll: false
+			});
+
+		if ( scrollElements.length === 1 && scrollElements[ 0 ] === "#scrollParent" ) {
+			testHelper.setScrollable( "#main", false );
+			testHelper.setScrollable( "#scrollParent", true );
+		}
+
+		for ( j = 0; j < scrollPositions.length; j++ ) {
+			for ( i = 0; i < scrollElements.length; i++ ) {
+				testHelper.setScroll( scrollElements[ i ] );
+			}
+
+			testHelper.testScroll( element, scrollPositions[ j ] );
+
+			for ( i = 0; i < scrollElements.length; i++ ) {
+				testHelper.restoreScroll( scrollElements[ i ] );
+			}
+		}
+
+		if ( scrollElements.length === 1 && scrollElements[ 1 ] === "#scrollParent" ) {
+			testHelper.setScrollable( "#main", true );
+			testHelper.setScrollable( "#scrollParent", false );
+		}
+	});
+}
+
+(function() {
+	var scrollElementsMap = {
+			"no elements": [],
+			"parent": [ "#main" ],
+			"root": [ document ],
+			"parent and root": [ "#main", document ],
+			"grandparent": [ "#scrollParent" ]
+		},
+		positions = [ "absolute", "fixed", "relative", "static" ],
+		helpers = [ "original", "clone" ],
+		// static is not an option here since the fixture is in an absolute container
+		scrollPositions = [ "relative", "absolute", "fixed" ];
+
+	$.each( helpers, function() {
+		var helper = this;
+		$.each( positions, function() {
+			var position = this;
+			$.each( scrollElementsMap, function( scrollElementsTitle, scrollElements ) {
+				testHelperPosition( scrollPositions, position, helper, scrollElements, scrollElementsTitle );
+			});
+		});
+	});
+})();
+
+test( "{ opacity: 0.5 }", function() {
+	expect( 1 );
+
+	var opacity = null,
+		element = $( "#draggable2" ).draggable({
+			opacity: 0.5,
+			start: function() {
+				opacity = $(this).css( "opacity" );
+			}
+		});
+
+	element.simulate( "drag", {
+		dx: -1,
+		dy: -1
+	});
+
+	equal( opacity, 0.5, "start callback: opacity is" );
+});
+
+test( "opacity, default, switching after initialization", function() {
+	expect( 3 );
+
+	var opacity = null,
+		element = $( "#draggable2" ).draggable({
+			start: function() {
+				opacity = $(this).css( "opacity" );
+			}
+		});
+
+	testHelper.move( element, 1, 1 );
+	equal( opacity, 1 );
+
+	element.draggable( "option", "opacity", 0.5 );
+	testHelper.move( element, 2, 1 );
+	equal( opacity, 0.5 );
+
+	element.draggable( "option", "opacity", false );
+	testHelper.move( element, 3, 1 );
+	equal( opacity, 1 );
+});
+
+asyncTest( "revert and revertDuration", function() {
+	expect( 7 );
+
+	var element = $( "#draggable2" ).draggable({
+		revert: true,
+		revertDuration: 0
+	});
+	testHelper.shouldMovePositionButNotOffset( element, "revert: true, revertDuration: 0 should revert immediately" );
+
+	$( "#draggable2" ).draggable( "option", "revert", "invalid" );
+	testHelper.shouldMovePositionButNotOffset( element, "revert: invalid, revertDuration: 0 should revert immediately" );
+
+	$( "#draggable2" ).draggable( "option", "revert", false );
+	testHelper.shouldMove( element, "revert: false should allow movement" );
+
+	$( "#draggable2" ).draggable( "option", {
+		revert: true,
+		revertDuration: 200,
+		stop: function() {
+			start();
+		}
+	});
+
+	// animation are async, so test for it asynchronously
+	testHelper.move( element, 50, 50 );
+	setTimeout( function() {
+		ok( $( "#draggable2" ).is( ":animated" ), "revert: true with revertDuration should animate" );
+	});
+});
+
+test( "revert: valid", function() {
+	expect( 2 );
+
+	var element = $( "#draggable2" ).draggable({
+			revert: "valid",
+			revertDuration: 0
+		});
+
+	$( "#droppable" ).droppable();
+
+	testHelper.shouldMovePositionButNotOffset( element, "revert: valid reverts when dropped on a droppable" );
+});
+
+test( "scope", function() {
+	expect( 4 );
+
+	var element = $( "#draggable2" ).draggable({
+		scope: "tasks",
+		revert: "valid",
+		revertDuration: 0
+	});
+
+	$( "#droppable" ).droppable({ scope: "tasks" });
+
+	testHelper.shouldMovePositionButNotOffset( element, "revert: valid reverts when dropped on a droppable in scope" );
+
+	$( "#droppable" ).droppable( "destroy" ).droppable({ scope: "nottasks" });
+
+	testHelper.shouldMove( element, "revert: valid reverts when dropped on a droppable out of scope" );
+});
+
+test( "scroll, scrollSensitivity, and scrollSpeed", function() {
+	expect( 2 );
+
+	testHelper.setScrollable( "#main", false );
+
+	var currentScrollTop,
+		viewportHeight = $( window ).height(),
+		element = $( "#draggable1" ).draggable({ scroll: true }).appendTo( "#qunit-fixture" ),
+		scrollSensitivity = element.draggable( "option", "scrollSensitivity" ),
+		scrollSpeed = element.draggable( "option", "scrollSpeed" );
+
+	element.offset({
+		top: viewportHeight - scrollSensitivity - 1,
+		left: 1
+	});
+
+	$( element ).one( "drag", function() {
+		equal( $( window ).scrollTop(), 0, "scroll: true doesn't scroll when the element is dragged outside of scrollSensitivity" );
+	});
+
+	element.simulate( "drag", {
+		dx: 1,
+		y: viewportHeight - scrollSensitivity - 1,
+		moves: 1
+	});
+
+	element.draggable( "option", "scrollSensitivity", scrollSensitivity + 10 );
+
+	element.offset({
+		top: viewportHeight - scrollSensitivity - 1,
+		left: 1
+	});
+
+	currentScrollTop = $( window ).scrollTop();
+
+	$( element ).one( "drag", function() {
+		ok( $( window ).scrollTop() - currentScrollTop, scrollSpeed, "scroll: true scrolls when the element is dragged within scrollSensitivity" );
+	});
+
+	element.simulate( "drag", {
+		dx: 1,
+		y: viewportHeight - scrollSensitivity - 1,
+		moves: 1
+	});
+
+	testHelper.restoreScroll( document );
+});
+
+test( "scroll ignores containers that are overflow: hidden", function() {
+	expect( 2 );
+
+	var scrollParent = $( "#scrollParent" ),
+		element = $( "#draggable1" ).draggable().appendTo( scrollParent );
+
+	element.draggable( "option", "scroll", false );
+
+	element.simulate( "drag", {
+		dx: 1300,
+		dy: 1300
+	});
+
+	// IE8 natively scrolls when dragging an element inside a overflow:hidden
+	// container, so skip this test if native scroll occurs.
+	// Support: IE <9
+	if ( scrollParent.scrollTop() > 0 ) {
+		ok( true, "overflow:hidden container natively scrolls" );
+		ok( true, "overflow:hidden container natively scrolls" );
+		return;
+	}
+
+	element.css({ top: 0, left: 0 }).draggable( "option", "scroll", true );
+
+	element.simulate( "drag", {
+		dx: 1300,
+		dy: 1300
+	});
+
+	equal( scrollParent.scrollTop(), 0, "container doesn't scroll vertically" );
+	equal( scrollParent.scrollLeft(), 0, "container doesn't scroll horizontally" );
+});
+
+test( "#6817: auto scroll goes double distance when dragging", function( assert ) {
+	expect( 2 );
+
+	testHelper.restoreScroll( document );
+
+	var offsetBefore,
+		distance = 10,
+		viewportHeight = $( window ).height(),
+		element = $( "#draggable1" ).draggable({
+			scroll: true,
+			stop: function( e, ui ) {
+				equal( ui.offset.top, newY, "offset of item matches pointer position after scroll" );
+				// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
+				assert.close( ui.offset.top - offsetBefore.top, distance, 1, "offset of item only moves expected distance after scroll" );
+			}
+		}),
+		scrollSensitivity = element.draggable( "option", "scrollSensitivity" ),
+		oldY = viewportHeight - scrollSensitivity,
+		newY = oldY + distance;
+
+	element.offset({
+		top: oldY,
+		left: 1
+	});
+
+	offsetBefore = element.offset();
+
+	element.simulate( "drag", {
+		handle: "corner",
+		dx: 1,
+		y: newY,
+		moves: 1
+	});
+
+	testHelper.restoreScroll( document );
+});
+
+test( "snap, snapMode, and snapTolerance", function( assert ) {
+	expect( 10 );
+
+	var newX, newY,
+		snapTolerance = 15,
+		element = $( "#draggable1" ).draggable({
+			snap: true,
+			scroll: false,
+			snapMode: "both",
+			snapTolerance: snapTolerance
+		}),
+		element2 = $( "#draggable2" ).draggable();
+
+	// http://bugs.jqueryui.com/ticket/9724
+	// Draggable: Snapping coordinates thrown off by margin on draggable
+	element.css( "margin", "3px" );
+
+	element.offset({
+		top: 1,
+		left: 1
+	});
+
+	newX = element2.offset().left - element.outerWidth() - snapTolerance - 2;
+	newY = element2.offset().top;
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
+	assert.close( element.offset().left, newX, 1, "doesn't snap outside the snapTolerance" );
+	assert.close( element.offset().top, newY, 1, "doesn't snap outside the snapTolerance" );
+
+	newX += 3;
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps inside the snapTolerance" );
+
+	element.draggable( "option", "snap", "#draggable2" );
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps based on selector" );
+
+	element.draggable( "option", "snap", "#draggable3" );
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap based on invalid selector" );
+
+	element.draggable( "option", "snap", true );
+	element.draggable( "option", "snapTolerance", snapTolerance - 2 );
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap outside the modified snapTolerance" );
+
+	element.draggable( "option", "snapTolerance", snapTolerance );
+	element.draggable( "option", "snapMode", "inner" );
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap inside the outer snapTolerance area when snapMode is inner" );
+
+	newX = element2.offset().left - snapTolerance - 1;
+	newY = element2.offset().top;
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap inside the outer snapTolerance area when snapMode is inner" );
+
+	newX++;
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps inside the inner snapTolerance area when snapMode is inner" );
+
+	element.draggable( "option", "snapMode", "outer" );
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap on the inner snapTolerance area when snapMode is outer" );
+});
+
+test( "#8459: element can snap to an element that was removed during drag", function( assert ) {
+	expect( 2 );
+
+	var newX, newY,
+		snapTolerance = 15,
+		element = $( "#draggable1" ).draggable({
+			snap: true,
+			scroll: false,
+			snapMode: "both",
+			snapTolerance: snapTolerance,
+			start: function() {
+				element2.remove();
+			}
+		}),
+		element2 = $( "#draggable2" ).draggable();
+
+	element.offset({
+		top: 1,
+		left: 1
+	});
+
+	newX = element2.offset().left - element.outerWidth() - snapTolerance + 1;
+	newY = element2.offset().top;
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
+	if ( testHelper.unreliableContains ) {
+		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
+		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
+	} else {
+		// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
+		assert.close( element.offset().left, newX, 1, "doesn't snap to a removed element" );
+		assert.close( element.offset().top, newY, 1, "doesn't snap to a removed element" );
+	}
+});
+
+test( "#8165: Snapping large rectangles to small rectangles doesn't snap properly", function() {
+	expect( 1 );
+
+	var snapTolerance = 20,
+		y = 1,
+		element = $( "#draggable1" )
+			.css({
+				width: "50px",
+				height: "200px"
+			}).offset({
+				top: y,
+				left: 1
+			}),
+		element2 = $( "#draggable2" )
+			.css({
+				width: "50px",
+				height: "50px"
+			}).offset({
+				top: y + snapTolerance + 1,
+				left: 200
+			}),
+		newX = element2.offset().left - element.outerWidth() - snapTolerance + 1;
+
+	$( "#draggable1, #draggable2" ).draggable({
+		snap: true,
+		snapTolerance: snapTolerance
+	});
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		moves: 1
+	});
+
+	notDeepEqual( element.offset(), { top: y, left: newX }, "snaps even if only a side (not a corner) is inside the snapTolerance" );
+});
+
+test( "stack", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).draggable({
+			stack: "#draggable1, #draggable2"
+		}),
+		element2 = $( "#draggable2" ).draggable({
+			stack: "#draggable1, #draggable2"
+		});
+
+	testHelper.move( element, 1, 1 );
+	equal( element.css( "zIndex" ), "2", "stack increments zIndex correctly" );
+
+	testHelper.move( element2, 1, 1 );
+	equal( element2.css( "zIndex" ), "3", "stack increments zIndex correctly" );
+});
+
+test( "{ zIndex: 10 }", function() {
+	expect( 1 );
+
+	var actual,
+		expected = 10,
+		element = $( "#draggable2" ).draggable({
+			zIndex: expected,
+			start: function() {
+				actual = $(this).css( "zIndex" );
+			}
+		});
+
+	element.simulate( "drag", {
+		dx: -1,
+		dy: -1
+	});
+
+	equal( actual, expected, "start callback: zIndex is" );
+
+});
+
+test( "zIndex, default, switching after initialization", function() {
+
+	expect( 3 );
+
+	var zindex = null,
+		element = $( "#draggable2" ).draggable({
+			start: function() {
+				zindex = $(this).css( "z-index" );
+			}
+		});
+
+	element.css( "z-index", 1 );
+
+	testHelper.move( element, 1, 1 );
+	equal( zindex, 1 );
+
+	element.draggable( "option", "zIndex", 5 );
+	testHelper.move( element, 2, 1 );
+	equal( zindex, 5 );
+
+	element.draggable( "option", "zIndex", false );
+	testHelper.move( element, 3, 1 );
+	equal( zindex, 1 );
+
+});
+
+test( "iframeFix", function() {
+	expect( 5 );
+
+	var element = $( "<div>" ).appendTo( "#qunit-fixture" ).draggable({ iframeFix: true }),
+		element2 = $( "<div>" ).appendTo( "#qunit-fixture" ).draggable({ iframeFix: ".iframe" }),
+		iframe = $( "<iframe>" ).appendTo( element );
+
+	element2
+		.append( "<iframe class='iframe'></iframe>" )
+		.append( "<iframe>" );
+
+	iframe.css({
+		width: 1,
+		height: 1
+	});
+
+	element.one( "drag", function() {
+		var div = $( this ).children().not( "iframe" );
+		// http://bugs.jqueryui.com/ticket/9671
+		// iframeFix doesn't handle iframes that move
+		equal( div.length, 1, "blocking div added as sibling" );
+		equal( div.outerWidth(), iframe.outerWidth(), "blocking div is wide enough" );
+		equal( div.outerHeight(), iframe.outerHeight(), "blocking div is tall enough" );
+		deepEqual( div.offset(), iframe.offset(), "blocking div is tall enough" );
+	});
+
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+
+	element2.one( "drag", function() {
+		var div = $( this ).children().not( "iframe" );
+		equal( div.length, 1, "blocking div added as sibling only to matching selector" );
+	});
+
+	element2.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+});
+
+} );
diff --git a/tests/unit/droppable/common-deprecated.js b/tests/unit/droppable/common-deprecated.js
new file mode 100644
index 000000000..9d2f6c6b6
--- /dev/null
+++ b/tests/unit/droppable/common-deprecated.js
@@ -0,0 +1,28 @@
+define( [
+	"lib/common",
+	"ui/droppable"
+], function( common ) {
+
+common.testWidget( "droppable", {
+	defaults: {
+		accept: "*",
+		activeClass: false,
+		addClasses: true,
+		classes: {},
+		disabled: false,
+		greedy: false,
+		hoverClass: false,
+		scope: "default",
+		tolerance: "intersect",
+
+		// callbacks
+		activate: null,
+		create: null,
+		deactivate: null,
+		drop: null,
+		out: null,
+		over: null
+	}
+});
+
+} );
diff --git a/tests/unit/droppable/common.js b/tests/unit/droppable/common.js
new file mode 100644
index 000000000..ef8e11692
--- /dev/null
+++ b/tests/unit/droppable/common.js
@@ -0,0 +1,26 @@
+define( [
+	"lib/common",
+	"ui/droppable"
+], function( common ) {
+
+common.testWidget( "droppable", {
+	defaults: {
+		accept: "*",
+		addClasses: true,
+		classes: {},
+		disabled: false,
+		greedy: false,
+		scope: "default",
+		tolerance: "intersect",
+
+		// callbacks
+		activate: null,
+		create: null,
+		deactivate: null,
+		drop: null,
+		out: null,
+		over: null
+	}
+});
+
+} );
diff --git a/tests/unit/droppable/core.js b/tests/unit/droppable/core.js
new file mode 100644
index 000000000..43608353d
--- /dev/null
+++ b/tests/unit/droppable/core.js
@@ -0,0 +1,29 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/droppable"
+], function( $, testHelper ) {
+
+module("droppable: core");
+
+test("element types", function() {
+	var typeNames = ("p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form" +
+		",table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr" +
+		",acronym,code,samp,kbd,var,img,hr" +
+		",input,button,label,select,iframe").split(",");
+
+	expect( typeNames.length );
+
+	$.each(typeNames, function(i) {
+		var typeName = typeNames[i],
+			el = $(document.createElement(typeName)).appendTo("body");
+
+		(typeName === "table" && el.append("<tr><td>content</td></tr>"));
+		el.droppable();
+		testHelper.shouldDrop();
+		el.droppable("destroy");
+		el.remove();
+	});
+});
+
+} );
diff --git a/tests/unit/droppable/deprecated.html b/tests/unit/droppable/deprecated.html
new file mode 100644
index 000000000..e47b41c6b
--- /dev/null
+++ b/tests/unit/droppable/deprecated.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Droppable Test Suite</title>
+
+	<script src="../../lib/css.js" data-modules="core"></script>
+	<script src="../../lib/bootstrap.js" data-widget="droppable" data-deprecated="true"></script>
+</head>
+<body>
+
+<div id="qunit"></div>
+<div id="qunit-fixture">
+
+<div id="draggable1" style="width: 25px; height: 25px;">Draggable</div>
+<div id="droppable1" style="width: 100px; height: 100px;">Droppable</div>
+<div id="droppable2" style="width: 100px; height: 100px;">Droppable</div>
+<div style='width:1000px;height:1000px;'>&nbsp;</div>
+
+</div>
+</body>
+</html>
diff --git a/tests/unit/droppable/deprecated.js b/tests/unit/droppable/deprecated.js
new file mode 100644
index 000000000..3931f5f06
--- /dev/null
+++ b/tests/unit/droppable/deprecated.js
@@ -0,0 +1 @@
+define( function() {} );
diff --git a/tests/unit/droppable/droppable_common.js b/tests/unit/droppable/droppable_common.js
deleted file mode 100644
index ef8e11692..000000000
--- a/tests/unit/droppable/droppable_common.js
+++ /dev/null
@@ -1,26 +0,0 @@
-define( [
-	"lib/common",
-	"ui/droppable"
-], function( common ) {
-
-common.testWidget( "droppable", {
-	defaults: {
-		accept: "*",
-		addClasses: true,
-		classes: {},
-		disabled: false,
-		greedy: false,
-		scope: "default",
-		tolerance: "intersect",
-
-		// callbacks
-		activate: null,
-		create: null,
-		deactivate: null,
-		drop: null,
-		out: null,
-		over: null
-	}
-});
-
-} );
diff --git a/tests/unit/droppable/droppable_common_deprecated.js b/tests/unit/droppable/droppable_common_deprecated.js
deleted file mode 100644
index 9d2f6c6b6..000000000
--- a/tests/unit/droppable/droppable_common_deprecated.js
+++ /dev/null
@@ -1,28 +0,0 @@
-define( [
-	"lib/common",
-	"ui/droppable"
-], function( common ) {
-
-common.testWidget( "droppable", {
-	defaults: {
-		accept: "*",
-		activeClass: false,
-		addClasses: true,
-		classes: {},
-		disabled: false,
-		greedy: false,
-		hoverClass: false,
-		scope: "default",
-		tolerance: "intersect",
-
-		// callbacks
-		activate: null,
-		create: null,
-		deactivate: null,
-		drop: null,
-		out: null,
-		over: null
-	}
-});
-
-} );
diff --git a/tests/unit/droppable/droppable_core.js b/tests/unit/droppable/droppable_core.js
deleted file mode 100644
index 25d052a59..000000000
--- a/tests/unit/droppable/droppable_core.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define( [
-	"jquery",
-	"./droppable_test_helpers",
-	"ui/droppable"
-], function( $, testHelper ) {
-
-module("droppable: core");
-
-test("element types", function() {
-	var typeNames = ("p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form" +
-		",table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr" +
-		",acronym,code,samp,kbd,var,img,hr" +
-		",input,button,label,select,iframe").split(",");
-
-	expect( typeNames.length );
-
-	$.each(typeNames, function(i) {
-		var typeName = typeNames[i],
-			el = $(document.createElement(typeName)).appendTo("body");
-
-		(typeName === "table" && el.append("<tr><td>content</td></tr>"));
-		el.droppable();
-		testHelper.shouldDrop();
-		el.droppable("destroy");
-		el.remove();
-	});
-});
-
-} );
diff --git a/tests/unit/droppable/droppable_deprecated.html b/tests/unit/droppable/droppable_deprecated.html
deleted file mode 100644
index e47b41c6b..000000000
--- a/tests/unit/droppable/droppable_deprecated.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>jQuery UI Droppable Test Suite</title>
-
-	<script src="../../lib/css.js" data-modules="core"></script>
-	<script src="../../lib/bootstrap.js" data-widget="droppable" data-deprecated="true"></script>
-</head>
-<body>
-
-<div id="qunit"></div>
-<div id="qunit-fixture">
-
-<div id="draggable1" style="width: 25px; height: 25px;">Draggable</div>
-<div id="droppable1" style="width: 100px; height: 100px;">Droppable</div>
-<div id="droppable2" style="width: 100px; height: 100px;">Droppable</div>
-<div style='width:1000px;height:1000px;'>&nbsp;</div>
-
-</div>
-</body>
-</html>
diff --git a/tests/unit/droppable/droppable_deprecated.js b/tests/unit/droppable/droppable_deprecated.js
deleted file mode 100644
index 3931f5f06..000000000
--- a/tests/unit/droppable/droppable_deprecated.js
+++ /dev/null
@@ -1 +0,0 @@
-define( function() {} );
diff --git a/tests/unit/droppable/droppable_events.js b/tests/unit/droppable/droppable_events.js
deleted file mode 100644
index a60d9292e..000000000
--- a/tests/unit/droppable/droppable_events.js
+++ /dev/null
@@ -1,64 +0,0 @@
-define( [
-	"jquery",
-	"ui/droppable"
-], function( $ ) {
-
-module( "droppable: events" );
-
-test( "droppable destruction/recreation on drop event", function( assert ) {
-	expect( 1 );
-
-	var config = {
-			activeClass: "active",
-			drop: function() {
-				var element = $( this ),
-					newDroppable = $( "<div>" )
-						.css({ width: 100, height: 100 })
-						.text( "Droppable" );
-				element.after( newDroppable );
-				element.remove();
-				newDroppable.droppable( config );
-			}
-		},
-
-		draggable = $( "#draggable1" ).draggable(),
-		droppable1 = $( "#droppable1" ).droppable( config ),
-		droppable2 = $( "#droppable2" ).droppable( config ),
-
-		droppableOffset = droppable1.offset(),
-		draggableOffset = draggable.offset(),
-		dx = droppableOffset.left - draggableOffset.left,
-		dy = droppableOffset.top - draggableOffset.top;
-
-	draggable.simulate( "drag", {
-		dx: dx,
-		dy: dy
-	});
-
-	assert.lacksClasses( droppable2, "active", "subsequent droppable no longer active" );
-});
-
-// todo: comment the following in when ready to actually test
-/*
-test("activate", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-
-test("deactivate", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-
-test("over", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-
-test("out", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-
-test("drop", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-*/
-
-} );
diff --git a/tests/unit/droppable/droppable_methods.js b/tests/unit/droppable/droppable_methods.js
deleted file mode 100644
index 816fed0ec..000000000
--- a/tests/unit/droppable/droppable_methods.js
+++ /dev/null
@@ -1,92 +0,0 @@
-define( [
-	"jquery",
-	"./droppable_test_helpers",
-	"ui/droppable"
-], function( $, testHelper ) {
-
-module("droppable: methods");
-
-test("init", function() {
-	expect( 5 );
-
-	$("<div></div>").appendTo("body").droppable().remove();
-	ok(true, ".droppable() called on element");
-
-	$([]).droppable();
-	ok(true, ".droppable() called on empty collection");
-
-	$("<div></div>").droppable();
-	ok(true, ".droppable() called on disconnected DOMElement");
-
-	$("<div></div>").droppable().droppable("option", "foo");
-	ok(true, "arbitrary option getter after init");
-
-	$("<div></div>").droppable().droppable("option", "foo", "bar");
-	ok(true, "arbitrary option setter after init");
-});
-
-test("destroy", function() {
-	expect( 4 );
-
-	$("<div></div>").appendTo("body").droppable().droppable("destroy").remove();
-	ok(true, ".droppable('destroy') called on element");
-
-	$([]).droppable().droppable("destroy");
-	ok(true, ".droppable('destroy') called on empty collection");
-
-	$("<div></div>").droppable().droppable("destroy");
-	ok(true, ".droppable('destroy') called on disconnected DOMElement");
-
-	var expected = $("<div></div>").droppable(),
-		actual = expected.droppable("destroy");
-	equal(actual, expected, "destroy is chainable");
-});
-
-test("enable", function() {
-	expect(7);
-
-	var el, expected, actual;
-
-	el = $("#droppable1").droppable({ disabled: true });
-	testHelper.shouldNotDrop();
-	el.droppable("enable");
-	testHelper.shouldDrop();
-	equal(el.droppable("option", "disabled"), false, "disabled option getter");
-	el.droppable("destroy");
-	el.droppable({ disabled: true });
-	testHelper.shouldNotDrop();
-	el.droppable("option", "disabled", false);
-	equal(el.droppable("option", "disabled"), false, "disabled option setter");
-	testHelper.shouldDrop();
-
-	expected = $("<div></div>").droppable(),
-	actual = expected.droppable("enable");
-	equal(actual, expected, "enable is chainable");
-});
-
-test( "disable", function( assert ) {
-	expect( 10 );
-
-	var actual, expected,
-		element = $( "#droppable1" ).droppable({ disabled: false });
-
-	testHelper.shouldDrop();
-	element.droppable( "disable" );
-	testHelper.shouldNotDrop();
-	equal( element.droppable( "option", "disabled" ), true, "disabled option getter" );
-	element.droppable( "destroy" );
-	element.droppable({ disabled: false });
-	testHelper.shouldDrop();
-	element.droppable( "option", "disabled", true );
-	assert.lacksClasses( element.droppable( "widget" ), "ui-state-disabled" );
-	ok( !element.droppable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
-	assert.hasClasses( element.droppable( "widget" ), "ui-droppable-disabled" );
-	equal( element.droppable( "option", "disabled" ), true, "disabled option setter" );
-	testHelper.shouldNotDrop();
-
-	expected = $( "<div></div>" ).droppable();
-	actual = expected.droppable( "disable" );
-	equal( actual, expected, "disable is chainable" );
-});
-
-} );
diff --git a/tests/unit/droppable/droppable_options.js b/tests/unit/droppable/droppable_options.js
deleted file mode 100644
index f2d1757c2..000000000
--- a/tests/unit/droppable/droppable_options.js
+++ /dev/null
@@ -1,205 +0,0 @@
-define( [
-	"jquery",
-	"ui/droppable"
-], function( $ ) {
-
-module( "droppable: options" );
-
-/*
-test( "{ accept '*' }, default ", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-
-test( "{ accept: Selector }", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-
-test( "{ accept: function(draggable) }", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-
-test( "activeClass", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-*/
-test( "{ addClasses: true }, default", function( assert ) {
-	expect( 1 );
-	var el = $( "<div />" ).droppable({ addClasses: true });
-	assert.hasClasses( el, "ui-droppable" );
-	el.droppable( "destroy" );
-});
-
-test( "{ addClasses: false }", function( assert ) {
-	expect( 1 );
-	var el = $( "<div />" ).droppable({ addClasses: false });
-
-	assert.lacksClasses( el, "ui-droppable" );
-	el.droppable( "destroy" );
-});
-
-test( "scope", function() {
-	expect( 4 );
-	var droppableOffset, draggableOffset, oldDraggableOffset, dx, dy,
-		draggable1 = $( "<div />" ).appendTo( "#qunit-fixture" ).draggable({ revert: "invalid" }),
-		draggable2 = $( "<div />" ).appendTo( "#qunit-fixture" ).droppable(),
-		droppable = $( "<div />" ).appendTo( "#qunit-fixture" ).droppable(),
-		newScope = "test";
-
-	draggable1.draggable( "option", "scope", newScope );
-	droppable.droppable( "option", "scope", newScope );
-
-	// Test that droppable accepts draggable with new scope.
-	droppableOffset = droppable.offset();
-	draggableOffset = draggable1.offset();
-	dx = droppableOffset.left - draggableOffset.left;
-	dy = droppableOffset.top - draggableOffset.top;
-
-	draggable1.simulate( "drag", {
-		dx: dx,
-		dy: dy
-	});
-
-	draggableOffset = draggable1.offset();
-	equal( draggableOffset.left, droppableOffset.left );
-	equal( draggableOffset.top, droppableOffset.top );
-
-	// Test that droppable doesn't accept draggable with old scope.
-	draggableOffset = draggable2.offset();
-	dx = droppableOffset.left - draggableOffset.left;
-	dy = droppableOffset.top - draggableOffset.top;
-	oldDraggableOffset = draggableOffset;
-
-	draggable2.simulate( "drag", {
-		dx: dx,
-		dy: dy
-	});
-
-	draggableOffset = draggable2.offset();
-	equal( draggableOffset.left, oldDraggableOffset.left );
-	equal( draggableOffset.top, oldDraggableOffset.top );
-});
-/*
-test( "greedy", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-
-test( "hoverClass", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-
-test( "tolerance, fit", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-*/
-
-test( "tolerance, intersect", function() {
-	expect( 2 );
-
-	var draggable, droppable,
-		dataset = [
-			[ 0, 0, false, "too far up and left" ],
-			[ 6, 0, false, "too far up" ],
-			[ 0, 6, false, "too far left" ],
-			[ 6, 6, true, "top left corner" ],
-			[ 14, 14, true, "bottom right corner" ],
-			[ 15, 6, false, "too far right" ],
-			[ 6, 15, false, "too far down" ],
-			[ 15, 15, false, "too far down and right" ]
-		];
-
-	draggable = $( "<div />" )
-		.appendTo( "#qunit-fixture" )
-		.css({
-			width: 10,
-			height: 10,
-			position: "absolute",
-
-			// http://bugs.jqueryui.com/ticket/6876
-			// Droppable: droppable region is offset by draggables margin
-			marginTop: 3,
-			marginLeft: 3
-		})
-		.draggable();
-
-	droppable = $( "<div />" )
-		.appendTo( "#qunit-fixture" )
-		.css({ width: 10, height: 10, position: "absolute", top: 13, left: 13 })
-		.droppable({ tolerance: "intersect" });
-
-	$.each( dataset, function() {
-		var data = this;
-
-		draggable.css({
-			top: 0,
-			left: 0
-		});
-
-		droppable.unbind( "drop" ).bind( "drop", function() {
-			equal( true, data[ 2 ], data[ 3 ] );
-		});
-
-		$( draggable ).simulate( "drag", {
-			dx: data[ 0 ],
-			dy: data[ 1 ]
-		});
-	});
-});
-
-test( "tolerance, pointer", function() {
-	expect( 3 );
-
-	var draggable, droppable,
-		dataset = [
-			[ -1, -1, false, "too far up and left" ],
-			[ -1, 0, false, "too far left" ],
-			[ 0, -1, false, "too far up" ],
-			[ 0, 0, true, "top left corner" ],
-			[ 9, 9, true, "bottom right corner" ],
-			[ 10, 9, false, "too far right" ],
-			[ 9, 10, false, "too far down" ],
-			[ 10, 10, false, "too far down and right" ]
-		];
-
-	draggable = $( "<div />" )
-		.appendTo( "#qunit-fixture" )
-		.css({ width: 10, height: 10, position: "absolute" })
-		.draggable();
-
-	droppable = $( "<div />" )
-		.appendTo( "#qunit-fixture" )
-		.css({ width: 10, height: 10, position: "absolute", top: 5, left: 5 })
-		.droppable({ tolerance: "pointer" });
-
-	$.each( dataset, function() {
-		var data = this;
-
-		droppable.unbind( "drop" ).bind( "drop", function() {
-			equal( true, data[ 2 ], data[ 3 ] );
-		});
-
-		$( draggable ).simulate( "drag", {
-			dx: ( data[ 0 ] - $( draggable ).position().left ),
-			dy: ( data[ 1 ] - $( draggable ).position().top )
-		});
-	});
-
-	// http://bugs.jqueryui.com/ticket/4977 - tolerance, pointer - bug when pointer outside draggable
-	draggable.css({ top: 0, left: 0 }).draggable( "option", "axis", "x" );
-	droppable.css({ top: 15, left: 15 });
-
-	droppable.unbind( "drop" ).bind( "drop", function() {
-		ok( true, "drop fires as long as pointer is within droppable" );
-	});
-
-	$( draggable ).simulate( "drag", {
-		dx: 10,
-		dy: 10
-	});
-});
-
-/*
-test( "tolerance, touch", function() {
-	ok(false, 'missing test - untested code is broken code');
-});
-*/
-} );
diff --git a/tests/unit/droppable/droppable_test_helpers.js b/tests/unit/droppable/droppable_test_helpers.js
deleted file mode 100644
index 460fa1aa6..000000000
--- a/tests/unit/droppable/droppable_test_helpers.js
+++ /dev/null
@@ -1,18 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper"
-], function( $, helper ) {
-
-return $.extend( helper, {
-	shouldDrop: function() {
-		// todo: actually implement this
-		ok(true, "missing test - untested code is broken code");
-	},
-
-	shouldNotDrop: function() {
-		// todo: actually implement this
-		ok(true, "missing test - untested code is broken code");
-	}
-} );
-
-} );
diff --git a/tests/unit/droppable/events.js b/tests/unit/droppable/events.js
new file mode 100644
index 000000000..a60d9292e
--- /dev/null
+++ b/tests/unit/droppable/events.js
@@ -0,0 +1,64 @@
+define( [
+	"jquery",
+	"ui/droppable"
+], function( $ ) {
+
+module( "droppable: events" );
+
+test( "droppable destruction/recreation on drop event", function( assert ) {
+	expect( 1 );
+
+	var config = {
+			activeClass: "active",
+			drop: function() {
+				var element = $( this ),
+					newDroppable = $( "<div>" )
+						.css({ width: 100, height: 100 })
+						.text( "Droppable" );
+				element.after( newDroppable );
+				element.remove();
+				newDroppable.droppable( config );
+			}
+		},
+
+		draggable = $( "#draggable1" ).draggable(),
+		droppable1 = $( "#droppable1" ).droppable( config ),
+		droppable2 = $( "#droppable2" ).droppable( config ),
+
+		droppableOffset = droppable1.offset(),
+		draggableOffset = draggable.offset(),
+		dx = droppableOffset.left - draggableOffset.left,
+		dy = droppableOffset.top - draggableOffset.top;
+
+	draggable.simulate( "drag", {
+		dx: dx,
+		dy: dy
+	});
+
+	assert.lacksClasses( droppable2, "active", "subsequent droppable no longer active" );
+});
+
+// todo: comment the following in when ready to actually test
+/*
+test("activate", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+
+test("deactivate", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+
+test("over", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+
+test("out", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+
+test("drop", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+*/
+
+} );
diff --git a/tests/unit/droppable/helper.js b/tests/unit/droppable/helper.js
new file mode 100644
index 000000000..460fa1aa6
--- /dev/null
+++ b/tests/unit/droppable/helper.js
@@ -0,0 +1,18 @@
+define( [
+	"jquery",
+	"lib/helper"
+], function( $, helper ) {
+
+return $.extend( helper, {
+	shouldDrop: function() {
+		// todo: actually implement this
+		ok(true, "missing test - untested code is broken code");
+	},
+
+	shouldNotDrop: function() {
+		// todo: actually implement this
+		ok(true, "missing test - untested code is broken code");
+	}
+} );
+
+} );
diff --git a/tests/unit/droppable/methods.js b/tests/unit/droppable/methods.js
new file mode 100644
index 000000000..1c9bba023
--- /dev/null
+++ b/tests/unit/droppable/methods.js
@@ -0,0 +1,92 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/droppable"
+], function( $, testHelper ) {
+
+module("droppable: methods");
+
+test("init", function() {
+	expect( 5 );
+
+	$("<div></div>").appendTo("body").droppable().remove();
+	ok(true, ".droppable() called on element");
+
+	$([]).droppable();
+	ok(true, ".droppable() called on empty collection");
+
+	$("<div></div>").droppable();
+	ok(true, ".droppable() called on disconnected DOMElement");
+
+	$("<div></div>").droppable().droppable("option", "foo");
+	ok(true, "arbitrary option getter after init");
+
+	$("<div></div>").droppable().droppable("option", "foo", "bar");
+	ok(true, "arbitrary option setter after init");
+});
+
+test("destroy", function() {
+	expect( 4 );
+
+	$("<div></div>").appendTo("body").droppable().droppable("destroy").remove();
+	ok(true, ".droppable('destroy') called on element");
+
+	$([]).droppable().droppable("destroy");
+	ok(true, ".droppable('destroy') called on empty collection");
+
+	$("<div></div>").droppable().droppable("destroy");
+	ok(true, ".droppable('destroy') called on disconnected DOMElement");
+
+	var expected = $("<div></div>").droppable(),
+		actual = expected.droppable("destroy");
+	equal(actual, expected, "destroy is chainable");
+});
+
+test("enable", function() {
+	expect(7);
+
+	var el, expected, actual;
+
+	el = $("#droppable1").droppable({ disabled: true });
+	testHelper.shouldNotDrop();
+	el.droppable("enable");
+	testHelper.shouldDrop();
+	equal(el.droppable("option", "disabled"), false, "disabled option getter");
+	el.droppable("destroy");
+	el.droppable({ disabled: true });
+	testHelper.shouldNotDrop();
+	el.droppable("option", "disabled", false);
+	equal(el.droppable("option", "disabled"), false, "disabled option setter");
+	testHelper.shouldDrop();
+
+	expected = $("<div></div>").droppable(),
+	actual = expected.droppable("enable");
+	equal(actual, expected, "enable is chainable");
+});
+
+test( "disable", function( assert ) {
+	expect( 10 );
+
+	var actual, expected,
+		element = $( "#droppable1" ).droppable({ disabled: false });
+
+	testHelper.shouldDrop();
+	element.droppable( "disable" );
+	testHelper.shouldNotDrop();
+	equal( element.droppable( "option", "disabled" ), true, "disabled option getter" );
+	element.droppable( "destroy" );
+	element.droppable({ disabled: false });
+	testHelper.shouldDrop();
+	element.droppable( "option", "disabled", true );
+	assert.lacksClasses( element.droppable( "widget" ), "ui-state-disabled" );
+	ok( !element.droppable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
+	assert.hasClasses( element.droppable( "widget" ), "ui-droppable-disabled" );
+	equal( element.droppable( "option", "disabled" ), true, "disabled option setter" );
+	testHelper.shouldNotDrop();
+
+	expected = $( "<div></div>" ).droppable();
+	actual = expected.droppable( "disable" );
+	equal( actual, expected, "disable is chainable" );
+});
+
+} );
diff --git a/tests/unit/droppable/options.js b/tests/unit/droppable/options.js
new file mode 100644
index 000000000..f2d1757c2
--- /dev/null
+++ b/tests/unit/droppable/options.js
@@ -0,0 +1,205 @@
+define( [
+	"jquery",
+	"ui/droppable"
+], function( $ ) {
+
+module( "droppable: options" );
+
+/*
+test( "{ accept '*' }, default ", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+
+test( "{ accept: Selector }", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+
+test( "{ accept: function(draggable) }", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+
+test( "activeClass", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+*/
+test( "{ addClasses: true }, default", function( assert ) {
+	expect( 1 );
+	var el = $( "<div />" ).droppable({ addClasses: true });
+	assert.hasClasses( el, "ui-droppable" );
+	el.droppable( "destroy" );
+});
+
+test( "{ addClasses: false }", function( assert ) {
+	expect( 1 );
+	var el = $( "<div />" ).droppable({ addClasses: false });
+
+	assert.lacksClasses( el, "ui-droppable" );
+	el.droppable( "destroy" );
+});
+
+test( "scope", function() {
+	expect( 4 );
+	var droppableOffset, draggableOffset, oldDraggableOffset, dx, dy,
+		draggable1 = $( "<div />" ).appendTo( "#qunit-fixture" ).draggable({ revert: "invalid" }),
+		draggable2 = $( "<div />" ).appendTo( "#qunit-fixture" ).droppable(),
+		droppable = $( "<div />" ).appendTo( "#qunit-fixture" ).droppable(),
+		newScope = "test";
+
+	draggable1.draggable( "option", "scope", newScope );
+	droppable.droppable( "option", "scope", newScope );
+
+	// Test that droppable accepts draggable with new scope.
+	droppableOffset = droppable.offset();
+	draggableOffset = draggable1.offset();
+	dx = droppableOffset.left - draggableOffset.left;
+	dy = droppableOffset.top - draggableOffset.top;
+
+	draggable1.simulate( "drag", {
+		dx: dx,
+		dy: dy
+	});
+
+	draggableOffset = draggable1.offset();
+	equal( draggableOffset.left, droppableOffset.left );
+	equal( draggableOffset.top, droppableOffset.top );
+
+	// Test that droppable doesn't accept draggable with old scope.
+	draggableOffset = draggable2.offset();
+	dx = droppableOffset.left - draggableOffset.left;
+	dy = droppableOffset.top - draggableOffset.top;
+	oldDraggableOffset = draggableOffset;
+
+	draggable2.simulate( "drag", {
+		dx: dx,
+		dy: dy
+	});
+
+	draggableOffset = draggable2.offset();
+	equal( draggableOffset.left, oldDraggableOffset.left );
+	equal( draggableOffset.top, oldDraggableOffset.top );
+});
+/*
+test( "greedy", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+
+test( "hoverClass", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+
+test( "tolerance, fit", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+*/
+
+test( "tolerance, intersect", function() {
+	expect( 2 );
+
+	var draggable, droppable,
+		dataset = [
+			[ 0, 0, false, "too far up and left" ],
+			[ 6, 0, false, "too far up" ],
+			[ 0, 6, false, "too far left" ],
+			[ 6, 6, true, "top left corner" ],
+			[ 14, 14, true, "bottom right corner" ],
+			[ 15, 6, false, "too far right" ],
+			[ 6, 15, false, "too far down" ],
+			[ 15, 15, false, "too far down and right" ]
+		];
+
+	draggable = $( "<div />" )
+		.appendTo( "#qunit-fixture" )
+		.css({
+			width: 10,
+			height: 10,
+			position: "absolute",
+
+			// http://bugs.jqueryui.com/ticket/6876
+			// Droppable: droppable region is offset by draggables margin
+			marginTop: 3,
+			marginLeft: 3
+		})
+		.draggable();
+
+	droppable = $( "<div />" )
+		.appendTo( "#qunit-fixture" )
+		.css({ width: 10, height: 10, position: "absolute", top: 13, left: 13 })
+		.droppable({ tolerance: "intersect" });
+
+	$.each( dataset, function() {
+		var data = this;
+
+		draggable.css({
+			top: 0,
+			left: 0
+		});
+
+		droppable.unbind( "drop" ).bind( "drop", function() {
+			equal( true, data[ 2 ], data[ 3 ] );
+		});
+
+		$( draggable ).simulate( "drag", {
+			dx: data[ 0 ],
+			dy: data[ 1 ]
+		});
+	});
+});
+
+test( "tolerance, pointer", function() {
+	expect( 3 );
+
+	var draggable, droppable,
+		dataset = [
+			[ -1, -1, false, "too far up and left" ],
+			[ -1, 0, false, "too far left" ],
+			[ 0, -1, false, "too far up" ],
+			[ 0, 0, true, "top left corner" ],
+			[ 9, 9, true, "bottom right corner" ],
+			[ 10, 9, false, "too far right" ],
+			[ 9, 10, false, "too far down" ],
+			[ 10, 10, false, "too far down and right" ]
+		];
+
+	draggable = $( "<div />" )
+		.appendTo( "#qunit-fixture" )
+		.css({ width: 10, height: 10, position: "absolute" })
+		.draggable();
+
+	droppable = $( "<div />" )
+		.appendTo( "#qunit-fixture" )
+		.css({ width: 10, height: 10, position: "absolute", top: 5, left: 5 })
+		.droppable({ tolerance: "pointer" });
+
+	$.each( dataset, function() {
+		var data = this;
+
+		droppable.unbind( "drop" ).bind( "drop", function() {
+			equal( true, data[ 2 ], data[ 3 ] );
+		});
+
+		$( draggable ).simulate( "drag", {
+			dx: ( data[ 0 ] - $( draggable ).position().left ),
+			dy: ( data[ 1 ] - $( draggable ).position().top )
+		});
+	});
+
+	// http://bugs.jqueryui.com/ticket/4977 - tolerance, pointer - bug when pointer outside draggable
+	draggable.css({ top: 0, left: 0 }).draggable( "option", "axis", "x" );
+	droppable.css({ top: 15, left: 15 });
+
+	droppable.unbind( "drop" ).bind( "drop", function() {
+		ok( true, "drop fires as long as pointer is within droppable" );
+	});
+
+	$( draggable ).simulate( "drag", {
+		dx: 10,
+		dy: 10
+	});
+});
+
+/*
+test( "tolerance, touch", function() {
+	ok(false, 'missing test - untested code is broken code');
+});
+*/
+} );
diff --git a/tests/unit/effects/core.js b/tests/unit/effects/core.js
new file mode 100644
index 000000000..76fcaa062
--- /dev/null
+++ b/tests/unit/effects/core.js
@@ -0,0 +1,341 @@
+define( [
+	"jquery",
+	"lib/common",
+	"ui/effect",
+	"ui/effect-blind",
+	"ui/effect-bounce",
+	"ui/effect-clip",
+	"ui/effect-drop",
+	"ui/effect-explode",
+	"ui/effect-fade",
+	"ui/effect-fold",
+	"ui/effect-highlight",
+	"ui/effect-puff",
+	"ui/effect-pulsate",
+	"ui/effect-scale",
+	"ui/effect-shake",
+	"ui/effect-size",
+	"ui/effect-slide",
+	"ui/effect-transfer"
+], function( $, common ) {
+
+function present( value, array, message ) {
+	QUnit.push( jQuery.inArray( value, array ) !== -1, value, array, message );
+}
+
+function notPresent( value, array, message ) {
+	QUnit.push( jQuery.inArray( value, array ) === -1, value, array, message );
+}
+
+// minDuration is used for "short" animate tests where we are only concerned about the final
+var minDuration = 15,
+
+	// duration is used for "long" animates where we plan on testing properties during animation
+	duration = 200;
+
+module( "effects.core" );
+
+// TODO: test all signatures of .show(), .hide(), .toggle().
+// Look at core's signatures and UI's signatures.
+asyncTest( ".hide() with step", function() {
+	expect( 1 );
+	var element = $( "#elem" ),
+		step = function() {
+			ok( true, "step callback invoked" );
+			step = $.noop;
+		};
+
+	element.hide({
+		step: function() {
+			step();
+		},
+		complete: start
+	});
+});
+
+test( "Immediate Return Conditions", function() {
+	var hidden = $( "div.hidden" ),
+		count = 0;
+	expect( 3 );
+	hidden.hide( "blind", function() {
+		equal( ++count, 1, "Hide on hidden returned immediately" );
+	}).show().show( "blind", function() {
+		equal( ++count, 2, "Show on shown returned immediately" );
+	});
+	equal( ++count, 3, "Both Functions worked properly" );
+});
+
+test( ".hide() with hidden parent", function() {
+	expect( 1 );
+	var element = $( "div.hidden" ).children();
+	element.hide( "blind", function() {
+		equal( element.css( "display" ), "none", "display: none" );
+	});
+});
+
+asyncTest( "Parse of null for options", function() {
+	var hidden = $( "div.hidden" ),
+		count = 0;
+	expect( 1 );
+	hidden.show( "blind", null, 1, function() {
+		equal( ++count, 1, "null for options still works" );
+		start();
+	});
+});
+
+test( "removeClass", function() {
+	expect( 3 );
+
+	var element = $( "<div>" );
+	equal( "", element[ 0 ].className );
+	element.addClass( "destroyed" );
+	equal( "destroyed", element[ 0 ].className );
+	element.removeClass();
+	equal( "", element[ 0 ].className );
+});
+
+module( "effects.core: animateClass" );
+
+asyncTest( "animateClass works with borderStyle", function() {
+	var test = $("div.animateClass");
+	expect(3);
+	test.toggleClass("testAddBorder", minDuration, function() {
+		test.toggleClass("testAddBorder", minDuration, function() {
+			equal( test.css("borderLeftStyle"), "none", "None border set" );
+			start();
+		});
+		equal( test.css("borderLeftStyle"), "solid", "None border not immedately set" );
+	});
+	equal( test.css("borderLeftStyle"), "solid", "Solid border immedately set" );
+});
+
+asyncTest( "animateClass works with colors", function() {
+	var test = $("div.animateClass"),
+		oldStep = jQuery.fx.step.backgroundColor;
+
+	expect(2);
+
+	// we want to catch the first frame of animation
+	jQuery.fx.step.backgroundColor = function( fx ) {
+		oldStep.apply( this, arguments );
+
+		// make sure it has animated somewhere we can detect
+		if ( fx.pos > 255 / 2000 ) {
+			jQuery.fx.step.backgroundColor = oldStep;
+			notPresent( test.css("backgroundColor"),
+				[ "#000000", "#ffffff", "#000", "#fff", "rgb(0, 0, 0)", "rgb(255,255,255)" ],
+				"Color is not endpoints in middle." );
+			test.stop( true, true );
+		}
+	};
+
+	test.toggleClass("testChangeBackground", {
+		duration: 2000,
+		complete: function() {
+			present( test.css("backgroundColor"), [ "#ffffff", "#fff", "rgb(255, 255, 255)" ], "Color is final" );
+			start();
+		}
+	});
+});
+
+asyncTest( "animateClass calls step option", 1, function() {
+	var test = jQuery( "div.animateClass" ),
+		step = function() {
+			ok( true, "Step Function Called" );
+			test.stop();
+			start();
+			step = $.noop;
+		};
+	test.toggleClass( "testChangeBackground", {
+		step: function() {
+			step();
+		}
+	});
+});
+
+asyncTest( "animateClass works with children", 3, function() {
+	var animatedChild,
+		test = $("div.animateClass"),
+		h2 = test.find("h2");
+
+	test.toggleClass("testChildren", {
+		children: true,
+		duration: duration,
+		complete: function() {
+			equal( h2.css("fontSize"), "20px", "Text size is final during complete");
+			test.toggleClass("testChildren", {
+				duration: duration,
+				complete: function() {
+					equal( h2.css("fontSize"), "10px", "Text size revertted after class removed");
+
+					start();
+				},
+				step: function( val, fx ) {
+					if ( fx.elem === h2[ 0 ] ) {
+						ok( false, "Error - Animating property on h2" );
+					}
+				}
+			});
+		},
+		step: function( val, fx ) {
+			if ( fx.prop === "fontSize" && fx.elem === h2[ 0 ] && !animatedChild ) {
+				equal( fx.end, 20, "animating font size on child" );
+				animatedChild = true;
+			}
+		}
+	});
+});
+
+asyncTest( "animateClass clears style properties when stopped", function() {
+	var test = $("div.animateClass"),
+		style = test[0].style,
+		orig = style.cssText;
+
+	expect( 2 );
+
+	test.addClass( "testChangeBackground", duration );
+	notEqual( orig, style.cssText, "cssText is not the same after starting animation" );
+
+	test.stop( true, true );
+	equal( orig, $.trim( style.cssText ), "cssText is the same after stopping animation midway" );
+	start();
+});
+
+asyncTest( "animateClass: css and class changes during animation are not lost (#7106)",
+function( assert ) {
+	expect( 2 );
+	var test = $( "div.ticket7106" );
+
+	// ensure the class stays and that the css property stays
+	function animationComplete() {
+		assert.hasClasses( test, "testClass", "class change during animateClass was not lost" );
+		equal( test.height(), 100, "css change during animateClass was not lost" );
+		start();
+	}
+
+	// add a class and change a style property after starting an animated class
+	test.addClass( "animate", minDuration, animationComplete )
+		.addClass( "testClass" )
+		.height( 100 );
+});
+
+test( "createPlaceholder: only created for static or relative elements", function() {
+	expect( 4 );
+
+	ok( $.effects.createPlaceholder( $( ".relative" ) ).length, "placeholder created for relative element" );
+	ok( $.effects.createPlaceholder( $( ".static" ) ).length, "placeholder created for static element" );
+	ok( !$.effects.createPlaceholder( $( ".absolute" ) ), "placeholder not created for absolute element" );
+	ok( !$.effects.createPlaceholder( $( ".fixed" ) ), "placeholder not created for fixed element" );
+});
+
+test( "createPlaceholder: preserves layout affecting properties", function() {
+	expect( 7 );
+
+	var position = 5,
+		element = $( ".relative" ).css({
+			top: position,
+			left: position
+		}),
+		before = {
+			offset: element.offset(),
+			outerWidth: element.outerWidth( true ),
+			outerHeight: element.outerHeight( true ),
+			"float": element.css( "float" ),
+			position: element.position()
+		},
+		placeholder = $.effects.createPlaceholder( element );
+
+	// Placeholders are only placed to preserve the effect on layout. Considering
+	// top and left do not change layout, they are not preserved, which makes some
+	// of the math simpler in the implementation.
+	deepEqual( before.offset.top - position, placeholder.offset().top, "offset top preserved" );
+	deepEqual( before.offset.left - position, placeholder.offset().left, "offset left preserved" );
+	deepEqual( before.position.top - position, placeholder.position().top, "position top preserved" );
+	deepEqual( before.position.left - position, placeholder.position().left, "position left preserved" );
+
+	deepEqual( before[ "float" ], placeholder.css( "float" ), "float preserved" );
+	deepEqual( before.outerWidth, placeholder.outerWidth( true ), "width preserved" );
+	deepEqual( before.outerHeight, placeholder.outerHeight( true ), "height preserved" );
+});
+
+$.each( $.effects.effect, function( effect ) {
+	module( "effects." + effect );
+
+	common.testJshint( "effect-" + effect );
+
+	if ( effect === "transfer" ) {
+		return;
+	}
+	asyncTest( "show/hide", function() {
+		expect( 12 );
+		var hidden = $( "div.hidden" ),
+			count = 0,
+			test = 0;
+
+		function queueTest( fn ) {
+			count++;
+			var point = count;
+			return function( next ) {
+				test++;
+				equal( point, test, "Queue function fired in order" );
+				if ( fn ) {
+					fn();
+				} else {
+					setTimeout( next, minDuration );
+				}
+			};
+		}
+
+		function duringTest( fn ) {
+			return function( next ) {
+				setTimeout( fn );
+				next();
+			};
+		}
+
+		hidden
+			.queue( queueTest() )
+			.queue( duringTest(function() {
+				ok( hidden.is( ":animated" ),
+					"Hidden is seen as animated during .show(\"" + effect + "\", time)" );
+			}) )
+			.show( effect, minDuration, queueTest(function() {
+				equal( hidden.css( "display" ), "block",
+					"Hidden is shown after .show(\"" + effect + "\", time)" );
+				ok( !$( ".ui-effects-placeholder" ).length,
+					"No placeholder remains after .show(\"" + effect + "\", time)" );
+			}) )
+			.queue( queueTest() )
+			.queue( duringTest(function() {
+				ok( hidden.is( ":animated" ),
+					"Hidden is seen as animated during .hide(\"" + effect + "\", time)" );
+			}) )
+			.hide( effect, minDuration, queueTest(function() {
+				equal( hidden.css( "display" ), "none",
+					"Back to hidden after .hide(\"" + effect + "\", time)" );
+				ok( !$( ".ui-effects-placeholder" ).length,
+					"No placeholder remains after .hide(\"" + effect + "\", time)" );
+			}) )
+			.queue( queueTest(function() {
+				deepEqual( hidden.queue(), [ "inprogress" ], "Only the inprogress sentinel remains" );
+				start();
+			}) );
+	});
+
+	asyncTest( "relative width & height - properties are preserved", function() {
+		var test = $("div.relWidth.relHeight"),
+			width = test.width(), height = test.height(),
+			cssWidth = test[0].style.width, cssHeight = test[0].style.height;
+
+		expect( 4 );
+		test.toggle( effect, minDuration, function() {
+			equal( test[0].style.width, cssWidth, "Inline CSS Width has been reset after animation ended" );
+			equal( test[0].style.height, cssHeight, "Inline CSS Height has been rest after animation ended" );
+			start();
+		});
+		equal( test.width(), width, "Width is the same px after animation started" );
+		equal( test.height(), height, "Height is the same px after animation started" );
+	});
+});
+
+} );
diff --git a/tests/unit/effects/effects.html b/tests/unit/effects/effects.html
index d444d3853..91c31428c 100644
--- a/tests/unit/effects/effects.html
+++ b/tests/unit/effects/effects.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Effects Test Suite</title>
 
 	<script src="../../lib/css.js"></script>
-	<script src="../../lib/bootstrap.js" data-modules="effects_core effects_scale">
+	<script src="../../lib/bootstrap.js" data-modules="core scale">
 	</script>
 	<style>
 	#qunit-fixture {
diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
deleted file mode 100644
index 76fcaa062..000000000
--- a/tests/unit/effects/effects_core.js
+++ /dev/null
@@ -1,341 +0,0 @@
-define( [
-	"jquery",
-	"lib/common",
-	"ui/effect",
-	"ui/effect-blind",
-	"ui/effect-bounce",
-	"ui/effect-clip",
-	"ui/effect-drop",
-	"ui/effect-explode",
-	"ui/effect-fade",
-	"ui/effect-fold",
-	"ui/effect-highlight",
-	"ui/effect-puff",
-	"ui/effect-pulsate",
-	"ui/effect-scale",
-	"ui/effect-shake",
-	"ui/effect-size",
-	"ui/effect-slide",
-	"ui/effect-transfer"
-], function( $, common ) {
-
-function present( value, array, message ) {
-	QUnit.push( jQuery.inArray( value, array ) !== -1, value, array, message );
-}
-
-function notPresent( value, array, message ) {
-	QUnit.push( jQuery.inArray( value, array ) === -1, value, array, message );
-}
-
-// minDuration is used for "short" animate tests where we are only concerned about the final
-var minDuration = 15,
-
-	// duration is used for "long" animates where we plan on testing properties during animation
-	duration = 200;
-
-module( "effects.core" );
-
-// TODO: test all signatures of .show(), .hide(), .toggle().
-// Look at core's signatures and UI's signatures.
-asyncTest( ".hide() with step", function() {
-	expect( 1 );
-	var element = $( "#elem" ),
-		step = function() {
-			ok( true, "step callback invoked" );
-			step = $.noop;
-		};
-
-	element.hide({
-		step: function() {
-			step();
-		},
-		complete: start
-	});
-});
-
-test( "Immediate Return Conditions", function() {
-	var hidden = $( "div.hidden" ),
-		count = 0;
-	expect( 3 );
-	hidden.hide( "blind", function() {
-		equal( ++count, 1, "Hide on hidden returned immediately" );
-	}).show().show( "blind", function() {
-		equal( ++count, 2, "Show on shown returned immediately" );
-	});
-	equal( ++count, 3, "Both Functions worked properly" );
-});
-
-test( ".hide() with hidden parent", function() {
-	expect( 1 );
-	var element = $( "div.hidden" ).children();
-	element.hide( "blind", function() {
-		equal( element.css( "display" ), "none", "display: none" );
-	});
-});
-
-asyncTest( "Parse of null for options", function() {
-	var hidden = $( "div.hidden" ),
-		count = 0;
-	expect( 1 );
-	hidden.show( "blind", null, 1, function() {
-		equal( ++count, 1, "null for options still works" );
-		start();
-	});
-});
-
-test( "removeClass", function() {
-	expect( 3 );
-
-	var element = $( "<div>" );
-	equal( "", element[ 0 ].className );
-	element.addClass( "destroyed" );
-	equal( "destroyed", element[ 0 ].className );
-	element.removeClass();
-	equal( "", element[ 0 ].className );
-});
-
-module( "effects.core: animateClass" );
-
-asyncTest( "animateClass works with borderStyle", function() {
-	var test = $("div.animateClass");
-	expect(3);
-	test.toggleClass("testAddBorder", minDuration, function() {
-		test.toggleClass("testAddBorder", minDuration, function() {
-			equal( test.css("borderLeftStyle"), "none", "None border set" );
-			start();
-		});
-		equal( test.css("borderLeftStyle"), "solid", "None border not immedately set" );
-	});
-	equal( test.css("borderLeftStyle"), "solid", "Solid border immedately set" );
-});
-
-asyncTest( "animateClass works with colors", function() {
-	var test = $("div.animateClass"),
-		oldStep = jQuery.fx.step.backgroundColor;
-
-	expect(2);
-
-	// we want to catch the first frame of animation
-	jQuery.fx.step.backgroundColor = function( fx ) {
-		oldStep.apply( this, arguments );
-
-		// make sure it has animated somewhere we can detect
-		if ( fx.pos > 255 / 2000 ) {
-			jQuery.fx.step.backgroundColor = oldStep;
-			notPresent( test.css("backgroundColor"),
-				[ "#000000", "#ffffff", "#000", "#fff", "rgb(0, 0, 0)", "rgb(255,255,255)" ],
-				"Color is not endpoints in middle." );
-			test.stop( true, true );
-		}
-	};
-
-	test.toggleClass("testChangeBackground", {
-		duration: 2000,
-		complete: function() {
-			present( test.css("backgroundColor"), [ "#ffffff", "#fff", "rgb(255, 255, 255)" ], "Color is final" );
-			start();
-		}
-	});
-});
-
-asyncTest( "animateClass calls step option", 1, function() {
-	var test = jQuery( "div.animateClass" ),
-		step = function() {
-			ok( true, "Step Function Called" );
-			test.stop();
-			start();
-			step = $.noop;
-		};
-	test.toggleClass( "testChangeBackground", {
-		step: function() {
-			step();
-		}
-	});
-});
-
-asyncTest( "animateClass works with children", 3, function() {
-	var animatedChild,
-		test = $("div.animateClass"),
-		h2 = test.find("h2");
-
-	test.toggleClass("testChildren", {
-		children: true,
-		duration: duration,
-		complete: function() {
-			equal( h2.css("fontSize"), "20px", "Text size is final during complete");
-			test.toggleClass("testChildren", {
-				duration: duration,
-				complete: function() {
-					equal( h2.css("fontSize"), "10px", "Text size revertted after class removed");
-
-					start();
-				},
-				step: function( val, fx ) {
-					if ( fx.elem === h2[ 0 ] ) {
-						ok( false, "Error - Animating property on h2" );
-					}
-				}
-			});
-		},
-		step: function( val, fx ) {
-			if ( fx.prop === "fontSize" && fx.elem === h2[ 0 ] && !animatedChild ) {
-				equal( fx.end, 20, "animating font size on child" );
-				animatedChild = true;
-			}
-		}
-	});
-});
-
-asyncTest( "animateClass clears style properties when stopped", function() {
-	var test = $("div.animateClass"),
-		style = test[0].style,
-		orig = style.cssText;
-
-	expect( 2 );
-
-	test.addClass( "testChangeBackground", duration );
-	notEqual( orig, style.cssText, "cssText is not the same after starting animation" );
-
-	test.stop( true, true );
-	equal( orig, $.trim( style.cssText ), "cssText is the same after stopping animation midway" );
-	start();
-});
-
-asyncTest( "animateClass: css and class changes during animation are not lost (#7106)",
-function( assert ) {
-	expect( 2 );
-	var test = $( "div.ticket7106" );
-
-	// ensure the class stays and that the css property stays
-	function animationComplete() {
-		assert.hasClasses( test, "testClass", "class change during animateClass was not lost" );
-		equal( test.height(), 100, "css change during animateClass was not lost" );
-		start();
-	}
-
-	// add a class and change a style property after starting an animated class
-	test.addClass( "animate", minDuration, animationComplete )
-		.addClass( "testClass" )
-		.height( 100 );
-});
-
-test( "createPlaceholder: only created for static or relative elements", function() {
-	expect( 4 );
-
-	ok( $.effects.createPlaceholder( $( ".relative" ) ).length, "placeholder created for relative element" );
-	ok( $.effects.createPlaceholder( $( ".static" ) ).length, "placeholder created for static element" );
-	ok( !$.effects.createPlaceholder( $( ".absolute" ) ), "placeholder not created for absolute element" );
-	ok( !$.effects.createPlaceholder( $( ".fixed" ) ), "placeholder not created for fixed element" );
-});
-
-test( "createPlaceholder: preserves layout affecting properties", function() {
-	expect( 7 );
-
-	var position = 5,
-		element = $( ".relative" ).css({
-			top: position,
-			left: position
-		}),
-		before = {
-			offset: element.offset(),
-			outerWidth: element.outerWidth( true ),
-			outerHeight: element.outerHeight( true ),
-			"float": element.css( "float" ),
-			position: element.position()
-		},
-		placeholder = $.effects.createPlaceholder( element );
-
-	// Placeholders are only placed to preserve the effect on layout. Considering
-	// top and left do not change layout, they are not preserved, which makes some
-	// of the math simpler in the implementation.
-	deepEqual( before.offset.top - position, placeholder.offset().top, "offset top preserved" );
-	deepEqual( before.offset.left - position, placeholder.offset().left, "offset left preserved" );
-	deepEqual( before.position.top - position, placeholder.position().top, "position top preserved" );
-	deepEqual( before.position.left - position, placeholder.position().left, "position left preserved" );
-
-	deepEqual( before[ "float" ], placeholder.css( "float" ), "float preserved" );
-	deepEqual( before.outerWidth, placeholder.outerWidth( true ), "width preserved" );
-	deepEqual( before.outerHeight, placeholder.outerHeight( true ), "height preserved" );
-});
-
-$.each( $.effects.effect, function( effect ) {
-	module( "effects." + effect );
-
-	common.testJshint( "effect-" + effect );
-
-	if ( effect === "transfer" ) {
-		return;
-	}
-	asyncTest( "show/hide", function() {
-		expect( 12 );
-		var hidden = $( "div.hidden" ),
-			count = 0,
-			test = 0;
-
-		function queueTest( fn ) {
-			count++;
-			var point = count;
-			return function( next ) {
-				test++;
-				equal( point, test, "Queue function fired in order" );
-				if ( fn ) {
-					fn();
-				} else {
-					setTimeout( next, minDuration );
-				}
-			};
-		}
-
-		function duringTest( fn ) {
-			return function( next ) {
-				setTimeout( fn );
-				next();
-			};
-		}
-
-		hidden
-			.queue( queueTest() )
-			.queue( duringTest(function() {
-				ok( hidden.is( ":animated" ),
-					"Hidden is seen as animated during .show(\"" + effect + "\", time)" );
-			}) )
-			.show( effect, minDuration, queueTest(function() {
-				equal( hidden.css( "display" ), "block",
-					"Hidden is shown after .show(\"" + effect + "\", time)" );
-				ok( !$( ".ui-effects-placeholder" ).length,
-					"No placeholder remains after .show(\"" + effect + "\", time)" );
-			}) )
-			.queue( queueTest() )
-			.queue( duringTest(function() {
-				ok( hidden.is( ":animated" ),
-					"Hidden is seen as animated during .hide(\"" + effect + "\", time)" );
-			}) )
-			.hide( effect, minDuration, queueTest(function() {
-				equal( hidden.css( "display" ), "none",
-					"Back to hidden after .hide(\"" + effect + "\", time)" );
-				ok( !$( ".ui-effects-placeholder" ).length,
-					"No placeholder remains after .hide(\"" + effect + "\", time)" );
-			}) )
-			.queue( queueTest(function() {
-				deepEqual( hidden.queue(), [ "inprogress" ], "Only the inprogress sentinel remains" );
-				start();
-			}) );
-	});
-
-	asyncTest( "relative width & height - properties are preserved", function() {
-		var test = $("div.relWidth.relHeight"),
-			width = test.width(), height = test.height(),
-			cssWidth = test[0].style.width, cssHeight = test[0].style.height;
-
-		expect( 4 );
-		test.toggle( effect, minDuration, function() {
-			equal( test[0].style.width, cssWidth, "Inline CSS Width has been reset after animation ended" );
-			equal( test[0].style.height, cssHeight, "Inline CSS Height has been rest after animation ended" );
-			start();
-		});
-		equal( test.width(), width, "Width is the same px after animation started" );
-		equal( test.height(), height, "Height is the same px after animation started" );
-	});
-});
-
-} );
diff --git a/tests/unit/effects/effects_scale.js b/tests/unit/effects/effects_scale.js
deleted file mode 100644
index 186daf09f..000000000
--- a/tests/unit/effects/effects_scale.js
+++ /dev/null
@@ -1,72 +0,0 @@
-define( [
-	"jquery",
-	"ui/effect-scale"
-], function( $ ) {
-
-module( "effect.scale: Scale" );
-
-function run( position, v, h, vo, ho ) {
-	var desc = "End Position Correct: " + position + " (" + v + "," + h + ") - origin: (" + vo + "," + ho + ")";
-	asyncTest( desc, function( assert ) {
-		expect( 2 );
-		function complete() {
-			assert.close( parseInt( test.css( h ), 10 ), target[ h ], 1, "Horizontal Position Correct " + desc );
-			assert.close( parseInt( test.css( v ), 10 ), target[ v ], 1, "Vertical Position Correct " + desc );
-			start();
-		}
-		var test = $( ".testScale" ),
-			css = {
-				position: position
-			},
-			effect = {
-				effect: "scale",
-				mode: "effect",
-				percent: 200,
-				origin: [ vo, ho ],
-				complete: complete,
-				duration: 1
-			},
-			target = {},
-			relative = position === "relative";
-
-		css[ h ] = 33;
-		css[ v ] = 33;
-		target[ h ] = h === ho ? css[ h ] : ho === "center" ? css[ h ] - 35 : css[ h ] - 70;
-		target[ v ] = v === vo ? css[ v ] : vo === "middle" ? css[ v ] - 35 : css[ v ] - 70;
-		if ( relative && h === "right" ) {
-			target[ h ] += 70;
-		}
-		if ( relative && v === "bottom" ) {
-			target[ v ] += 70;
-		}
-		test.css( css );
-		test.effect( effect );
-	});
-}
-
-function suite( position ) {
-	run( position, "top", "left", "top", "left" );
-	run( position, "top", "left", "middle", "center" );
-	run( position, "top", "left", "bottom", "right" );
-	/* Firefox is currently not capable of supporting detection of bottom and right....
-	run( position, "bottom", "right", "top", "left" );
-	run( position, "bottom", "right", "middle", "center" );
-	run( position, "bottom", "right", "bottom", "right" );
-	*/
-}
-
-$(function() {
-	suite( "absolute" );
-	suite( "relative" );
-	var fixedElem = $( "<div>" )
-		.css({
-			position: "fixed",
-			top: 10
-		})
-		.appendTo( "body" );
-	if ( fixedElem.offset().top === 10 ) {
-		suite( "fixed" );
-	}
-});
-
-} );
diff --git a/tests/unit/effects/scale.js b/tests/unit/effects/scale.js
new file mode 100644
index 000000000..186daf09f
--- /dev/null
+++ b/tests/unit/effects/scale.js
@@ -0,0 +1,72 @@
+define( [
+	"jquery",
+	"ui/effect-scale"
+], function( $ ) {
+
+module( "effect.scale: Scale" );
+
+function run( position, v, h, vo, ho ) {
+	var desc = "End Position Correct: " + position + " (" + v + "," + h + ") - origin: (" + vo + "," + ho + ")";
+	asyncTest( desc, function( assert ) {
+		expect( 2 );
+		function complete() {
+			assert.close( parseInt( test.css( h ), 10 ), target[ h ], 1, "Horizontal Position Correct " + desc );
+			assert.close( parseInt( test.css( v ), 10 ), target[ v ], 1, "Vertical Position Correct " + desc );
+			start();
+		}
+		var test = $( ".testScale" ),
+			css = {
+				position: position
+			},
+			effect = {
+				effect: "scale",
+				mode: "effect",
+				percent: 200,
+				origin: [ vo, ho ],
+				complete: complete,
+				duration: 1
+			},
+			target = {},
+			relative = position === "relative";
+
+		css[ h ] = 33;
+		css[ v ] = 33;
+		target[ h ] = h === ho ? css[ h ] : ho === "center" ? css[ h ] - 35 : css[ h ] - 70;
+		target[ v ] = v === vo ? css[ v ] : vo === "middle" ? css[ v ] - 35 : css[ v ] - 70;
+		if ( relative && h === "right" ) {
+			target[ h ] += 70;
+		}
+		if ( relative && v === "bottom" ) {
+			target[ v ] += 70;
+		}
+		test.css( css );
+		test.effect( effect );
+	});
+}
+
+function suite( position ) {
+	run( position, "top", "left", "top", "left" );
+	run( position, "top", "left", "middle", "center" );
+	run( position, "top", "left", "bottom", "right" );
+	/* Firefox is currently not capable of supporting detection of bottom and right....
+	run( position, "bottom", "right", "top", "left" );
+	run( position, "bottom", "right", "middle", "center" );
+	run( position, "bottom", "right", "bottom", "right" );
+	*/
+}
+
+$(function() {
+	suite( "absolute" );
+	suite( "relative" );
+	var fixedElem = $( "<div>" )
+		.css({
+			position: "fixed",
+			top: 10
+		})
+		.appendTo( "body" );
+	if ( fixedElem.offset().top === 10 ) {
+		suite( "fixed" );
+	}
+});
+
+} );
diff --git a/tests/unit/menu/common.js b/tests/unit/menu/common.js
new file mode 100644
index 000000000..0f0a04de8
--- /dev/null
+++ b/tests/unit/menu/common.js
@@ -0,0 +1,29 @@
+define( [
+	"lib/common",
+	"ui/menu"
+], function( common ) {
+
+common.testWidget( "menu", {
+	defaults: {
+		classes: {},
+		disabled: false,
+		icons: {
+			submenu: "ui-icon-caret-1-e"
+		},
+		items: "> *",
+		menus: "ul",
+		position: {
+			my: "left top",
+			at: "right top"
+		},
+		role: "menu",
+
+		// callbacks
+		blur: null,
+		create: null,
+		focus: null,
+		select: null
+	}
+});
+
+} );
diff --git a/tests/unit/menu/core.js b/tests/unit/menu/core.js
new file mode 100644
index 000000000..08644c31f
--- /dev/null
+++ b/tests/unit/menu/core.js
@@ -0,0 +1,76 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/menu"
+], function( $, testHelper ) {
+
+module( "menu: core" );
+
+test( "markup structure", function( assert ) {
+	expect( 11 );
+	var element = $( "#menu9" ).menu(),
+		items = element.children(),
+		firstItemChildren = items.eq( 0 ).children();
+
+	assert.hasClasses( element, "ui-menu ui-widget ui-widget-content" );
+	assert.hasClasses( items[ 0 ], "ui-menu-item" );
+	equal( items.eq( 0 ).children().length, 2, "Item has exactly 2 children when it has a sub menu" );
+	assert.hasClasses( firstItemChildren[ 0 ], "ui-menu-item-wrapper" );
+	assert.hasClasses( firstItemChildren[ 1 ], "ui-menu ui-widget ui-widget-content" );
+	assert.hasClasses( firstItemChildren.eq( 1 ).children()[ 0 ], "ui-menu-item" );
+	assert.hasClasses( firstItemChildren.eq( 1 ).children().eq( 0 ).children(), "ui-menu-item-wrapper" );
+	assert.hasClasses( items[ 1 ], "ui-menu-item" );
+	equal( items.eq( 1 ).children().length, 1, "Item has exactly 1 child when it does not have a sub menu" );
+	assert.hasClasses( items[ 2 ], "ui-menu-item" );
+	equal( items.eq( 2 ).children().length, 1, "Item has exactly 1 child when it does not have a sub menu" );
+});
+
+test( "accessibility", function () {
+	expect( 4 );
+	var element = $( "#menu1" ).menu();
+
+	equal( element.attr( "role" ), "menu", "main role" );
+	ok( !element.attr( "aria-activedescendant" ), "aria-activedescendant not set" );
+
+	element.menu( "focus", $.Event(), element.children().eq( -2 ) );
+	equal( element.attr( "aria-activedescendant" ), "testID1", "aria-activedescendant from existing id" );
+
+	element.menu( "focus", $.Event(), element.children().eq( 0 ) );
+	ok( /^ui-id-\d+$/.test( element.attr( "aria-activedescendant" ) ), "aria-activedescendant from generated id" );
+
+	// Item roles are tested in the role option tests
+});
+
+asyncTest( "#9044: Autofocus issue with dialog opened from menu widget", function() {
+	expect( 1 );
+	var element = $( "#menu1" ).menu();
+
+	$( "<input>", { id: "test9044" } ).appendTo( "body" );
+
+	$( "#testID1" ).bind( "click", function() {
+		$( "#test9044" ).focus();
+	});
+
+	testHelper.click( element, "3" );
+	setTimeout( function() {
+		equal( document.activeElement.id, "test9044", "Focus was swallowed by menu" );
+		$( "#test9044" ).remove();
+		start();
+	});
+});
+
+asyncTest( "#9532: Need a way in Menu to keep ui-state-active class on selected item for Selectmenu", function( assert ) {
+	expect( 1 );
+	var element = $( "#menu1" ).menu(),
+		firstChild = element.children().eq( 0 ),
+		wrapper = firstChild.children( ".ui-menu-item-wrapper" );
+
+	element.menu( "focus", null, firstChild );
+	wrapper.addClass( "ui-state-active" );
+	setTimeout( function() {
+		assert.hasClasses( wrapper, "ui-state-active" );
+		start();
+	});
+});
+
+} );
diff --git a/tests/unit/menu/events.js b/tests/unit/menu/events.js
new file mode 100644
index 000000000..5cac3e737
--- /dev/null
+++ b/tests/unit/menu/events.js
@@ -0,0 +1,737 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/menu"
+], function( $, testHelper ) {
+
+var log = testHelper.log,
+	logOutput = testHelper.logOutput,
+	click = testHelper.click;
+
+module( "menu: events", {
+	setup: function() {
+		testHelper.clearLog();
+	}
+});
+
+test( "handle click on menu", function() {
+	expect( 1 );
+	var element = $( "#menu1" ).menu({
+		select: function() {
+			log();
+		}
+	});
+	log( "click", true );
+	click( element, "1" );
+	log( "afterclick" );
+	click( element, "2" );
+	click( element, "3" );
+	click( element, "1" );
+	equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
+});
+
+test( "handle click on custom item menu", function() {
+	expect( 1 );
+	var element = $( "#menu5" ).menu({
+		select: function() {
+			log();
+		},
+		menus: ".menu"
+	});
+	log( "click", true );
+	click( element, "1" );
+	log( "afterclick" );
+	click( element, "2" );
+	click( element, "3" );
+	click( element, "1" );
+	equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
+});
+
+asyncTest( "handle blur", function() {
+	expect( 1 );
+	var blurHandled = false,
+		element = $( "#menu1" ).menu({
+			blur: function( event ) {
+				// Ignore duplicate blur event fired by IE
+				if ( !blurHandled ) {
+					blurHandled = true;
+					equal( event.type, "menublur", "blur event.type is 'menublur'" );
+				}
+			}
+		});
+
+	click( element, "1" );
+	setTimeout(function() {
+		element.blur();
+		setTimeout(function() {
+			start();
+		}, 350 );
+	});
+});
+
+asyncTest( "handle blur via click outside", function() {
+	expect( 1 );
+	var blurHandled = false,
+		element = $( "#menu1" ).menu({
+			blur: function( event ) {
+				// Ignore duplicate blur event fired by IE
+				if ( !blurHandled ) {
+					blurHandled = true;
+					equal( event.type, "menublur", "blur event.type is 'menublur'" );
+				}
+			}
+		});
+
+	click( element, "1" );
+	setTimeout(function() {
+		$( "<a>", { id: "remove"} ).appendTo( "body" ).trigger( "click" );
+		setTimeout(function() {
+			start();
+		}, 350 );
+	});
+});
+
+asyncTest( "handle focus of menu with active item", function() {
+	expect( 1 );
+	var element = $( "#menu1" ).menu({
+		focus: function( event ) {
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
+		}
+	});
+
+	log( "focus", true );
+	element[ 0 ].focus();
+	setTimeout(function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element[ 0 ].blur();
+		setTimeout(function() {
+			element[ 0 ].focus();
+			setTimeout(function() {
+				equal( logOutput(), "focus,0,1,2,2", "current active item remains active" );
+				start();
+			});
+		});
+	});
+});
+
+test( "handle mouseenter on nested menu item", function( assert ) {
+	assert.expect( 8 );
+	$.ui.menu.prototype.delay = 1;
+	var activeItem,
+		done = assert.async(),
+		element = $( "#menu2" ).menu();
+
+	element
+		.menu( "previous" )
+		.menu( "expand" );
+
+	function checkSubmenus() {
+		equal( element.find( "ul[aria-expanded='true']" ).length, 2, "both submenus expanded" );
+	}
+	function menumouseenter1() {
+		element.menu( "expand" );
+		setTimeout( menumouseenter2, 25 );
+	}
+	function menumouseenter2() {
+		checkSubmenus();
+		activeItem = $( "#" + element.attr( "aria-activedescendant" ) );
+		assert.hasClasses( activeItem, "ui-state-active" );
+		activeItem.trigger( "mouseleave" );
+		setTimeout( menumouseenter3, 25 );
+	}
+	function menumouseenter3() {
+		checkSubmenus();
+		assert.lacksClasses( activeItem, "ui-state-active" );
+		activeItem.trigger( "mouseenter" );
+		setTimeout( menumouseenter4, 25 );
+	}
+	function menumouseenter4() {
+		checkSubmenus();
+		activeItem.parents( ".ui-menu-item" ).each( function( index, item ) {
+			assert.hasClasses( $( item ).children( ".ui-menu-item-wrapper" ), "ui-state-active" );
+		} );
+		$.ui.menu.prototype.delay = 300;
+		done();
+	}
+	setTimeout( menumouseenter1, 25 );
+} );
+
+asyncTest( "handle submenu auto collapse: mouseleave, default markup", function() {
+	expect( 4 );
+	$.ui.menu.prototype.delay = 1;
+	var element = $( "#menu2" ).menu(),
+		event = $.Event( "mouseenter" );
+
+	function menumouseleave1() {
+		equal( element.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
+		element.menu( "focus", event, element.find( "li:nth-child(7) li:first" ) );
+		setTimeout( menumouseleave2, 25 );
+	}
+	function menumouseleave2() {
+		equal( element.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
+		element.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
+		setTimeout( menumouseleave3, 25 );
+	}
+	function menumouseleave3() {
+		equal( element.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+		element.trigger( "mouseleave" );
+		setTimeout( menumouseleave4, 25 );
+	}
+	function menumouseleave4() {
+		equal( element.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+		$.ui.menu.prototype.delay = 300;
+		start();
+	}
+
+	element.find( "li:nth-child(7)" ).trigger( "mouseenter" );
+	setTimeout( menumouseleave1, 25 );
+});
+
+asyncTest( "handle submenu auto collapse: mouseleave, custom markup", function() {
+	expect( 4 );
+	$.ui.menu.prototype.delay = 1;
+	var element = $( "#menu5" ).menu({ menus: ".menu" }),
+		event = $.Event( "mouseenter" );
+
+	function menumouseleave1() {
+		equal( element.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
+		element.menu( "focus", event, element.find( ":nth-child(7)" ).find( ".menu" ).eq( 0 ).children().eq( 0 ) );
+		setTimeout( menumouseleave2, 25 );
+	}
+	function menumouseleave2() {
+		equal( element.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
+		element.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
+		setTimeout( menumouseleave3, 25 );
+	}
+	function menumouseleave3() {
+		equal( element.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+		element.trigger( "mouseleave" );
+		setTimeout( menumouseleave4, 25 );
+	}
+	function menumouseleave4() {
+		equal( element.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+		$.ui.menu.prototype.delay = 300;
+		start();
+	}
+
+	element.find( ":nth-child(7)" ).trigger( "mouseenter" );
+	setTimeout( menumouseleave1, 25 );
+});
+
+asyncTest( "handle keyboard navigation on menu without scroll and without submenus", function() {
+	expect( 12 );
+	var element = $( "#menu1" ).menu({
+		select: function( event, ui ) {
+			log( $( ui.item[ 0 ] ).text() );
+		},
+		focus: function( event ) {
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
+		}
+	});
+
+	log( "keydown", true );
+	element[ 0 ].focus();
+	setTimeout(function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		equal( logOutput(), "keydown,1", "Keydown UP" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+		equal( logOutput(), "keydown", "Keydown RIGHT (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal( logOutput(), "keydown,4", "Keydown PAGE_DOWN" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+		equal( logOutput(), "keydown,4", "Keydown END" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+		equal( logOutput(), "keydown,0", "Keydown HOME" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+		equal( logOutput(), "keydown", "Keydown ESCAPE (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
+
+		start();
+	});
+});
+
+asyncTest( "handle keyboard navigation on menu without scroll and with submenus", function() {
+	expect( 16 );
+	var element = $( "#menu2" ).menu({
+		select: function( event, ui ) {
+			log( $( ui.item[0] ).text() );
+		},
+		focus: function( event ) {
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active:last" ).parent().index() );
+		}
+	});
+
+	log( "keydown", true );
+	element.one( "menufocus", function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equal( logOutput(), "keydown,1,2", "Keydown DOWN" );
+		setTimeout( menukeyboard1 );
+	});
+	element.focus();
+
+	function menukeyboard1() {
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		equal( logOutput(), "keydown,1,0", "Keydown UP" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+
+		setTimeout(function() {
+			equal( logOutput(), "keydown,1,2,3,4,0", "Keydown RIGHT (open submenu)" );
+			setTimeout( menukeyboard2 );
+		} );
+	}
+
+	function menukeyboard2() {
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+		equal( logOutput(), "keydown,4", "Keydown LEFT (close submenu)" );
+
+		// re-open submenu
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+		setTimeout( menukeyboard3 );
+	}
+
+	function menukeyboard3() {
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal( logOutput(), "keydown,2", "Keydown PAGE_DOWN" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+		equal( logOutput(), "keydown,2", "Keydown END" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+		equal( logOutput(), "keydown,0", "Keydown HOME" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+		equal( logOutput(), "keydown,4", "Keydown ESCAPE (close submenu)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.SPACE } );
+		setTimeout( menukeyboard4 );
+	}
+
+	function menukeyboard4() {
+		equal( logOutput(), "keydown,0", "Keydown SPACE (open submenu)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+		equal( logOutput(), "keydown,4", "Keydown ESCAPE (close submenu)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+		setTimeout( function() {
+			element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+			element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+			setTimeout( function() {
+				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+				equal( logOutput(), "keydown,5,6,0,1,0,2,4,0", "Keydown skip dividers" );
+
+				log( "keydown", true );
+				element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+				setTimeout( menukeyboard6 );
+			} );
+		} );
+	}
+
+	function menukeyboard6() {
+		equal( logOutput(), "keydown,Ada", "Keydown ENTER (open submenu)" );
+		start();
+	}
+});
+
+asyncTest( "handle keyboard navigation on menu with scroll and without submenus", function() {
+	expect( 14 );
+	var element = $( "#menu3" ).menu({
+		select: function( event, ui ) {
+			log( $( ui.item[ 0 ] ).text() );
+		},
+		focus: function( event ) {
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active:last" ).parent().index() );
+		}
+	});
+
+	log( "keydown", true );
+	element[ 0 ].focus();
+	setTimeout(function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		equal( logOutput(), "keydown,1,0", "Keydown UP" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+		equal( logOutput(), "keydown", "Keydown RIGHT (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal( logOutput(), "keydown,17", "Keydown PAGE_DOWN" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal( logOutput(), "keydown,34", "Keydown PAGE_DOWN" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal( logOutput(), "keydown,17", "Keydown PAGE_UP" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+		equal( logOutput(), "keydown,37", "Keydown END" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+		equal( logOutput(), "keydown,0", "Keydown HOME" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+		equal( logOutput(), "keydown", "Keydown ESCAPE (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
+
+		start();
+	});
+});
+
+asyncTest( "handle keyboard navigation on menu with scroll and with submenus", function() {
+	expect( 14 );
+	var element = $( "#menu4" ).menu({
+		select: function( event, ui ) {
+			log( $( ui.item[ 0 ] ).text() );
+		},
+		focus: function( event ) {
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active:last" ).parent().index());
+		}
+	});
+
+	log( "keydown", true );
+	element.one( "menufocus", function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equal( logOutput(), "keydown,1,2", "Keydown DOWN" );
+		setTimeout( menukeyboard1 );
+	});
+	element.focus();
+
+	function menukeyboard1() {
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		equal( logOutput(), "keydown,1,0", "Keydown UP" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+
+		setTimeout( function() {
+			equal( logOutput(), "keydown,1,0", "Keydown RIGHT (open submenu)" );
+		}, 50 );
+		setTimeout( menukeyboard2, 50 );
+	}
+
+	function menukeyboard2() {
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+		equal( logOutput(), "keydown,1", "Keydown LEFT (close submenu)" );
+
+		// re-open submenu
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+		setTimeout( menukeyboard3, 50 );
+	}
+
+	function menukeyboard3() {
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal( logOutput(), "keydown,17", "Keydown PAGE_DOWN" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal( logOutput(), "keydown,27", "Keydown PAGE_DOWN" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal( logOutput(), "keydown,10", "Keydown PAGE_UP" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+		equal( logOutput(), "keydown,27", "Keydown END" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+		equal( logOutput(), "keydown,0", "Keydown HOME" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+		equal( logOutput(), "keydown,1", "Keydown ESCAPE (close submenu)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		setTimeout( menukeyboard4, 50 );
+	}
+
+	function menukeyboard4() {
+		equal( logOutput(), "keydown,0", "Keydown ENTER (open submenu)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER (select item)" );
+
+		start();
+	}
+});
+
+asyncTest( "handle keyboard navigation and mouse click on menu with disabled items", function() {
+	expect( 6 );
+	var element = $( "#menu6" ).menu({
+		select: function( event, ui ) {
+			log( $( ui.item[0] ).text() );
+		},
+		focus: function( event ) {
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index());
+		}
+	});
+
+	log( "keydown", true );
+	element.one( "menufocus", function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		equal( logOutput(), "keydown,1", "Keydown focus but not select disabled item" );
+		setTimeout( menukeyboard1, 50 );
+	});
+	element.focus();
+
+	function menukeyboard1() {
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equal( logOutput(), "keydown,2,3,4", "Keydown focus disabled item with submenu" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
+
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+
+		setTimeout( function() {
+			equal( logOutput(), "keydown", "Keydown RIGHT (no effect on disabled sub-menu)" );
+
+			log( "keydown", true );
+			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+
+			setTimeout( function() {
+				equal( logOutput(), "keydown", "Keydown ENTER (no effect on disabled sub-menu)" );
+				log( "click", true );
+				click( element, "1" );
+				equal( logOutput(), "click", "Click disabled item (no effect)" );
+				start();
+			}, 50 );
+		}, 50 );
+	}
+});
+
+asyncTest( "handle keyboard navigation and mouse click on menu with dividers and group labels", function() {
+	expect( 2 );
+	var element = $( "#menu7" ).menu({
+		items: "> :not('.ui-menu-group')",
+		select: function( event, ui ) {
+			log( $( ui.item[0] ).text() );
+		},
+		focus: function( event ) {
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
+		}
+	});
+
+	log( "keydown", true );
+	element.one( "menufocus", function() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		equal( logOutput(), "keydown,2,Ada", "Keydown skips initial group label" );
+		setTimeout( menukeyboard1, 50 );
+	});
+	element.focus();
+
+	function menukeyboard1() {
+		log( "keydown", true );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equal( logOutput(), "keydown,3,4,7", "Keydown focus skips divider and group label" );
+		start();
+	}
+});
+
+asyncTest( "handle keyboard navigation with spelling of menu items", function() {
+	expect( 3 );
+	var element = $( "#menu2" ).menu({
+		focus: function( event ) {
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
+		}
+	});
+
+	log( "keydown", true );
+	element.one( "menufocus", function() {
+		element.simulate( "keydown", { keyCode: 65 } );
+		element.simulate( "keydown", { keyCode: 68 } );
+		element.simulate( "keydown", { keyCode: 68 } );
+		equal( logOutput(), "keydown,0,1,3", "Keydown focus Addyston by spelling the first 3 letters" );
+		element.simulate( "keydown", { keyCode: 68 } );
+		equal( logOutput(), "keydown,0,1,3,4", "Keydown focus Delphi by repeating the 'd' again" );
+		element.simulate( "keydown", { keyCode: 83 } );
+		equal( logOutput(), "keydown,0,1,3,4,5", "Keydown focus Saarland ignoring leading space" );
+		start();
+	});
+	element[ 0 ].focus();
+});
+
+asyncTest( "Keep focus on selected item (see #10644)", function() {
+	expect( 1 );
+	var element = $( "#menu2" ).menu({
+		focus: function( event ) {
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
+		}
+	});
+
+	log( "keydown", true );
+	element.one( "menufocus", function() {
+		element.simulate( "keydown", { keyCode: 65 } );
+		element.simulate( "keydown", { keyCode: 68 } );
+		element.simulate( "keydown", { keyCode: 68 } );
+		element.simulate( "keydown", { keyCode: 89 } );
+		element.simulate( "keydown", { keyCode: 83 } );
+		equal( logOutput(), "keydown,0,1,3,3,3",
+			"Focus stays on 'Addyston', even after other options are eliminated" );
+		start();
+	});
+	element[ 0 ].focus();
+});
+
+test( "#9469: Stopping propagation in a select event should not suppress subsequent select events.", function() {
+	expect( 1 );
+	var element = $( "#menu1" ).menu({
+		select: function( event ) {
+			log();
+			event.stopPropagation();
+		}
+	});
+
+	click( element, "1" );
+	click( element, "2" );
+
+	equal( logOutput(), "1,2", "Both select events were not triggered." );
+});
+
+asyncTest( "#10571: When typing in a menu, only menu-items should be focused", function( assert ) {
+	expect( 3 );
+
+	var element = $( "#menu8" ).menu({
+		focus: function( event, ui ) {
+			equal( ui.item.length, 1, "There should only be one match when filtering" );
+			assert.hasClasses( ui.item, "ui-menu-item" );
+			equal( ui.item.text(), "-Saarland", "element has correct text" );
+		}
+	});
+
+	setTimeout(function() {
+		element.menu( "widget" ).simulate( "keydown", { keyCode: "-".charCodeAt( 0 ) } );
+		start();
+	});
+});
+
+} );
diff --git a/tests/unit/menu/helper.js b/tests/unit/menu/helper.js
new file mode 100644
index 000000000..445663985
--- /dev/null
+++ b/tests/unit/menu/helper.js
@@ -0,0 +1,36 @@
+define( [
+	"jquery",
+	"lib/helper"
+], function( $, helper ) {
+
+var lastItem,
+	log = [];
+
+return $.extend( helper, {
+	log: function( message, clear ) {
+		if ( clear ) {
+			log.length = 0;
+		}
+		if ( message === undefined ) {
+			message = lastItem;
+		}
+		log.push( $.trim( message ) );
+	},
+
+	logOutput: function() {
+		return log.join( "," );
+	},
+
+	clearLog: function() {
+		log.length = 0;
+	},
+
+	click: function( menu, item ) {
+		lastItem = item;
+		menu.children( ":eq(" + item + ")" )
+			.children( ".ui-menu-item-wrapper" )
+			.trigger( "click" );
+	}
+} );
+
+} );
diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js
deleted file mode 100644
index 0f0a04de8..000000000
--- a/tests/unit/menu/menu_common.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define( [
-	"lib/common",
-	"ui/menu"
-], function( common ) {
-
-common.testWidget( "menu", {
-	defaults: {
-		classes: {},
-		disabled: false,
-		icons: {
-			submenu: "ui-icon-caret-1-e"
-		},
-		items: "> *",
-		menus: "ul",
-		position: {
-			my: "left top",
-			at: "right top"
-		},
-		role: "menu",
-
-		// callbacks
-		blur: null,
-		create: null,
-		focus: null,
-		select: null
-	}
-});
-
-} );
diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
deleted file mode 100644
index 7ff127009..000000000
--- a/tests/unit/menu/menu_core.js
+++ /dev/null
@@ -1,76 +0,0 @@
-define( [
-	"jquery",
-	"./menu_test_helpers",
-	"ui/menu"
-], function( $, testHelper ) {
-
-module( "menu: core" );
-
-test( "markup structure", function( assert ) {
-	expect( 11 );
-	var element = $( "#menu9" ).menu(),
-		items = element.children(),
-		firstItemChildren = items.eq( 0 ).children();
-
-	assert.hasClasses( element, "ui-menu ui-widget ui-widget-content" );
-	assert.hasClasses( items[ 0 ], "ui-menu-item" );
-	equal( items.eq( 0 ).children().length, 2, "Item has exactly 2 children when it has a sub menu" );
-	assert.hasClasses( firstItemChildren[ 0 ], "ui-menu-item-wrapper" );
-	assert.hasClasses( firstItemChildren[ 1 ], "ui-menu ui-widget ui-widget-content" );
-	assert.hasClasses( firstItemChildren.eq( 1 ).children()[ 0 ], "ui-menu-item" );
-	assert.hasClasses( firstItemChildren.eq( 1 ).children().eq( 0 ).children(), "ui-menu-item-wrapper" );
-	assert.hasClasses( items[ 1 ], "ui-menu-item" );
-	equal( items.eq( 1 ).children().length, 1, "Item has exactly 1 child when it does not have a sub menu" );
-	assert.hasClasses( items[ 2 ], "ui-menu-item" );
-	equal( items.eq( 2 ).children().length, 1, "Item has exactly 1 child when it does not have a sub menu" );
-});
-
-test( "accessibility", function () {
-	expect( 4 );
-	var element = $( "#menu1" ).menu();
-
-	equal( element.attr( "role" ), "menu", "main role" );
-	ok( !element.attr( "aria-activedescendant" ), "aria-activedescendant not set" );
-
-	element.menu( "focus", $.Event(), element.children().eq( -2 ) );
-	equal( element.attr( "aria-activedescendant" ), "testID1", "aria-activedescendant from existing id" );
-
-	element.menu( "focus", $.Event(), element.children().eq( 0 ) );
-	ok( /^ui-id-\d+$/.test( element.attr( "aria-activedescendant" ) ), "aria-activedescendant from generated id" );
-
-	// Item roles are tested in the role option tests
-});
-
-asyncTest( "#9044: Autofocus issue with dialog opened from menu widget", function() {
-	expect( 1 );
-	var element = $( "#menu1" ).menu();
-
-	$( "<input>", { id: "test9044" } ).appendTo( "body" );
-
-	$( "#testID1" ).bind( "click", function() {
-		$( "#test9044" ).focus();
-	});
-
-	testHelper.click( element, "3" );
-	setTimeout( function() {
-		equal( document.activeElement.id, "test9044", "Focus was swallowed by menu" );
-		$( "#test9044" ).remove();
-		start();
-	});
-});
-
-asyncTest( "#9532: Need a way in Menu to keep ui-state-active class on selected item for Selectmenu", function( assert ) {
-	expect( 1 );
-	var element = $( "#menu1" ).menu(),
-		firstChild = element.children().eq( 0 ),
-		wrapper = firstChild.children( ".ui-menu-item-wrapper" );
-
-	element.menu( "focus", null, firstChild );
-	wrapper.addClass( "ui-state-active" );
-	setTimeout( function() {
-		assert.hasClasses( wrapper, "ui-state-active" );
-		start();
-	});
-});
-
-} );
diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
deleted file mode 100644
index 9e0e0a2b7..000000000
--- a/tests/unit/menu/menu_events.js
+++ /dev/null
@@ -1,737 +0,0 @@
-define( [
-	"jquery",
-	"./menu_test_helpers",
-	"ui/menu"
-], function( $, testHelper ) {
-
-var log = testHelper.log,
-	logOutput = testHelper.logOutput,
-	click = testHelper.click;
-
-module( "menu: events", {
-	setup: function() {
-		testHelper.clearLog();
-	}
-});
-
-test( "handle click on menu", function() {
-	expect( 1 );
-	var element = $( "#menu1" ).menu({
-		select: function() {
-			log();
-		}
-	});
-	log( "click", true );
-	click( element, "1" );
-	log( "afterclick" );
-	click( element, "2" );
-	click( element, "3" );
-	click( element, "1" );
-	equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
-});
-
-test( "handle click on custom item menu", function() {
-	expect( 1 );
-	var element = $( "#menu5" ).menu({
-		select: function() {
-			log();
-		},
-		menus: ".menu"
-	});
-	log( "click", true );
-	click( element, "1" );
-	log( "afterclick" );
-	click( element, "2" );
-	click( element, "3" );
-	click( element, "1" );
-	equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
-});
-
-asyncTest( "handle blur", function() {
-	expect( 1 );
-	var blurHandled = false,
-		element = $( "#menu1" ).menu({
-			blur: function( event ) {
-				// Ignore duplicate blur event fired by IE
-				if ( !blurHandled ) {
-					blurHandled = true;
-					equal( event.type, "menublur", "blur event.type is 'menublur'" );
-				}
-			}
-		});
-
-	click( element, "1" );
-	setTimeout(function() {
-		element.blur();
-		setTimeout(function() {
-			start();
-		}, 350 );
-	});
-});
-
-asyncTest( "handle blur via click outside", function() {
-	expect( 1 );
-	var blurHandled = false,
-		element = $( "#menu1" ).menu({
-			blur: function( event ) {
-				// Ignore duplicate blur event fired by IE
-				if ( !blurHandled ) {
-					blurHandled = true;
-					equal( event.type, "menublur", "blur event.type is 'menublur'" );
-				}
-			}
-		});
-
-	click( element, "1" );
-	setTimeout(function() {
-		$( "<a>", { id: "remove"} ).appendTo( "body" ).trigger( "click" );
-		setTimeout(function() {
-			start();
-		}, 350 );
-	});
-});
-
-asyncTest( "handle focus of menu with active item", function() {
-	expect( 1 );
-	var element = $( "#menu1" ).menu({
-		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
-		}
-	});
-
-	log( "focus", true );
-	element[ 0 ].focus();
-	setTimeout(function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element[ 0 ].blur();
-		setTimeout(function() {
-			element[ 0 ].focus();
-			setTimeout(function() {
-				equal( logOutput(), "focus,0,1,2,2", "current active item remains active" );
-				start();
-			});
-		});
-	});
-});
-
-test( "handle mouseenter on nested menu item", function( assert ) {
-	assert.expect( 8 );
-	$.ui.menu.prototype.delay = 1;
-	var activeItem,
-		done = assert.async(),
-		element = $( "#menu2" ).menu();
-
-	element
-		.menu( "previous" )
-		.menu( "expand" );
-
-	function checkSubmenus() {
-		equal( element.find( "ul[aria-expanded='true']" ).length, 2, "both submenus expanded" );
-	}
-	function menumouseenter1() {
-		element.menu( "expand" );
-		setTimeout( menumouseenter2, 25 );
-	}
-	function menumouseenter2() {
-		checkSubmenus();
-		activeItem = $( "#" + element.attr( "aria-activedescendant" ) );
-		assert.hasClasses( activeItem, "ui-state-active" );
-		activeItem.trigger( "mouseleave" );
-		setTimeout( menumouseenter3, 25 );
-	}
-	function menumouseenter3() {
-		checkSubmenus();
-		assert.lacksClasses( activeItem, "ui-state-active" );
-		activeItem.trigger( "mouseenter" );
-		setTimeout( menumouseenter4, 25 );
-	}
-	function menumouseenter4() {
-		checkSubmenus();
-		activeItem.parents( ".ui-menu-item" ).each( function( index, item ) {
-			assert.hasClasses( $( item ).children( ".ui-menu-item-wrapper" ), "ui-state-active" );
-		} );
-		$.ui.menu.prototype.delay = 300;
-		done();
-	}
-	setTimeout( menumouseenter1, 25 );
-} );
-
-asyncTest( "handle submenu auto collapse: mouseleave, default markup", function() {
-	expect( 4 );
-	$.ui.menu.prototype.delay = 1;
-	var element = $( "#menu2" ).menu(),
-		event = $.Event( "mouseenter" );
-
-	function menumouseleave1() {
-		equal( element.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
-		element.menu( "focus", event, element.find( "li:nth-child(7) li:first" ) );
-		setTimeout( menumouseleave2, 25 );
-	}
-	function menumouseleave2() {
-		equal( element.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
-		element.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
-		setTimeout( menumouseleave3, 25 );
-	}
-	function menumouseleave3() {
-		equal( element.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
-		element.trigger( "mouseleave" );
-		setTimeout( menumouseleave4, 25 );
-	}
-	function menumouseleave4() {
-		equal( element.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
-		$.ui.menu.prototype.delay = 300;
-		start();
-	}
-
-	element.find( "li:nth-child(7)" ).trigger( "mouseenter" );
-	setTimeout( menumouseleave1, 25 );
-});
-
-asyncTest( "handle submenu auto collapse: mouseleave, custom markup", function() {
-	expect( 4 );
-	$.ui.menu.prototype.delay = 1;
-	var element = $( "#menu5" ).menu({ menus: ".menu" }),
-		event = $.Event( "mouseenter" );
-
-	function menumouseleave1() {
-		equal( element.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
-		element.menu( "focus", event, element.find( ":nth-child(7)" ).find( ".menu" ).eq( 0 ).children().eq( 0 ) );
-		setTimeout( menumouseleave2, 25 );
-	}
-	function menumouseleave2() {
-		equal( element.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
-		element.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
-		setTimeout( menumouseleave3, 25 );
-	}
-	function menumouseleave3() {
-		equal( element.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
-		element.trigger( "mouseleave" );
-		setTimeout( menumouseleave4, 25 );
-	}
-	function menumouseleave4() {
-		equal( element.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
-		$.ui.menu.prototype.delay = 300;
-		start();
-	}
-
-	element.find( ":nth-child(7)" ).trigger( "mouseenter" );
-	setTimeout( menumouseleave1, 25 );
-});
-
-asyncTest( "handle keyboard navigation on menu without scroll and without submenus", function() {
-	expect( 12 );
-	var element = $( "#menu1" ).menu({
-		select: function( event, ui ) {
-			log( $( ui.item[ 0 ] ).text() );
-		},
-		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
-		}
-	});
-
-	log( "keydown", true );
-	element[ 0 ].focus();
-	setTimeout(function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		equal( logOutput(), "keydown,1", "Keydown UP" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-		equal( logOutput(), "keydown", "Keydown RIGHT (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "keydown,4", "Keydown PAGE_DOWN" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-		equal( logOutput(), "keydown,4", "Keydown END" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-		equal( logOutput(), "keydown,0", "Keydown HOME" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( logOutput(), "keydown", "Keydown ESCAPE (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
-
-		start();
-	});
-});
-
-asyncTest( "handle keyboard navigation on menu without scroll and with submenus", function() {
-	expect( 16 );
-	var element = $( "#menu2" ).menu({
-		select: function( event, ui ) {
-			log( $( ui.item[0] ).text() );
-		},
-		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active:last" ).parent().index() );
-		}
-	});
-
-	log( "keydown", true );
-	element.one( "menufocus", function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( logOutput(), "keydown,1,2", "Keydown DOWN" );
-		setTimeout( menukeyboard1 );
-	});
-	element.focus();
-
-	function menukeyboard1() {
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		equal( logOutput(), "keydown,1,0", "Keydown UP" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-
-		setTimeout(function() {
-			equal( logOutput(), "keydown,1,2,3,4,0", "Keydown RIGHT (open submenu)" );
-			setTimeout( menukeyboard2 );
-		} );
-	}
-
-	function menukeyboard2() {
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "keydown,4", "Keydown LEFT (close submenu)" );
-
-		// re-open submenu
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-		setTimeout( menukeyboard3 );
-	}
-
-	function menukeyboard3() {
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "keydown,2", "Keydown PAGE_DOWN" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-		equal( logOutput(), "keydown,2", "Keydown END" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-		equal( logOutput(), "keydown,0", "Keydown HOME" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( logOutput(), "keydown,4", "Keydown ESCAPE (close submenu)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.SPACE } );
-		setTimeout( menukeyboard4 );
-	}
-
-	function menukeyboard4() {
-		equal( logOutput(), "keydown,0", "Keydown SPACE (open submenu)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( logOutput(), "keydown,4", "Keydown ESCAPE (close submenu)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-		setTimeout( function() {
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-			setTimeout( function() {
-				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-				equal( logOutput(), "keydown,5,6,0,1,0,2,4,0", "Keydown skip dividers" );
-
-				log( "keydown", true );
-				element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-				setTimeout( menukeyboard6 );
-			} );
-		} );
-	}
-
-	function menukeyboard6() {
-		equal( logOutput(), "keydown,Ada", "Keydown ENTER (open submenu)" );
-		start();
-	}
-});
-
-asyncTest( "handle keyboard navigation on menu with scroll and without submenus", function() {
-	expect( 14 );
-	var element = $( "#menu3" ).menu({
-		select: function( event, ui ) {
-			log( $( ui.item[ 0 ] ).text() );
-		},
-		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active:last" ).parent().index() );
-		}
-	});
-
-	log( "keydown", true );
-	element[ 0 ].focus();
-	setTimeout(function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		equal( logOutput(), "keydown,1,0", "Keydown UP" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-		equal( logOutput(), "keydown", "Keydown RIGHT (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "keydown,17", "Keydown PAGE_DOWN" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "keydown,34", "Keydown PAGE_DOWN" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "keydown,17", "Keydown PAGE_UP" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-		equal( logOutput(), "keydown,37", "Keydown END" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-		equal( logOutput(), "keydown,0", "Keydown HOME" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( logOutput(), "keydown", "Keydown ESCAPE (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
-
-		start();
-	});
-});
-
-asyncTest( "handle keyboard navigation on menu with scroll and with submenus", function() {
-	expect( 14 );
-	var element = $( "#menu4" ).menu({
-		select: function( event, ui ) {
-			log( $( ui.item[ 0 ] ).text() );
-		},
-		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active:last" ).parent().index());
-		}
-	});
-
-	log( "keydown", true );
-	element.one( "menufocus", function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( logOutput(), "keydown,1,2", "Keydown DOWN" );
-		setTimeout( menukeyboard1 );
-	});
-	element.focus();
-
-	function menukeyboard1() {
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		equal( logOutput(), "keydown,1,0", "Keydown UP" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-
-		setTimeout( function() {
-			equal( logOutput(), "keydown,1,0", "Keydown RIGHT (open submenu)" );
-		}, 50 );
-		setTimeout( menukeyboard2, 50 );
-	}
-
-	function menukeyboard2() {
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "keydown,1", "Keydown LEFT (close submenu)" );
-
-		// re-open submenu
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-		setTimeout( menukeyboard3, 50 );
-	}
-
-	function menukeyboard3() {
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "keydown,17", "Keydown PAGE_DOWN" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "keydown,27", "Keydown PAGE_DOWN" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "keydown,10", "Keydown PAGE_UP" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-		equal( logOutput(), "keydown,27", "Keydown END" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-		equal( logOutput(), "keydown,0", "Keydown HOME" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( logOutput(), "keydown,1", "Keydown ESCAPE (close submenu)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		setTimeout( menukeyboard4, 50 );
-	}
-
-	function menukeyboard4() {
-		equal( logOutput(), "keydown,0", "Keydown ENTER (open submenu)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER (select item)" );
-
-		start();
-	}
-});
-
-asyncTest( "handle keyboard navigation and mouse click on menu with disabled items", function() {
-	expect( 6 );
-	var element = $( "#menu6" ).menu({
-		select: function( event, ui ) {
-			log( $( ui.item[0] ).text() );
-		},
-		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index());
-		}
-	});
-
-	log( "keydown", true );
-	element.one( "menufocus", function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( logOutput(), "keydown,1", "Keydown focus but not select disabled item" );
-		setTimeout( menukeyboard1, 50 );
-	});
-	element.focus();
-
-	function menukeyboard1() {
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( logOutput(), "keydown,2,3,4", "Keydown focus disabled item with submenu" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
-
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-
-		setTimeout( function() {
-			equal( logOutput(), "keydown", "Keydown RIGHT (no effect on disabled sub-menu)" );
-
-			log( "keydown", true );
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-
-			setTimeout( function() {
-				equal( logOutput(), "keydown", "Keydown ENTER (no effect on disabled sub-menu)" );
-				log( "click", true );
-				click( element, "1" );
-				equal( logOutput(), "click", "Click disabled item (no effect)" );
-				start();
-			}, 50 );
-		}, 50 );
-	}
-});
-
-asyncTest( "handle keyboard navigation and mouse click on menu with dividers and group labels", function() {
-	expect( 2 );
-	var element = $( "#menu7" ).menu({
-		items: "> :not('.ui-menu-group')",
-		select: function( event, ui ) {
-			log( $( ui.item[0] ).text() );
-		},
-		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
-		}
-	});
-
-	log( "keydown", true );
-	element.one( "menufocus", function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( logOutput(), "keydown,2,Ada", "Keydown skips initial group label" );
-		setTimeout( menukeyboard1, 50 );
-	});
-	element.focus();
-
-	function menukeyboard1() {
-		log( "keydown", true );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( logOutput(), "keydown,3,4,7", "Keydown focus skips divider and group label" );
-		start();
-	}
-});
-
-asyncTest( "handle keyboard navigation with spelling of menu items", function() {
-	expect( 3 );
-	var element = $( "#menu2" ).menu({
-		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
-		}
-	});
-
-	log( "keydown", true );
-	element.one( "menufocus", function() {
-		element.simulate( "keydown", { keyCode: 65 } );
-		element.simulate( "keydown", { keyCode: 68 } );
-		element.simulate( "keydown", { keyCode: 68 } );
-		equal( logOutput(), "keydown,0,1,3", "Keydown focus Addyston by spelling the first 3 letters" );
-		element.simulate( "keydown", { keyCode: 68 } );
-		equal( logOutput(), "keydown,0,1,3,4", "Keydown focus Delphi by repeating the 'd' again" );
-		element.simulate( "keydown", { keyCode: 83 } );
-		equal( logOutput(), "keydown,0,1,3,4,5", "Keydown focus Saarland ignoring leading space" );
-		start();
-	});
-	element[ 0 ].focus();
-});
-
-asyncTest( "Keep focus on selected item (see #10644)", function() {
-	expect( 1 );
-	var element = $( "#menu2" ).menu({
-		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
-		}
-	});
-
-	log( "keydown", true );
-	element.one( "menufocus", function() {
-		element.simulate( "keydown", { keyCode: 65 } );
-		element.simulate( "keydown", { keyCode: 68 } );
-		element.simulate( "keydown", { keyCode: 68 } );
-		element.simulate( "keydown", { keyCode: 89 } );
-		element.simulate( "keydown", { keyCode: 83 } );
-		equal( logOutput(), "keydown,0,1,3,3,3",
-			"Focus stays on 'Addyston', even after other options are eliminated" );
-		start();
-	});
-	element[ 0 ].focus();
-});
-
-test( "#9469: Stopping propagation in a select event should not suppress subsequent select events.", function() {
-	expect( 1 );
-	var element = $( "#menu1" ).menu({
-		select: function( event ) {
-			log();
-			event.stopPropagation();
-		}
-	});
-
-	click( element, "1" );
-	click( element, "2" );
-
-	equal( logOutput(), "1,2", "Both select events were not triggered." );
-});
-
-asyncTest( "#10571: When typing in a menu, only menu-items should be focused", function( assert ) {
-	expect( 3 );
-
-	var element = $( "#menu8" ).menu({
-		focus: function( event, ui ) {
-			equal( ui.item.length, 1, "There should only be one match when filtering" );
-			assert.hasClasses( ui.item, "ui-menu-item" );
-			equal( ui.item.text(), "-Saarland", "element has correct text" );
-		}
-	});
-
-	setTimeout(function() {
-		element.menu( "widget" ).simulate( "keydown", { keyCode: "-".charCodeAt( 0 ) } );
-		start();
-	});
-});
-
-} );
diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js
deleted file mode 100644
index 61be3229f..000000000
--- a/tests/unit/menu/menu_methods.js
+++ /dev/null
@@ -1,116 +0,0 @@
-define( [
-	"jquery",
-	"./menu_test_helpers",
-	"ui/menu"
-], function( $, testHelper ) {
-
-var log = testHelper.log,
-	logOutput = testHelper.logOutput,
-	click = testHelper.click;
-
-module( "menu: methods", {
-	setup: function() {
-		testHelper.clearLog();
-	}
-});
-
-test( "destroy", function( assert ) {
-	expect( 2 );
-	assert.domEqual( "#menu2", function() {
-		$( "#menu2" ).menu().menu( "destroy" );
-	});
-	assert.domEqual( "#menu5", function() {
-		$( "#menu5").menu().menu( "destroy" );
-	});
-});
-
-test( "enable/disable", function( assert ) {
-	expect( 3 );
-	var element = $( "#menu1" ).menu({
-		select: function() {
-			log();
-		}
-	});
-	element.menu( "disable" );
-	assert.hasClasses( element, "ui-state-disabled" );
-	log( "click", true );
-	click( element, "1" );
-	log( "afterclick" );
-	element.menu( "enable" );
-	assert.lacksClasses( element, "ui-state-disabled" );
-	log( "click" );
-	click( element, "1" );
-	log( "afterclick" );
-	equal( logOutput(), "click,afterclick,click,1,afterclick", "Click order not valid." );
-});
-
-test( "refresh", function() {
-	expect( 5 );
-	var element = $( "#menu1" ).menu();
-	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
-	element.append( "<li><a href='#'>test item</a></li>" ).menu( "refresh" );
-	equal( element.find( ".ui-menu-item" ).length, 6, "Incorrect number of menu items" );
-	element.find( ".ui-menu-item:last" ).remove().end().menu( "refresh" );
-	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
-	element.append( "<li>---</li>" ).menu( "refresh" );
-	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
-	element.children( ":last" ).remove().end().menu( "refresh" );
-	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
-});
-
-test( "refresh submenu", function() {
-	expect( 2 );
-	var element = $( "#menu2" ).menu();
-	equal( element.find( "ul:first .ui-menu-item" ).length, 3 );
-	element.find( "ul" ).addBack().append( "<li><a href=\"#\">New Item</a></li>" );
-	element.menu( "refresh" );
-	equal( element.find( "ul:first .ui-menu-item" ).length, 4 );
-});
-
-test( "refresh icons (see #9377)", function( assert ) {
-	expect( 3 );
-	var element = $( "#menu1" ).menu();
-	assert.lacksClasses( element, "ui-menu-icons" );
-	element.find( "li:first .ui-menu-item-wrapper" )
-		.html( "<span class='ui-icon ui-icon-disk'></span>Save</a>" );
-	element.menu( "refresh" );
-
-	assert.hasClasses( element, "ui-menu-icons" );
-	element.find( "li:first .ui-menu-item-wrapper" ).html( "Save" );
-	element.menu( "refresh" );
-	assert.lacksClasses( element, "ui-menu-icons" );
-});
-
-test( "widget", function() {
-	expect( 2 );
-	var element = $( "#menu1" ).menu(),
-		widgetElement = element.menu( "widget" );
-	equal( widgetElement.length, 1, "one element" );
-	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
-});
-
-// TODO: test focus method
-
-// TODO: test blur method
-
-// TODO: test collapseAll method
-
-// TODO: test collapse method
-
-// TODO: test expand method
-
-// TODO: test next method
-
-// TODO: test prev method
-
-// TODO: test isFirstItem method
-
-// TODO: test isLastItem method
-
-// TODO: test nextPage method
-
-// TODO: test prevPage method
-
-// TODO: test select method
-
-} );
diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
deleted file mode 100644
index 762b057fb..000000000
--- a/tests/unit/menu/menu_options.js
+++ /dev/null
@@ -1,125 +0,0 @@
-define( [
-	"jquery",
-	"./menu_test_helpers",
-	"ui/menu"
-], function( $, testHelper ) {
-
-var log = testHelper.log,
-	logOutput = testHelper.logOutput,
-	click = testHelper.click;
-
-module( "menu: options", {
-	setup: function() {
-		testHelper.clearLog();
-	}
-});
-
-test( "{ disabled: true }", function( assert ) {
-	expect( 2 );
-	var element = $( "#menu1" ).menu({
-		disabled: true,
-		select: function() {
-			log();
-		}
-	});
-	assert.hasClasses( element, "ui-state-disabled" );
-	log( "click", true );
-	click( element, "1" );
-	log( "afterclick" );
-	equal( logOutput(), "click,afterclick", "Click order not valid." );
-});
-
-test( "{ disabled: false }", function( assert ) {
-	expect( 2 );
-	var element = $( "#menu1" ).menu({
-		disabled: false,
-		select: function() {
-			log();
-		}
-	});
-	assert.lacksClasses( element, "ui-state-disabled" );
-	log( "click", true );
-	click( element, "1" );
-	log( "afterclick" );
-	equal( logOutput(), "click,1,afterclick", "Click order not valid." );
-});
-
-test( "{ icons: default }", function( assert ) {
-	expect( 8 );
-	var element = $( "#menu2" ).menu();
-	element.find( ".ui-menu-icon" ).each( function() {
-		assert.hasClasses( this, "ui-menu-icon ui-icon ui-icon-caret-1-e" );
-	});
-
-	element.menu( "option", "icons.submenu", "ui-icon-triangle-1-e" );
-	element.find( ".ui-menu-icon" ).each( function() {
-		assert.hasClasses( this, "ui-menu-icon ui-icon ui-icon-triangle-1-e" );
-	});
-});
-
-test( "{ icons: { submenu: 'custom' } }", function( assert ) {
-	expect( 4 );
-	var element = $( "#menu2" ).menu({
-		icons: {
-			submenu: "custom-class"
-		}
-	});
-	element.find( ".ui-menu-icon" ).each( function() {
-		assert.hasClasses( this, "ui-menu-icon ui-icon custom-class" );
-	});
-});
-
-// TODO: test menus option
-
-// TODO: test position option
-
-test( "{ role: 'menu' } ", function( assert ) {
-	var element = $( "#menu1" ).menu(),
-		items = element.find( "li" );
-	expect( 2 + 3 * items.length );
-	equal( element.attr( "role" ), "menu" );
-	ok( items.length > 0, "number of menu items" );
-	items.each(function( item ) {
-		assert.hasClasses( $( this ), "ui-menu-item" );
-		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ),
-			"menuitem", "menu item ("+ item + ") role" );
-		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
-			"tabindex for menu item ("+ item + ")" );
-	});
-});
-
-test( "{ role: 'listbox' } ", function( assert ) {
-	var element = $( "#menu1" ).menu({
-			role: "listbox"
-		}),
-		items = element.find( "li" );
-	expect( 2 + 3 * items.length );
-	equal( element.attr( "role" ), "listbox" );
-	ok( items.length > 0, "number of menu items" );
-	items.each(function( item ) {
-		assert.hasClasses( $( this ), "ui-menu-item" );
-		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), "option",
-			"menu item ("+ item + ") role" );
-		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
-			"tabindex for menu item ("+ item + ")" );
-	});
-});
-
-test( "{ role: null }", function( assert ) {
-	var element = $( "#menu1" ).menu({
-			role: null
-		}),
-		items = element.find( "li" );
-	expect( 2 + 3 * items.length );
-	equal( element.attr( "role" ), null );
-	ok( items.length > 0, "number of menu items" );
-	items.each(function( item ) {
-		assert.hasClasses( $( this ), "ui-menu-item" );
-		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), null,
-			"menu item ("+ item + ") role" );
-		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
-			"tabindex for menu item ("+ item + ")" );
-	});
-});
-
-} );
diff --git a/tests/unit/menu/menu_test_helpers.js b/tests/unit/menu/menu_test_helpers.js
deleted file mode 100644
index 445663985..000000000
--- a/tests/unit/menu/menu_test_helpers.js
+++ /dev/null
@@ -1,36 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper"
-], function( $, helper ) {
-
-var lastItem,
-	log = [];
-
-return $.extend( helper, {
-	log: function( message, clear ) {
-		if ( clear ) {
-			log.length = 0;
-		}
-		if ( message === undefined ) {
-			message = lastItem;
-		}
-		log.push( $.trim( message ) );
-	},
-
-	logOutput: function() {
-		return log.join( "," );
-	},
-
-	clearLog: function() {
-		log.length = 0;
-	},
-
-	click: function( menu, item ) {
-		lastItem = item;
-		menu.children( ":eq(" + item + ")" )
-			.children( ".ui-menu-item-wrapper" )
-			.trigger( "click" );
-	}
-} );
-
-} );
diff --git a/tests/unit/menu/methods.js b/tests/unit/menu/methods.js
new file mode 100644
index 000000000..e322ab214
--- /dev/null
+++ b/tests/unit/menu/methods.js
@@ -0,0 +1,116 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/menu"
+], function( $, testHelper ) {
+
+var log = testHelper.log,
+	logOutput = testHelper.logOutput,
+	click = testHelper.click;
+
+module( "menu: methods", {
+	setup: function() {
+		testHelper.clearLog();
+	}
+});
+
+test( "destroy", function( assert ) {
+	expect( 2 );
+	assert.domEqual( "#menu2", function() {
+		$( "#menu2" ).menu().menu( "destroy" );
+	});
+	assert.domEqual( "#menu5", function() {
+		$( "#menu5").menu().menu( "destroy" );
+	});
+});
+
+test( "enable/disable", function( assert ) {
+	expect( 3 );
+	var element = $( "#menu1" ).menu({
+		select: function() {
+			log();
+		}
+	});
+	element.menu( "disable" );
+	assert.hasClasses( element, "ui-state-disabled" );
+	log( "click", true );
+	click( element, "1" );
+	log( "afterclick" );
+	element.menu( "enable" );
+	assert.lacksClasses( element, "ui-state-disabled" );
+	log( "click" );
+	click( element, "1" );
+	log( "afterclick" );
+	equal( logOutput(), "click,afterclick,click,1,afterclick", "Click order not valid." );
+});
+
+test( "refresh", function() {
+	expect( 5 );
+	var element = $( "#menu1" ).menu();
+	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+	element.append( "<li><a href='#'>test item</a></li>" ).menu( "refresh" );
+	equal( element.find( ".ui-menu-item" ).length, 6, "Incorrect number of menu items" );
+	element.find( ".ui-menu-item:last" ).remove().end().menu( "refresh" );
+	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+	element.append( "<li>---</li>" ).menu( "refresh" );
+	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+	element.children( ":last" ).remove().end().menu( "refresh" );
+	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+});
+
+test( "refresh submenu", function() {
+	expect( 2 );
+	var element = $( "#menu2" ).menu();
+	equal( element.find( "ul:first .ui-menu-item" ).length, 3 );
+	element.find( "ul" ).addBack().append( "<li><a href=\"#\">New Item</a></li>" );
+	element.menu( "refresh" );
+	equal( element.find( "ul:first .ui-menu-item" ).length, 4 );
+});
+
+test( "refresh icons (see #9377)", function( assert ) {
+	expect( 3 );
+	var element = $( "#menu1" ).menu();
+	assert.lacksClasses( element, "ui-menu-icons" );
+	element.find( "li:first .ui-menu-item-wrapper" )
+		.html( "<span class='ui-icon ui-icon-disk'></span>Save</a>" );
+	element.menu( "refresh" );
+
+	assert.hasClasses( element, "ui-menu-icons" );
+	element.find( "li:first .ui-menu-item-wrapper" ).html( "Save" );
+	element.menu( "refresh" );
+	assert.lacksClasses( element, "ui-menu-icons" );
+});
+
+test( "widget", function() {
+	expect( 2 );
+	var element = $( "#menu1" ).menu(),
+		widgetElement = element.menu( "widget" );
+	equal( widgetElement.length, 1, "one element" );
+	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
+});
+
+// TODO: test focus method
+
+// TODO: test blur method
+
+// TODO: test collapseAll method
+
+// TODO: test collapse method
+
+// TODO: test expand method
+
+// TODO: test next method
+
+// TODO: test prev method
+
+// TODO: test isFirstItem method
+
+// TODO: test isLastItem method
+
+// TODO: test nextPage method
+
+// TODO: test prevPage method
+
+// TODO: test select method
+
+} );
diff --git a/tests/unit/menu/options.js b/tests/unit/menu/options.js
new file mode 100644
index 000000000..8994b026f
--- /dev/null
+++ b/tests/unit/menu/options.js
@@ -0,0 +1,125 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/menu"
+], function( $, testHelper ) {
+
+var log = testHelper.log,
+	logOutput = testHelper.logOutput,
+	click = testHelper.click;
+
+module( "menu: options", {
+	setup: function() {
+		testHelper.clearLog();
+	}
+});
+
+test( "{ disabled: true }", function( assert ) {
+	expect( 2 );
+	var element = $( "#menu1" ).menu({
+		disabled: true,
+		select: function() {
+			log();
+		}
+	});
+	assert.hasClasses( element, "ui-state-disabled" );
+	log( "click", true );
+	click( element, "1" );
+	log( "afterclick" );
+	equal( logOutput(), "click,afterclick", "Click order not valid." );
+});
+
+test( "{ disabled: false }", function( assert ) {
+	expect( 2 );
+	var element = $( "#menu1" ).menu({
+		disabled: false,
+		select: function() {
+			log();
+		}
+	});
+	assert.lacksClasses( element, "ui-state-disabled" );
+	log( "click", true );
+	click( element, "1" );
+	log( "afterclick" );
+	equal( logOutput(), "click,1,afterclick", "Click order not valid." );
+});
+
+test( "{ icons: default }", function( assert ) {
+	expect( 8 );
+	var element = $( "#menu2" ).menu();
+	element.find( ".ui-menu-icon" ).each( function() {
+		assert.hasClasses( this, "ui-menu-icon ui-icon ui-icon-caret-1-e" );
+	});
+
+	element.menu( "option", "icons.submenu", "ui-icon-triangle-1-e" );
+	element.find( ".ui-menu-icon" ).each( function() {
+		assert.hasClasses( this, "ui-menu-icon ui-icon ui-icon-triangle-1-e" );
+	});
+});
+
+test( "{ icons: { submenu: 'custom' } }", function( assert ) {
+	expect( 4 );
+	var element = $( "#menu2" ).menu({
+		icons: {
+			submenu: "custom-class"
+		}
+	});
+	element.find( ".ui-menu-icon" ).each( function() {
+		assert.hasClasses( this, "ui-menu-icon ui-icon custom-class" );
+	});
+});
+
+// TODO: test menus option
+
+// TODO: test position option
+
+test( "{ role: 'menu' } ", function( assert ) {
+	var element = $( "#menu1" ).menu(),
+		items = element.find( "li" );
+	expect( 2 + 3 * items.length );
+	equal( element.attr( "role" ), "menu" );
+	ok( items.length > 0, "number of menu items" );
+	items.each(function( item ) {
+		assert.hasClasses( $( this ), "ui-menu-item" );
+		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ),
+			"menuitem", "menu item ("+ item + ") role" );
+		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
+			"tabindex for menu item ("+ item + ")" );
+	});
+});
+
+test( "{ role: 'listbox' } ", function( assert ) {
+	var element = $( "#menu1" ).menu({
+			role: "listbox"
+		}),
+		items = element.find( "li" );
+	expect( 2 + 3 * items.length );
+	equal( element.attr( "role" ), "listbox" );
+	ok( items.length > 0, "number of menu items" );
+	items.each(function( item ) {
+		assert.hasClasses( $( this ), "ui-menu-item" );
+		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), "option",
+			"menu item ("+ item + ") role" );
+		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
+			"tabindex for menu item ("+ item + ")" );
+	});
+});
+
+test( "{ role: null }", function( assert ) {
+	var element = $( "#menu1" ).menu({
+			role: null
+		}),
+		items = element.find( "li" );
+	expect( 2 + 3 * items.length );
+	equal( element.attr( "role" ), null );
+	ok( items.length > 0, "number of menu items" );
+	items.each(function( item ) {
+		assert.hasClasses( $( this ), "ui-menu-item" );
+		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), null,
+			"menu item ("+ item + ") role" );
+		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
+			"tabindex for menu item ("+ item + ")" );
+	});
+});
+
+} );
diff --git a/tests/unit/position/core.js b/tests/unit/position/core.js
new file mode 100644
index 000000000..c480e2178
--- /dev/null
+++ b/tests/unit/position/core.js
@@ -0,0 +1,770 @@
+define( [
+	"jquery",
+	"lib/common",
+	"ui/position"
+], function( $, common ) {
+
+var win = $( window ),
+	scrollTopSupport = function() {
+		var support = win.scrollTop( 1 ).scrollTop() === 1;
+		win.scrollTop( 0 );
+		scrollTopSupport = function() {
+			return support;
+		};
+		return support;
+	};
+
+module( "position", {
+	setup: function() {
+		win.scrollTop( 0 ).scrollLeft( 0 );
+	}
+});
+
+common.testJshint( "position" );
+
+test( "my, at, of", function() {
+	expect( 4 );
+
+	$( "#elx" ).position({
+		my: "left top",
+		at: "left top",
+		of: "#parentx",
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 40, left: 40 }, "left top, left top" );
+
+	$( "#elx" ).position({
+		my: "left top",
+		at: "left bottom",
+		of: "#parentx",
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 60, left: 40 }, "left top, left bottom" );
+
+	$( "#elx" ).position({
+		my: "left",
+		at: "bottom",
+		of: "#parentx",
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 55, left: 50 }, "left, bottom" );
+
+	$( "#elx" ).position({
+		my: "left foo",
+		at: "bar baz",
+		of: "#parentx",
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 45, left: 50 }, "left foo, bar baz" );
+});
+
+test( "multiple elements", function() {
+	expect( 3 );
+
+	var elements = $( "#el1, #el2" ),
+		result = elements.position({
+			my: "left top",
+			at: "left bottom",
+			of: "#parent",
+			collision: "none"
+		}),
+		expected = { top: 10, left: 4 };
+
+	deepEqual( result, elements );
+	elements.each(function() {
+		deepEqual( $( this ).offset(), expected );
+	});
+});
+
+test( "positions", function() {
+	expect( 18 );
+
+	var offsets = {
+			left: 0,
+			center: 3,
+			right: 6,
+			top: 0,
+			bottom: 6
+		},
+		start = { left: 4, top: 4 },
+		el = $( "#el1" );
+
+	$.each( [ 0, 1 ], function( my ) {
+		$.each( [ "top", "center", "bottom" ], function( vindex, vertical ) {
+			$.each( [ "left", "center", "right" ], function( hindex, horizontal ) {
+				var _my = my ? horizontal + " " + vertical : "left top",
+					_at = !my ? horizontal + " " + vertical : "left top";
+				el.position({
+					my: _my,
+					at: _at,
+					of: "#parent",
+					collision: "none"
+				});
+				deepEqual( el.offset(), {
+					top: start.top + offsets[ vertical ] * (my ? -1 : 1),
+					left: start.left + offsets[ horizontal ] * (my ? -1 : 1)
+				}, "Position via " + QUnit.jsDump.parse({ my: _my, at: _at }) );
+			});
+		});
+	});
+});
+
+test( "of", function() {
+	expect( 9 + (scrollTopSupport() ? 1 : 0) );
+
+	var event;
+
+	$( "#elx" ).position({
+		my: "left top",
+		at: "left top",
+		of: "#parentx",
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 40, left: 40 }, "selector" );
+
+	$( "#elx" ).position({
+		my: "left top",
+		at: "left bottom",
+		of: $( "#parentx"),
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 60, left: 40 }, "jQuery object" );
+
+	$( "#elx" ).position({
+		my: "left top",
+		at: "left top",
+		of: $( "#parentx" )[ 0 ],
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 40, left: 40 }, "DOM element" );
+
+	$( "#elx" ).position({
+		my: "right bottom",
+		at: "right bottom",
+		of: document,
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), {
+		top: $( document ).height() - 10,
+		left: $( document ).width() - 10
+	}, "document" );
+
+	$( "#elx" ).position({
+		my: "right bottom",
+		at: "right bottom",
+		of: $( document ),
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), {
+		top: $( document ).height() - 10,
+		left: $( document ).width() - 10
+	}, "document as jQuery object" );
+
+	win.scrollTop( 0 );
+
+	$( "#elx" ).position({
+		my: "right bottom",
+		at: "right bottom",
+		of: window,
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), {
+		top: win.height() - 10,
+		left: win.width() - 10
+	}, "window" );
+
+	$( "#elx" ).position({
+		my: "right bottom",
+		at: "right bottom",
+		of: win,
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), {
+		top: win.height() - 10,
+		left: win.width() - 10
+	}, "window as jQuery object" );
+
+	if ( scrollTopSupport() ) {
+		win.scrollTop( 500 ).scrollLeft( 200 );
+		$( "#elx" ).position({
+			my: "right bottom",
+			at: "right bottom",
+			of: window,
+			collision: "none"
+		});
+		deepEqual( $( "#elx" ).offset(), {
+			top: win.height() + 500 - 10,
+			left: win.width() + 200 - 10
+		}, "window, scrolled" );
+		win.scrollTop( 0 ).scrollLeft( 0 );
+	}
+
+	event = $.extend( $.Event( "someEvent" ), { pageX: 200, pageY: 300 } );
+	$( "#elx" ).position({
+		my: "left top",
+		at: "left top",
+		of: event,
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), {
+		top: 300,
+		left: 200
+	}, "event - left top, left top" );
+
+	event = $.extend( $.Event( "someEvent" ), { pageX: 400, pageY: 600 } );
+	$( "#elx" ).position({
+		my: "left top",
+		at: "right bottom",
+		of: event,
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), {
+		top: 600,
+		left: 400
+	}, "event - left top, right bottom" );
+});
+
+test( "offsets", function() {
+	expect( 9 );
+
+	var offset;
+
+	$( "#elx" ).position({
+		my: "left top",
+		at: "left+10 bottom+10",
+		of: "#parentx",
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 70, left: 50 }, "offsets in at" );
+
+	$( "#elx" ).position({
+		my: "left+10 top-10",
+		at: "left bottom",
+		of: "#parentx",
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 50, left: 50 }, "offsets in my" );
+
+	$( "#elx" ).position({
+		my: "left top",
+		at: "left+50% bottom-10%",
+		of: "#parentx",
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 58, left: 50 }, "percentage offsets in at" );
+
+	$( "#elx" ).position({
+		my: "left-30% top+50%",
+		at: "left bottom",
+		of: "#parentx",
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 65, left: 37 }, "percentage offsets in my" );
+
+	$( "#elx" ).position({
+		my: "left-30.001% top+50.0%",
+		at: "left bottom",
+		of: "#parentx",
+		collision: "none"
+	});
+	offset = $( "#elx" ).offset();
+	equal( Math.round( offset.top ), 65, "decimal percentage offsets in my" );
+	equal( Math.round( offset.left ), 37, "decimal percentage offsets in my" );
+
+	$( "#elx" ).position({
+		my: "left+10.4 top-10.6",
+		at: "left bottom",
+		of: "#parentx",
+		collision: "none"
+	});
+	offset = $( "#elx" ).offset();
+	equal( Math.round( offset.top ), 49, "decimal offsets in my" );
+	equal( Math.round( offset.left ), 50, "decimal offsets in my" );
+
+	$( "#elx" ).position({
+		my: "left+right top-left",
+		at: "left-top bottom-bottom",
+		of: "#parentx",
+		collision: "none"
+	});
+	deepEqual( $( "#elx" ).offset(), { top: 60, left: 40 }, "invalid offsets" );
+});
+
+test( "using", function() {
+	expect( 10 );
+
+	var count = 0,
+		elems = $( "#el1, #el2" ),
+		of = $( "#parentx" ),
+		expectedPosition = { top: 60, left: 60 },
+		expectedFeedback = {
+			target: {
+				element: of,
+				width: 20,
+				height: 20,
+				left: 40,
+				top: 40
+			},
+			element: {
+				width: 6,
+				height: 6,
+				left: 60,
+				top: 60
+			},
+			horizontal: "left",
+			vertical: "top",
+			important: "vertical"
+		},
+		originalPosition = elems.position({
+			my: "right bottom",
+			at: "rigt bottom",
+			of: "#parentx",
+			collision: "none"
+		}).offset();
+
+	elems.position({
+		my: "left top",
+		at: "center+10 bottom",
+		of: "#parentx",
+		using: function( position, feedback ) {
+			deepEqual( this, elems[ count ], "correct context for call #" + count );
+			deepEqual( position, expectedPosition, "correct position for call #" + count );
+			deepEqual( feedback.element.element[ 0 ], elems[ count ] );
+			delete feedback.element.element;
+			deepEqual( feedback, expectedFeedback );
+			count++;
+		}
+	});
+
+	elems.each(function() {
+		deepEqual( $( this ).offset(), originalPosition, "elements not moved" );
+	});
+});
+
+function collisionTest( config, result, msg ) {
+	var elem = $( "#elx" ).position( $.extend({
+		my: "left top",
+		at: "right bottom",
+		of: "#parent"
+	}, config ) );
+	deepEqual( elem.offset(), result, msg );
+}
+
+function collisionTest2( config, result, msg ) {
+	collisionTest( $.extend({
+		my: "right bottom",
+		at: "left top"
+	}, config ), result, msg );
+}
+
+test( "collision: fit, no collision", function() {
+	expect( 2 );
+
+	collisionTest({
+		collision: "fit"
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
+
+	collisionTest({
+		collision: "fit",
+		at: "right+2 bottom+3"
+	}, {
+		top: 13,
+		left: 12
+	}, "with offset" );
+});
+
+// Currently failing in IE8 due to the iframe used by TestSwarm
+if ( !/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ) ) {
+test( "collision: fit, collision", function() {
+	expect( 2 + (scrollTopSupport() ? 1 : 0) );
+
+	collisionTest2({
+		collision: "fit"
+	}, {
+		top: 0,
+		left: 0
+	}, "no offset" );
+
+	collisionTest2({
+		collision: "fit",
+		at: "left+2 top+3"
+	}, {
+		top: 0,
+		left: 0
+	}, "with offset" );
+
+	if ( scrollTopSupport() ) {
+		win.scrollTop( 300 ).scrollLeft( 200 );
+		collisionTest({
+			collision: "fit"
+		}, {
+			top: 300,
+			left: 200
+		}, "window scrolled" );
+
+		win.scrollTop( 0 ).scrollLeft( 0 );
+	}
+});
+}
+
+test( "collision: flip, no collision", function() {
+	expect( 2 );
+
+	collisionTest({
+		collision: "flip"
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
+
+	collisionTest({
+		collision: "flip",
+		at: "right+2 bottom+3"
+	}, {
+		top: 13,
+		left: 12
+	}, "with offset" );
+});
+
+test( "collision: flip, collision", function() {
+	expect( 2 );
+
+	collisionTest2({
+		collision: "flip"
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
+
+	collisionTest2({
+		collision: "flip",
+		at: "left+2 top+3"
+	}, {
+		top: 7,
+		left: 8
+	}, "with offset" );
+});
+
+test( "collision: flipfit, no collision", function() {
+	expect( 2 );
+
+	collisionTest({
+		collision: "flipfit"
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
+
+	collisionTest({
+		collision: "flipfit",
+		at: "right+2 bottom+3"
+	}, {
+		top: 13,
+		left: 12
+	}, "with offset" );
+});
+
+test( "collision: flipfit, collision", function() {
+	expect( 2 );
+
+	collisionTest2({
+		collision: "flipfit"
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
+
+	collisionTest2({
+		collision: "flipfit",
+		at: "left+2 top+3"
+	}, {
+		top: 7,
+		left: 8
+	}, "with offset" );
+});
+
+test( "collision: none, no collision", function() {
+	expect( 2 );
+
+	collisionTest({
+		collision: "none"
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
+
+	collisionTest({
+		collision: "none",
+		at: "right+2 bottom+3"
+	}, {
+		top: 13,
+		left: 12
+	}, "with offset" );
+});
+
+test( "collision: none, collision", function() {
+	expect( 2 );
+
+	collisionTest2({
+		collision: "none"
+	}, {
+		top: -6,
+		left: -6
+	}, "no offset" );
+
+	collisionTest2({
+		collision: "none",
+		at: "left+2 top+3"
+	}, {
+		top: -3,
+		left: -4
+	}, "with offset" );
+});
+
+test( "collision: fit, with margin", function() {
+	expect( 2 );
+
+	$( "#elx" ).css({
+		marginTop: 6,
+		marginLeft: 4
+	});
+
+	collisionTest({
+		collision: "fit"
+	}, {
+		top: 10,
+		left: 10
+	}, "right bottom" );
+
+	collisionTest2({
+		collision: "fit"
+	}, {
+		top: 6,
+		left: 4
+	}, "left top" );
+});
+
+test( "collision: flip, with margin", function() {
+	expect( 3 );
+
+	$( "#elx" ).css({
+		marginTop: 6,
+		marginLeft: 4
+	});
+
+	collisionTest({
+		collision: "flip"
+	}, {
+		top: 10,
+		left: 10
+	}, "left top" );
+
+	collisionTest2({
+		collision: "flip"
+	}, {
+		top: 10,
+		left: 10
+	}, "right bottom" );
+
+	collisionTest2({
+		collision: "flip",
+		my: "left top"
+	}, {
+		top: 0,
+		left: 4
+	}, "right bottom" );
+});
+
+test( "within", function() {
+	expect( 7 );
+
+	collisionTest({
+		within: document
+	}, {
+		top: 10,
+		left: 10
+	}, "within document" );
+
+	collisionTest({
+		within: "#within",
+		collision: "fit"
+	}, {
+		top: 4,
+		left: 2
+	}, "fit - right bottom" );
+
+	collisionTest2({
+		within: "#within",
+		collision: "fit"
+	}, {
+		top: 2,
+		left: 0
+	}, "fit - left top" );
+
+	collisionTest({
+		within: "#within",
+		collision: "flip"
+	}, {
+		top: 10,
+		left: -6
+	}, "flip - right bottom" );
+
+	collisionTest2({
+		within: "#within",
+		collision: "flip"
+	}, {
+		top: 10,
+		left: -6
+	}, "flip - left top" );
+
+	collisionTest({
+		within: "#within",
+		collision: "flipfit"
+	}, {
+		top: 4,
+		left: 0
+	}, "flipfit - right bottom" );
+
+	collisionTest2({
+		within: "#within",
+		collision: "flipfit"
+	}, {
+		top: 4,
+		left: 0
+	}, "flipfit - left top" );
+});
+
+test( "with scrollbars", function() {
+	expect( 4 );
+
+	$( "#scrollx" ).css({
+		width: 100,
+		height: 100,
+		left: 0,
+		top: 0
+	});
+
+	collisionTest({
+		of: "#scrollx",
+		collision: "fit",
+		within: "#scrollx"
+	}, {
+		top: 90,
+		left: 90
+	}, "visible" );
+
+	$( "#scrollx" ).css({
+		overflow: "scroll"
+	});
+
+	var scrollbarInfo = $.position.getScrollInfo( $.position.getWithinInfo( $( "#scrollx" ) ) );
+
+	collisionTest({
+		of: "#scrollx",
+		collision: "fit",
+		within: "#scrollx"
+	}, {
+		top: 90 - scrollbarInfo.height,
+		left: 90 - scrollbarInfo.width
+	}, "scroll" );
+
+	$( "#scrollx" ).css({
+		overflow: "auto"
+	});
+
+	collisionTest({
+		of: "#scrollx",
+		collision: "fit",
+		within: "#scrollx"
+	}, {
+		top: 90,
+		left: 90
+	}, "auto, no scroll" );
+
+	$( "#scrollx" ).css({
+		overflow: "auto"
+	}).append( $("<div>").height(300).width(300) );
+
+	collisionTest({
+		of: "#scrollx",
+		collision: "fit",
+		within: "#scrollx"
+	}, {
+		top: 90 - scrollbarInfo.height,
+		left: 90 - scrollbarInfo.width
+	}, "auto, with scroll" );
+});
+
+test( "fractions", function() {
+	expect( 1 );
+
+	$( "#fractions-element" ).position({
+		my: "left top",
+		at: "left top",
+		of: "#fractions-parent",
+		collision: "none"
+	});
+	deepEqual( $( "#fractions-element" ).offset(), $( "#fractions-parent" ).offset(), "left top, left top" );
+});
+
+test( "bug #5280: consistent results (avoid fractional values)", function() {
+	expect( 1 );
+
+	var wrapper = $( "#bug-5280" ),
+		elem = wrapper.children(),
+		offset1 = elem.position({
+			my: "center",
+			at: "center",
+			of: wrapper,
+			collision: "none"
+		}).offset(),
+		offset2 = elem.position({
+			my: "center",
+			at: "center",
+			of: wrapper,
+			collision: "none"
+		}).offset();
+	deepEqual( offset1, offset2 );
+});
+
+test( "bug #8710: flip if flipped position fits more", function() {
+	expect( 3 );
+
+	// Positions a 10px tall element within 99px height at top 90px.
+	collisionTest({
+		within: "#bug-8710-within-smaller",
+		of: "#parentx",
+		collision: "flip",
+		at: "right bottom+30"
+	}, {
+		top: 0,
+		left: 60
+	}, "flip - top fits all" );
+
+	// Positions a 10px tall element within 99px height at top 92px.
+	collisionTest({
+		within: "#bug-8710-within-smaller",
+		of: "#parentx",
+		collision: "flip",
+		at: "right bottom+32"
+	}, {
+		top: -2,
+		left: 60
+	}, "flip - top fits more" );
+
+	// Positions a 10px tall element within 101px height at top 92px.
+	collisionTest({
+		within: "#bug-8710-within-bigger",
+		of: "#parentx",
+		collision: "flip",
+		at: "right bottom+32"
+	}, {
+		top: 92,
+		left: 60
+	}, "no flip - top fits less" );
+});
+
+} );
diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 1d4087281..e36ab5480 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Position Test Suite</title>
 
 	<script src="../../lib/css.js"></script>
-	<script src="../../lib/bootstrap.js" data-modules="position_core"></script>
+	<script src="../../lib/bootstrap.js" data-modules="core"></script>
 </head>
 <body>
 <div id="qunit" style="position:relative; z-index:2;"></div>
diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js
deleted file mode 100644
index c480e2178..000000000
--- a/tests/unit/position/position_core.js
+++ /dev/null
@@ -1,770 +0,0 @@
-define( [
-	"jquery",
-	"lib/common",
-	"ui/position"
-], function( $, common ) {
-
-var win = $( window ),
-	scrollTopSupport = function() {
-		var support = win.scrollTop( 1 ).scrollTop() === 1;
-		win.scrollTop( 0 );
-		scrollTopSupport = function() {
-			return support;
-		};
-		return support;
-	};
-
-module( "position", {
-	setup: function() {
-		win.scrollTop( 0 ).scrollLeft( 0 );
-	}
-});
-
-common.testJshint( "position" );
-
-test( "my, at, of", function() {
-	expect( 4 );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left top",
-		of: "#parentx",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 40, left: 40 }, "left top, left top" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left bottom",
-		of: "#parentx",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 60, left: 40 }, "left top, left bottom" );
-
-	$( "#elx" ).position({
-		my: "left",
-		at: "bottom",
-		of: "#parentx",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 55, left: 50 }, "left, bottom" );
-
-	$( "#elx" ).position({
-		my: "left foo",
-		at: "bar baz",
-		of: "#parentx",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 45, left: 50 }, "left foo, bar baz" );
-});
-
-test( "multiple elements", function() {
-	expect( 3 );
-
-	var elements = $( "#el1, #el2" ),
-		result = elements.position({
-			my: "left top",
-			at: "left bottom",
-			of: "#parent",
-			collision: "none"
-		}),
-		expected = { top: 10, left: 4 };
-
-	deepEqual( result, elements );
-	elements.each(function() {
-		deepEqual( $( this ).offset(), expected );
-	});
-});
-
-test( "positions", function() {
-	expect( 18 );
-
-	var offsets = {
-			left: 0,
-			center: 3,
-			right: 6,
-			top: 0,
-			bottom: 6
-		},
-		start = { left: 4, top: 4 },
-		el = $( "#el1" );
-
-	$.each( [ 0, 1 ], function( my ) {
-		$.each( [ "top", "center", "bottom" ], function( vindex, vertical ) {
-			$.each( [ "left", "center", "right" ], function( hindex, horizontal ) {
-				var _my = my ? horizontal + " " + vertical : "left top",
-					_at = !my ? horizontal + " " + vertical : "left top";
-				el.position({
-					my: _my,
-					at: _at,
-					of: "#parent",
-					collision: "none"
-				});
-				deepEqual( el.offset(), {
-					top: start.top + offsets[ vertical ] * (my ? -1 : 1),
-					left: start.left + offsets[ horizontal ] * (my ? -1 : 1)
-				}, "Position via " + QUnit.jsDump.parse({ my: _my, at: _at }) );
-			});
-		});
-	});
-});
-
-test( "of", function() {
-	expect( 9 + (scrollTopSupport() ? 1 : 0) );
-
-	var event;
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left top",
-		of: "#parentx",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 40, left: 40 }, "selector" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left bottom",
-		of: $( "#parentx"),
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 60, left: 40 }, "jQuery object" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left top",
-		of: $( "#parentx" )[ 0 ],
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 40, left: 40 }, "DOM element" );
-
-	$( "#elx" ).position({
-		my: "right bottom",
-		at: "right bottom",
-		of: document,
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), {
-		top: $( document ).height() - 10,
-		left: $( document ).width() - 10
-	}, "document" );
-
-	$( "#elx" ).position({
-		my: "right bottom",
-		at: "right bottom",
-		of: $( document ),
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), {
-		top: $( document ).height() - 10,
-		left: $( document ).width() - 10
-	}, "document as jQuery object" );
-
-	win.scrollTop( 0 );
-
-	$( "#elx" ).position({
-		my: "right bottom",
-		at: "right bottom",
-		of: window,
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), {
-		top: win.height() - 10,
-		left: win.width() - 10
-	}, "window" );
-
-	$( "#elx" ).position({
-		my: "right bottom",
-		at: "right bottom",
-		of: win,
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), {
-		top: win.height() - 10,
-		left: win.width() - 10
-	}, "window as jQuery object" );
-
-	if ( scrollTopSupport() ) {
-		win.scrollTop( 500 ).scrollLeft( 200 );
-		$( "#elx" ).position({
-			my: "right bottom",
-			at: "right bottom",
-			of: window,
-			collision: "none"
-		});
-		deepEqual( $( "#elx" ).offset(), {
-			top: win.height() + 500 - 10,
-			left: win.width() + 200 - 10
-		}, "window, scrolled" );
-		win.scrollTop( 0 ).scrollLeft( 0 );
-	}
-
-	event = $.extend( $.Event( "someEvent" ), { pageX: 200, pageY: 300 } );
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left top",
-		of: event,
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), {
-		top: 300,
-		left: 200
-	}, "event - left top, left top" );
-
-	event = $.extend( $.Event( "someEvent" ), { pageX: 400, pageY: 600 } );
-	$( "#elx" ).position({
-		my: "left top",
-		at: "right bottom",
-		of: event,
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), {
-		top: 600,
-		left: 400
-	}, "event - left top, right bottom" );
-});
-
-test( "offsets", function() {
-	expect( 9 );
-
-	var offset;
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left+10 bottom+10",
-		of: "#parentx",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 70, left: 50 }, "offsets in at" );
-
-	$( "#elx" ).position({
-		my: "left+10 top-10",
-		at: "left bottom",
-		of: "#parentx",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 50, left: 50 }, "offsets in my" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left+50% bottom-10%",
-		of: "#parentx",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 58, left: 50 }, "percentage offsets in at" );
-
-	$( "#elx" ).position({
-		my: "left-30% top+50%",
-		at: "left bottom",
-		of: "#parentx",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 65, left: 37 }, "percentage offsets in my" );
-
-	$( "#elx" ).position({
-		my: "left-30.001% top+50.0%",
-		at: "left bottom",
-		of: "#parentx",
-		collision: "none"
-	});
-	offset = $( "#elx" ).offset();
-	equal( Math.round( offset.top ), 65, "decimal percentage offsets in my" );
-	equal( Math.round( offset.left ), 37, "decimal percentage offsets in my" );
-
-	$( "#elx" ).position({
-		my: "left+10.4 top-10.6",
-		at: "left bottom",
-		of: "#parentx",
-		collision: "none"
-	});
-	offset = $( "#elx" ).offset();
-	equal( Math.round( offset.top ), 49, "decimal offsets in my" );
-	equal( Math.round( offset.left ), 50, "decimal offsets in my" );
-
-	$( "#elx" ).position({
-		my: "left+right top-left",
-		at: "left-top bottom-bottom",
-		of: "#parentx",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 60, left: 40 }, "invalid offsets" );
-});
-
-test( "using", function() {
-	expect( 10 );
-
-	var count = 0,
-		elems = $( "#el1, #el2" ),
-		of = $( "#parentx" ),
-		expectedPosition = { top: 60, left: 60 },
-		expectedFeedback = {
-			target: {
-				element: of,
-				width: 20,
-				height: 20,
-				left: 40,
-				top: 40
-			},
-			element: {
-				width: 6,
-				height: 6,
-				left: 60,
-				top: 60
-			},
-			horizontal: "left",
-			vertical: "top",
-			important: "vertical"
-		},
-		originalPosition = elems.position({
-			my: "right bottom",
-			at: "rigt bottom",
-			of: "#parentx",
-			collision: "none"
-		}).offset();
-
-	elems.position({
-		my: "left top",
-		at: "center+10 bottom",
-		of: "#parentx",
-		using: function( position, feedback ) {
-			deepEqual( this, elems[ count ], "correct context for call #" + count );
-			deepEqual( position, expectedPosition, "correct position for call #" + count );
-			deepEqual( feedback.element.element[ 0 ], elems[ count ] );
-			delete feedback.element.element;
-			deepEqual( feedback, expectedFeedback );
-			count++;
-		}
-	});
-
-	elems.each(function() {
-		deepEqual( $( this ).offset(), originalPosition, "elements not moved" );
-	});
-});
-
-function collisionTest( config, result, msg ) {
-	var elem = $( "#elx" ).position( $.extend({
-		my: "left top",
-		at: "right bottom",
-		of: "#parent"
-	}, config ) );
-	deepEqual( elem.offset(), result, msg );
-}
-
-function collisionTest2( config, result, msg ) {
-	collisionTest( $.extend({
-		my: "right bottom",
-		at: "left top"
-	}, config ), result, msg );
-}
-
-test( "collision: fit, no collision", function() {
-	expect( 2 );
-
-	collisionTest({
-		collision: "fit"
-	}, {
-		top: 10,
-		left: 10
-	}, "no offset" );
-
-	collisionTest({
-		collision: "fit",
-		at: "right+2 bottom+3"
-	}, {
-		top: 13,
-		left: 12
-	}, "with offset" );
-});
-
-// Currently failing in IE8 due to the iframe used by TestSwarm
-if ( !/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ) ) {
-test( "collision: fit, collision", function() {
-	expect( 2 + (scrollTopSupport() ? 1 : 0) );
-
-	collisionTest2({
-		collision: "fit"
-	}, {
-		top: 0,
-		left: 0
-	}, "no offset" );
-
-	collisionTest2({
-		collision: "fit",
-		at: "left+2 top+3"
-	}, {
-		top: 0,
-		left: 0
-	}, "with offset" );
-
-	if ( scrollTopSupport() ) {
-		win.scrollTop( 300 ).scrollLeft( 200 );
-		collisionTest({
-			collision: "fit"
-		}, {
-			top: 300,
-			left: 200
-		}, "window scrolled" );
-
-		win.scrollTop( 0 ).scrollLeft( 0 );
-	}
-});
-}
-
-test( "collision: flip, no collision", function() {
-	expect( 2 );
-
-	collisionTest({
-		collision: "flip"
-	}, {
-		top: 10,
-		left: 10
-	}, "no offset" );
-
-	collisionTest({
-		collision: "flip",
-		at: "right+2 bottom+3"
-	}, {
-		top: 13,
-		left: 12
-	}, "with offset" );
-});
-
-test( "collision: flip, collision", function() {
-	expect( 2 );
-
-	collisionTest2({
-		collision: "flip"
-	}, {
-		top: 10,
-		left: 10
-	}, "no offset" );
-
-	collisionTest2({
-		collision: "flip",
-		at: "left+2 top+3"
-	}, {
-		top: 7,
-		left: 8
-	}, "with offset" );
-});
-
-test( "collision: flipfit, no collision", function() {
-	expect( 2 );
-
-	collisionTest({
-		collision: "flipfit"
-	}, {
-		top: 10,
-		left: 10
-	}, "no offset" );
-
-	collisionTest({
-		collision: "flipfit",
-		at: "right+2 bottom+3"
-	}, {
-		top: 13,
-		left: 12
-	}, "with offset" );
-});
-
-test( "collision: flipfit, collision", function() {
-	expect( 2 );
-
-	collisionTest2({
-		collision: "flipfit"
-	}, {
-		top: 10,
-		left: 10
-	}, "no offset" );
-
-	collisionTest2({
-		collision: "flipfit",
-		at: "left+2 top+3"
-	}, {
-		top: 7,
-		left: 8
-	}, "with offset" );
-});
-
-test( "collision: none, no collision", function() {
-	expect( 2 );
-
-	collisionTest({
-		collision: "none"
-	}, {
-		top: 10,
-		left: 10
-	}, "no offset" );
-
-	collisionTest({
-		collision: "none",
-		at: "right+2 bottom+3"
-	}, {
-		top: 13,
-		left: 12
-	}, "with offset" );
-});
-
-test( "collision: none, collision", function() {
-	expect( 2 );
-
-	collisionTest2({
-		collision: "none"
-	}, {
-		top: -6,
-		left: -6
-	}, "no offset" );
-
-	collisionTest2({
-		collision: "none",
-		at: "left+2 top+3"
-	}, {
-		top: -3,
-		left: -4
-	}, "with offset" );
-});
-
-test( "collision: fit, with margin", function() {
-	expect( 2 );
-
-	$( "#elx" ).css({
-		marginTop: 6,
-		marginLeft: 4
-	});
-
-	collisionTest({
-		collision: "fit"
-	}, {
-		top: 10,
-		left: 10
-	}, "right bottom" );
-
-	collisionTest2({
-		collision: "fit"
-	}, {
-		top: 6,
-		left: 4
-	}, "left top" );
-});
-
-test( "collision: flip, with margin", function() {
-	expect( 3 );
-
-	$( "#elx" ).css({
-		marginTop: 6,
-		marginLeft: 4
-	});
-
-	collisionTest({
-		collision: "flip"
-	}, {
-		top: 10,
-		left: 10
-	}, "left top" );
-
-	collisionTest2({
-		collision: "flip"
-	}, {
-		top: 10,
-		left: 10
-	}, "right bottom" );
-
-	collisionTest2({
-		collision: "flip",
-		my: "left top"
-	}, {
-		top: 0,
-		left: 4
-	}, "right bottom" );
-});
-
-test( "within", function() {
-	expect( 7 );
-
-	collisionTest({
-		within: document
-	}, {
-		top: 10,
-		left: 10
-	}, "within document" );
-
-	collisionTest({
-		within: "#within",
-		collision: "fit"
-	}, {
-		top: 4,
-		left: 2
-	}, "fit - right bottom" );
-
-	collisionTest2({
-		within: "#within",
-		collision: "fit"
-	}, {
-		top: 2,
-		left: 0
-	}, "fit - left top" );
-
-	collisionTest({
-		within: "#within",
-		collision: "flip"
-	}, {
-		top: 10,
-		left: -6
-	}, "flip - right bottom" );
-
-	collisionTest2({
-		within: "#within",
-		collision: "flip"
-	}, {
-		top: 10,
-		left: -6
-	}, "flip - left top" );
-
-	collisionTest({
-		within: "#within",
-		collision: "flipfit"
-	}, {
-		top: 4,
-		left: 0
-	}, "flipfit - right bottom" );
-
-	collisionTest2({
-		within: "#within",
-		collision: "flipfit"
-	}, {
-		top: 4,
-		left: 0
-	}, "flipfit - left top" );
-});
-
-test( "with scrollbars", function() {
-	expect( 4 );
-
-	$( "#scrollx" ).css({
-		width: 100,
-		height: 100,
-		left: 0,
-		top: 0
-	});
-
-	collisionTest({
-		of: "#scrollx",
-		collision: "fit",
-		within: "#scrollx"
-	}, {
-		top: 90,
-		left: 90
-	}, "visible" );
-
-	$( "#scrollx" ).css({
-		overflow: "scroll"
-	});
-
-	var scrollbarInfo = $.position.getScrollInfo( $.position.getWithinInfo( $( "#scrollx" ) ) );
-
-	collisionTest({
-		of: "#scrollx",
-		collision: "fit",
-		within: "#scrollx"
-	}, {
-		top: 90 - scrollbarInfo.height,
-		left: 90 - scrollbarInfo.width
-	}, "scroll" );
-
-	$( "#scrollx" ).css({
-		overflow: "auto"
-	});
-
-	collisionTest({
-		of: "#scrollx",
-		collision: "fit",
-		within: "#scrollx"
-	}, {
-		top: 90,
-		left: 90
-	}, "auto, no scroll" );
-
-	$( "#scrollx" ).css({
-		overflow: "auto"
-	}).append( $("<div>").height(300).width(300) );
-
-	collisionTest({
-		of: "#scrollx",
-		collision: "fit",
-		within: "#scrollx"
-	}, {
-		top: 90 - scrollbarInfo.height,
-		left: 90 - scrollbarInfo.width
-	}, "auto, with scroll" );
-});
-
-test( "fractions", function() {
-	expect( 1 );
-
-	$( "#fractions-element" ).position({
-		my: "left top",
-		at: "left top",
-		of: "#fractions-parent",
-		collision: "none"
-	});
-	deepEqual( $( "#fractions-element" ).offset(), $( "#fractions-parent" ).offset(), "left top, left top" );
-});
-
-test( "bug #5280: consistent results (avoid fractional values)", function() {
-	expect( 1 );
-
-	var wrapper = $( "#bug-5280" ),
-		elem = wrapper.children(),
-		offset1 = elem.position({
-			my: "center",
-			at: "center",
-			of: wrapper,
-			collision: "none"
-		}).offset(),
-		offset2 = elem.position({
-			my: "center",
-			at: "center",
-			of: wrapper,
-			collision: "none"
-		}).offset();
-	deepEqual( offset1, offset2 );
-});
-
-test( "bug #8710: flip if flipped position fits more", function() {
-	expect( 3 );
-
-	// Positions a 10px tall element within 99px height at top 90px.
-	collisionTest({
-		within: "#bug-8710-within-smaller",
-		of: "#parentx",
-		collision: "flip",
-		at: "right bottom+30"
-	}, {
-		top: 0,
-		left: 60
-	}, "flip - top fits all" );
-
-	// Positions a 10px tall element within 99px height at top 92px.
-	collisionTest({
-		within: "#bug-8710-within-smaller",
-		of: "#parentx",
-		collision: "flip",
-		at: "right bottom+32"
-	}, {
-		top: -2,
-		left: 60
-	}, "flip - top fits more" );
-
-	// Positions a 10px tall element within 101px height at top 92px.
-	collisionTest({
-		within: "#bug-8710-within-bigger",
-		of: "#parentx",
-		collision: "flip",
-		at: "right bottom+32"
-	}, {
-		top: 92,
-		left: 60
-	}, "no flip - top fits less" );
-});
-
-} );
diff --git a/tests/unit/progressbar/common.js b/tests/unit/progressbar/common.js
new file mode 100644
index 000000000..c949f136f
--- /dev/null
+++ b/tests/unit/progressbar/common.js
@@ -0,0 +1,24 @@
+define( [
+	"lib/common",
+	"ui/progressbar"
+], function( common ) {
+
+common.testWidget( "progressbar", {
+	defaults: {
+		classes: {
+			"ui-progressbar": "ui-corner-all",
+			"ui-progressbar-value": "ui-corner-left",
+			"ui-progressbar-complete": "ui-corner-right"
+		},
+		disabled: false,
+		max: 100,
+		value: 0,
+
+		//callbacks
+		change: null,
+		complete: null,
+		create: null
+	}
+});
+
+} );
diff --git a/tests/unit/progressbar/core.js b/tests/unit/progressbar/core.js
new file mode 100644
index 000000000..05eea9ef7
--- /dev/null
+++ b/tests/unit/progressbar/core.js
@@ -0,0 +1,64 @@
+define( [
+	"jquery",
+	"ui/progressbar"
+], function( $ ) {
+
+module( "progressbar: core" );
+
+test( "markup structure", function( assert ) {
+	expect( 7 );
+	var element = $( "#progressbar" ).progressbar(),
+		value = element.children().eq( 0 );
+
+	assert.hasClasses( element, "ui-progressbar ui-widget ui-widget-content" );
+	assert.hasClasses( value, "ui-progressbar-value ui-widget-header" );
+	assert.lacksClasses( value, "ui-progressbar-complete" );
+	assert.lacksClasses( element, "ui-progressbar-indeterminate" );
+	equal( element.children().length, 1, "Main element contains one child" );
+
+	element.progressbar( "option", "value", 100 );
+	assert.hasClasses( value, "ui-progressbar-complete ui-widget-header ui-progressbar-value" );
+	equal( element.children().children().length, 0, "no overlay div" );
+});
+
+test( "markup structure - indeterminate", function( assert ) {
+	expect( 5 );
+	var element = $( "#progressbar" ).progressbar({ value: false }),
+		children = element.children();
+
+	assert.hasClasses( element, "ui-progressbar ui-progressbar-indeterminate ui-widget ui-widget-content" );
+	assert.hasClasses( children[ 0 ], "ui-progressbar-value ui-widget-header" );
+	equal( children.length, 1, "Main element contains one child" );
+	assert.hasClasses( children[ 0 ], "ui-progressbar-value" );
+	equal( children.children( ".ui-progressbar-overlay" ).length, 1,
+		"Value has class ui-progressbar-overlay" );
+});
+
+test( "accessibility", function() {
+	expect( 11 );
+	var element = $( "#progressbar" ).progressbar();
+
+	equal( element.attr( "role" ), "progressbar", "aria role" );
+	equal( element.attr( "aria-valuemin" ), 0, "aria-valuemin" );
+	equal( element.attr( "aria-valuemax" ), 100, "aria-valuemax" );
+	equal( element.attr( "aria-valuenow" ), 0, "aria-valuenow initially" );
+
+	element.progressbar( "value", 77 );
+	equal( element.attr( "aria-valuenow" ), 77, "aria-valuenow" );
+
+	element.progressbar( "option", "max", 150 );
+	equal( element.attr( "aria-valuemax" ), 150, "aria-valuemax" );
+
+	element.progressbar( "disable" );
+	equal( element.attr( "aria-disabled" ), "true", "aria-disabled on" );
+
+	element.progressbar( "enable" );
+	equal( element.attr( "aria-disabled" ), "false", "aria-disabled off" );
+
+	element.progressbar( "option", "value", false );
+	equal( element.attr( "aria-valuemin" ), 0, "aria-valuemin" );
+	equal( element.attr( "aria-valuemax" ), 150, "aria-valuemax" );
+	equal( element.attr( "aria-valuenow" ), null, "aria-valuenow" );
+});
+
+} );
diff --git a/tests/unit/progressbar/events.js b/tests/unit/progressbar/events.js
new file mode 100644
index 000000000..a40b2c432
--- /dev/null
+++ b/tests/unit/progressbar/events.js
@@ -0,0 +1,58 @@
+define( [
+	"jquery",
+	"ui/progressbar"
+], function( $ ) {
+
+module( "progressbar: events" );
+
+test( "create", function() {
+	expect( 1 );
+	$( "#progressbar" ).progressbar({
+		value: 5,
+		create: function() {
+			equal( $( this ).progressbar( "value" ), 5, "Correct value at create" );
+		},
+		change: function() {
+			ok( false, "create has triggered change()" );
+		}
+	});
+});
+
+test( "change", function() {
+	expect( 2 );
+	var element = $( "#progressbar" ).progressbar();
+
+	element.one( "progressbarchange", function() {
+		equal( element.progressbar( "value" ), 5, "change triggered for middle value" );
+	});
+	element.progressbar( "value", 5 );
+	element.one( "progressbarchange", function() {
+		equal( element.progressbar( "value" ), 100, "change triggered for final value" );
+	});
+	element.progressbar( "value", 100 );
+});
+
+test( "complete", function() {
+	expect( 5 );
+	var value,
+		changes = 0,
+		element = $( "#progressbar" ).progressbar({
+			change: function() {
+				changes++;
+				equal( element.progressbar( "value" ), value, "change at " + value );
+			},
+			complete: function() {
+				equal( changes, 3, "complete triggered after change and not on indeterminate" );
+				equal( element.progressbar( "value" ), 100, "value is 100" );
+			}
+		});
+
+	value = 5;
+	element.progressbar( "value", value );
+	value = false;
+	element.progressbar( "value", value );
+	value = 100;
+	element.progressbar( "value", value );
+});
+
+} );
diff --git a/tests/unit/progressbar/methods.js b/tests/unit/progressbar/methods.js
new file mode 100644
index 000000000..eaf0a5c76
--- /dev/null
+++ b/tests/unit/progressbar/methods.js
@@ -0,0 +1,42 @@
+define( [
+	"jquery",
+	"ui/progressbar"
+], function( $ ) {
+
+module( "progressbar: methods" );
+
+test( "destroy", function( assert ) {
+	expect( 1 );
+	assert.domEqual( "#progressbar", function() {
+		$( "#progressbar" ).progressbar().progressbar( "destroy" );
+	});
+});
+
+test( "disable", function( assert ) {
+	expect( 3 );
+
+	var element = $( "#progressbar" ).progressbar().progressbar( "disable" );
+
+	assert.hasClasses( element.progressbar( "widget" ), "ui-state-disabled" );
+	ok( element.progressbar( "widget" ).attr( "aria-disabled" ), "element gets aria-disabled" );
+	assert.hasClasses( element.progressbar( "widget" ), "ui-progressbar-disabled" );
+});
+
+test( "value", function() {
+	expect( 3 );
+
+	var element = $( "<div>" ).progressbar({ value: 20 });
+	equal( element.progressbar( "value" ), 20, "correct value as getter" );
+	strictEqual( element.progressbar( "value", 30 ), element, "chainable as setter" );
+	equal( element.progressbar( "option", "value" ), 30, "correct value after setter" );
+});
+
+test( "widget", function() {
+	expect( 2 );
+	var element = $( "#progressbar" ).progressbar(),
+		widgetElement = element.progressbar( "widget" );
+	equal( widgetElement.length, 1, "one element" );
+	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
+});
+
+} );
diff --git a/tests/unit/progressbar/options.js b/tests/unit/progressbar/options.js
new file mode 100644
index 000000000..7b6ac9db2
--- /dev/null
+++ b/tests/unit/progressbar/options.js
@@ -0,0 +1,79 @@
+define( [
+	"jquery",
+	"ui/progressbar"
+], function( $ ) {
+
+module( "progressbar: options" );
+
+test( "{ value: 0 }, default", function() {
+	expect( 1 );
+	$( "#progressbar" ).progressbar();
+	equal( $( "#progressbar" ).progressbar( "value" ), 0 );
+});
+
+// Ticket #7231 - valueDiv should be hidden when value is at 0%
+test( "value: visibility of valueDiv", function() {
+	expect( 4 );
+	var element = $( "#progressbar" ).progressbar({
+		value: 0
+	});
+	ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
+		"valueDiv hidden when value is initialized at 0" );
+	element.progressbar( "value", 1 );
+	ok( element.children( ".ui-progressbar-value" ).is( ":visible" ),
+		"valueDiv visible when value is set to 1" );
+	element.progressbar( "value", 100 );
+	ok( element.children( ".ui-progressbar-value" ).is( ":visible" ),
+		"valueDiv visible when value is set to 100" );
+	element.progressbar( "value", 0 );
+	ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
+		"valueDiv hidden when value is set to 0" );
+});
+
+test( "{ value: 5 }", function() {
+	expect( 1 );
+	$( "#progressbar" ).progressbar({
+		value: 5
+	});
+	equal( $( "#progressbar" ).progressbar( "value" ), 5 );
+});
+
+test( "{ value: -5 }", function() {
+	expect( 1 );
+	$( "#progressbar" ).progressbar({
+		value: -5
+	});
+	equal( $( "#progressbar" ).progressbar( "value" ), 0,
+		"value constrained at min" );
+});
+
+test( "{ value: 105 }", function() {
+	expect( 1 );
+	$( "#progressbar" ).progressbar({
+		value: 105
+	});
+	equal( $( "#progressbar" ).progressbar( "value" ), 100,
+		"value constrained at max" );
+});
+
+test( "{ value: 10, max: 5 }", function() {
+	expect( 1 );
+	$("#progressbar").progressbar({
+		max: 5,
+		value: 10
+	});
+	equal( $( "#progressbar" ).progressbar( "value" ), 5,
+		"value constrained at max" );
+});
+
+test( "change max below value", function() {
+	expect( 1 );
+	$("#progressbar").progressbar({
+		max: 10,
+		value: 10
+	}).progressbar( "option", "max", 5 );
+	equal( $( "#progressbar" ).progressbar( "value" ), 5,
+		"value constrained at max" );
+});
+
+} );
diff --git a/tests/unit/progressbar/progressbar_common.js b/tests/unit/progressbar/progressbar_common.js
deleted file mode 100644
index c949f136f..000000000
--- a/tests/unit/progressbar/progressbar_common.js
+++ /dev/null
@@ -1,24 +0,0 @@
-define( [
-	"lib/common",
-	"ui/progressbar"
-], function( common ) {
-
-common.testWidget( "progressbar", {
-	defaults: {
-		classes: {
-			"ui-progressbar": "ui-corner-all",
-			"ui-progressbar-value": "ui-corner-left",
-			"ui-progressbar-complete": "ui-corner-right"
-		},
-		disabled: false,
-		max: 100,
-		value: 0,
-
-		//callbacks
-		change: null,
-		complete: null,
-		create: null
-	}
-});
-
-} );
diff --git a/tests/unit/progressbar/progressbar_core.js b/tests/unit/progressbar/progressbar_core.js
deleted file mode 100644
index 05eea9ef7..000000000
--- a/tests/unit/progressbar/progressbar_core.js
+++ /dev/null
@@ -1,64 +0,0 @@
-define( [
-	"jquery",
-	"ui/progressbar"
-], function( $ ) {
-
-module( "progressbar: core" );
-
-test( "markup structure", function( assert ) {
-	expect( 7 );
-	var element = $( "#progressbar" ).progressbar(),
-		value = element.children().eq( 0 );
-
-	assert.hasClasses( element, "ui-progressbar ui-widget ui-widget-content" );
-	assert.hasClasses( value, "ui-progressbar-value ui-widget-header" );
-	assert.lacksClasses( value, "ui-progressbar-complete" );
-	assert.lacksClasses( element, "ui-progressbar-indeterminate" );
-	equal( element.children().length, 1, "Main element contains one child" );
-
-	element.progressbar( "option", "value", 100 );
-	assert.hasClasses( value, "ui-progressbar-complete ui-widget-header ui-progressbar-value" );
-	equal( element.children().children().length, 0, "no overlay div" );
-});
-
-test( "markup structure - indeterminate", function( assert ) {
-	expect( 5 );
-	var element = $( "#progressbar" ).progressbar({ value: false }),
-		children = element.children();
-
-	assert.hasClasses( element, "ui-progressbar ui-progressbar-indeterminate ui-widget ui-widget-content" );
-	assert.hasClasses( children[ 0 ], "ui-progressbar-value ui-widget-header" );
-	equal( children.length, 1, "Main element contains one child" );
-	assert.hasClasses( children[ 0 ], "ui-progressbar-value" );
-	equal( children.children( ".ui-progressbar-overlay" ).length, 1,
-		"Value has class ui-progressbar-overlay" );
-});
-
-test( "accessibility", function() {
-	expect( 11 );
-	var element = $( "#progressbar" ).progressbar();
-
-	equal( element.attr( "role" ), "progressbar", "aria role" );
-	equal( element.attr( "aria-valuemin" ), 0, "aria-valuemin" );
-	equal( element.attr( "aria-valuemax" ), 100, "aria-valuemax" );
-	equal( element.attr( "aria-valuenow" ), 0, "aria-valuenow initially" );
-
-	element.progressbar( "value", 77 );
-	equal( element.attr( "aria-valuenow" ), 77, "aria-valuenow" );
-
-	element.progressbar( "option", "max", 150 );
-	equal( element.attr( "aria-valuemax" ), 150, "aria-valuemax" );
-
-	element.progressbar( "disable" );
-	equal( element.attr( "aria-disabled" ), "true", "aria-disabled on" );
-
-	element.progressbar( "enable" );
-	equal( element.attr( "aria-disabled" ), "false", "aria-disabled off" );
-
-	element.progressbar( "option", "value", false );
-	equal( element.attr( "aria-valuemin" ), 0, "aria-valuemin" );
-	equal( element.attr( "aria-valuemax" ), 150, "aria-valuemax" );
-	equal( element.attr( "aria-valuenow" ), null, "aria-valuenow" );
-});
-
-} );
diff --git a/tests/unit/progressbar/progressbar_events.js b/tests/unit/progressbar/progressbar_events.js
deleted file mode 100644
index a40b2c432..000000000
--- a/tests/unit/progressbar/progressbar_events.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define( [
-	"jquery",
-	"ui/progressbar"
-], function( $ ) {
-
-module( "progressbar: events" );
-
-test( "create", function() {
-	expect( 1 );
-	$( "#progressbar" ).progressbar({
-		value: 5,
-		create: function() {
-			equal( $( this ).progressbar( "value" ), 5, "Correct value at create" );
-		},
-		change: function() {
-			ok( false, "create has triggered change()" );
-		}
-	});
-});
-
-test( "change", function() {
-	expect( 2 );
-	var element = $( "#progressbar" ).progressbar();
-
-	element.one( "progressbarchange", function() {
-		equal( element.progressbar( "value" ), 5, "change triggered for middle value" );
-	});
-	element.progressbar( "value", 5 );
-	element.one( "progressbarchange", function() {
-		equal( element.progressbar( "value" ), 100, "change triggered for final value" );
-	});
-	element.progressbar( "value", 100 );
-});
-
-test( "complete", function() {
-	expect( 5 );
-	var value,
-		changes = 0,
-		element = $( "#progressbar" ).progressbar({
-			change: function() {
-				changes++;
-				equal( element.progressbar( "value" ), value, "change at " + value );
-			},
-			complete: function() {
-				equal( changes, 3, "complete triggered after change and not on indeterminate" );
-				equal( element.progressbar( "value" ), 100, "value is 100" );
-			}
-		});
-
-	value = 5;
-	element.progressbar( "value", value );
-	value = false;
-	element.progressbar( "value", value );
-	value = 100;
-	element.progressbar( "value", value );
-});
-
-} );
diff --git a/tests/unit/progressbar/progressbar_methods.js b/tests/unit/progressbar/progressbar_methods.js
deleted file mode 100644
index eaf0a5c76..000000000
--- a/tests/unit/progressbar/progressbar_methods.js
+++ /dev/null
@@ -1,42 +0,0 @@
-define( [
-	"jquery",
-	"ui/progressbar"
-], function( $ ) {
-
-module( "progressbar: methods" );
-
-test( "destroy", function( assert ) {
-	expect( 1 );
-	assert.domEqual( "#progressbar", function() {
-		$( "#progressbar" ).progressbar().progressbar( "destroy" );
-	});
-});
-
-test( "disable", function( assert ) {
-	expect( 3 );
-
-	var element = $( "#progressbar" ).progressbar().progressbar( "disable" );
-
-	assert.hasClasses( element.progressbar( "widget" ), "ui-state-disabled" );
-	ok( element.progressbar( "widget" ).attr( "aria-disabled" ), "element gets aria-disabled" );
-	assert.hasClasses( element.progressbar( "widget" ), "ui-progressbar-disabled" );
-});
-
-test( "value", function() {
-	expect( 3 );
-
-	var element = $( "<div>" ).progressbar({ value: 20 });
-	equal( element.progressbar( "value" ), 20, "correct value as getter" );
-	strictEqual( element.progressbar( "value", 30 ), element, "chainable as setter" );
-	equal( element.progressbar( "option", "value" ), 30, "correct value after setter" );
-});
-
-test( "widget", function() {
-	expect( 2 );
-	var element = $( "#progressbar" ).progressbar(),
-		widgetElement = element.progressbar( "widget" );
-	equal( widgetElement.length, 1, "one element" );
-	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
-});
-
-} );
diff --git a/tests/unit/progressbar/progressbar_options.js b/tests/unit/progressbar/progressbar_options.js
deleted file mode 100644
index 7b6ac9db2..000000000
--- a/tests/unit/progressbar/progressbar_options.js
+++ /dev/null
@@ -1,79 +0,0 @@
-define( [
-	"jquery",
-	"ui/progressbar"
-], function( $ ) {
-
-module( "progressbar: options" );
-
-test( "{ value: 0 }, default", function() {
-	expect( 1 );
-	$( "#progressbar" ).progressbar();
-	equal( $( "#progressbar" ).progressbar( "value" ), 0 );
-});
-
-// Ticket #7231 - valueDiv should be hidden when value is at 0%
-test( "value: visibility of valueDiv", function() {
-	expect( 4 );
-	var element = $( "#progressbar" ).progressbar({
-		value: 0
-	});
-	ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
-		"valueDiv hidden when value is initialized at 0" );
-	element.progressbar( "value", 1 );
-	ok( element.children( ".ui-progressbar-value" ).is( ":visible" ),
-		"valueDiv visible when value is set to 1" );
-	element.progressbar( "value", 100 );
-	ok( element.children( ".ui-progressbar-value" ).is( ":visible" ),
-		"valueDiv visible when value is set to 100" );
-	element.progressbar( "value", 0 );
-	ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
-		"valueDiv hidden when value is set to 0" );
-});
-
-test( "{ value: 5 }", function() {
-	expect( 1 );
-	$( "#progressbar" ).progressbar({
-		value: 5
-	});
-	equal( $( "#progressbar" ).progressbar( "value" ), 5 );
-});
-
-test( "{ value: -5 }", function() {
-	expect( 1 );
-	$( "#progressbar" ).progressbar({
-		value: -5
-	});
-	equal( $( "#progressbar" ).progressbar( "value" ), 0,
-		"value constrained at min" );
-});
-
-test( "{ value: 105 }", function() {
-	expect( 1 );
-	$( "#progressbar" ).progressbar({
-		value: 105
-	});
-	equal( $( "#progressbar" ).progressbar( "value" ), 100,
-		"value constrained at max" );
-});
-
-test( "{ value: 10, max: 5 }", function() {
-	expect( 1 );
-	$("#progressbar").progressbar({
-		max: 5,
-		value: 10
-	});
-	equal( $( "#progressbar" ).progressbar( "value" ), 5,
-		"value constrained at max" );
-});
-
-test( "change max below value", function() {
-	expect( 1 );
-	$("#progressbar").progressbar({
-		max: 10,
-		value: 10
-	}).progressbar( "option", "max", 5 );
-	equal( $( "#progressbar" ).progressbar( "value" ), 5,
-		"value constrained at max" );
-});
-
-} );
diff --git a/tests/unit/resizable/common.js b/tests/unit/resizable/common.js
new file mode 100644
index 000000000..822a4db87
--- /dev/null
+++ b/tests/unit/resizable/common.js
@@ -0,0 +1,40 @@
+define( [
+	"lib/common",
+	"ui/resizable"
+], function( common ) {
+
+common.testWidget( "resizable", {
+	defaults: {
+		alsoResize: false,
+		animate: false,
+		animateDuration: "slow",
+		animateEasing: "swing",
+		aspectRatio: false,
+		autoHide: false,
+		cancel: "input, textarea, button, select, option",
+		classes: {
+			"ui-resizable-se": "ui-icon ui-icon-gripsmall-diagonal-se"
+		},
+		containment: false,
+		delay: 0,
+		disabled: false,
+		distance: 1,
+		ghost: false,
+		grid: false,
+		handles: "e,s,se",
+		helper: false,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 10,
+		minWidth: 10,
+		zIndex: 90,
+
+		// callbacks
+		create: null,
+		resize: null,
+		start: null,
+		stop: null
+	}
+});
+
+} );
diff --git a/tests/unit/resizable/core.js b/tests/unit/resizable/core.js
new file mode 100644
index 000000000..8c21fbd7d
--- /dev/null
+++ b/tests/unit/resizable/core.js
@@ -0,0 +1,244 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/resizable"
+], function( $, testHelper ) {
+
+module("resizable: core");
+
+/*
+test("element types", function() {
+	var typeNames = ("p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form"
+		+ ",table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr"
+		+ ",acronym,code,samp,kbd,var,img,object,hr"
+		+ ",input,button,label,select,iframe").split(",");
+
+	$.each(typeNames, function(i) {
+		var typeName = typeNames[i];
+		el = $(document.createElement(typeName)).appendTo("body");
+		(typeName == "table" && el.append("<tr><td>content</td></tr>"));
+		el.resizable();
+		ok(true, "$('&lt;" + typeName + "/&gt').resizable()");
+		el.resizable("destroy");
+		el.remove();
+	});
+});
+*/
+
+test("n", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-n", target = $("#resizable1").resizable({ handles: "all" });
+
+	testHelper.drag(handle, 0, -50);
+	equal( target.height(), 150, "compare height" );
+
+	testHelper.drag(handle, 0, 50);
+	equal( target.height(), 100, "compare height" );
+
+	equal( target[0].style.left, "", "left should not be modified" );
+	equal( target[0].style.width, "", "width should not be modified" );
+});
+
+test("s", function() {
+	expect(5);
+
+	var handle = ".ui-resizable-s", target = $("#resizable1").resizable({ handles: "all" });
+
+	testHelper.drag(handle, 0, 50);
+	equal( target.height(), 150, "compare height" );
+
+	testHelper.drag(handle, 0, -50);
+	equal( target.height(), 100, "compare height" );
+
+	equal( target[0].style.top, "", "top should not be modified" );
+	equal( target[0].style.left, "", "left should not be modified" );
+	equal( target[0].style.width, "", "width should not be modified" );
+});
+
+test("e", function() {
+	expect(5);
+
+	var handle = ".ui-resizable-e", target = $("#resizable1").resizable({ handles: "all" });
+
+	testHelper.drag(handle, 50);
+	equal( target.width(), 150, "compare width");
+
+	testHelper.drag(handle, -50);
+	equal( target.width(), 100, "compare width" );
+
+	equal( target[0].style.height, "", "height should not be modified" );
+	equal( target[0].style.top, "", "top should not be modified" );
+	equal( target[0].style.left, "", "left should not be modified" );
+});
+
+test("w", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-w", target = $("#resizable1").resizable({ handles: "all" });
+
+	testHelper.drag(handle, -50);
+	equal( target.width(), 150, "compare width" );
+
+	testHelper.drag(handle, 50);
+	equal( target.width(), 100, "compare width" );
+
+	equal( target[0].style.height, "", "height should not be modified" );
+	equal( target[0].style.top, "", "top should not be modified" );
+});
+
+test("ne", function() {
+	expect(5);
+
+	var handle = ".ui-resizable-ne", target = $("#resizable1").css({ overflow: "hidden" }).resizable({ handles: "all" });
+
+	testHelper.drag(handle, -50, -50);
+	equal( target.width(), 50, "compare width" );
+	equal( target.height(), 150, "compare height" );
+
+	testHelper.drag(handle, 50, 50);
+	equal( target.width(), 100, "compare width" );
+	equal( target.height(), 100, "compare height" );
+
+	equal( target[0].style.left, "", "left should not be modified" );
+});
+
+test("se", function() {
+	expect(6);
+
+	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all" });
+
+	testHelper.drag(handle, 50, 50);
+	equal( target.width(), 150, "compare width" );
+	equal( target.height(), 150, "compare height" );
+
+	testHelper.drag(handle, -50, -50);
+	equal( target.width(), 100, "compare width" );
+	equal( target.height(), 100, "compare height" );
+
+	equal( target[0].style.top, "", "top should not be modified" );
+	equal( target[0].style.left, "", "left should not be modified" );
+});
+
+test("sw", function() {
+	expect(5);
+
+	var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ handles: "all" });
+
+	testHelper.drag(handle, -50, -50);
+	equal( target.width(), 150, "compare width" );
+	equal( target.height(), 50, "compare height" );
+
+	testHelper.drag(handle, 50, 50);
+	equal( target.width(), 100, "compare width" );
+	equal( target.height(), 100, "compare height" );
+
+	equal( target[0].style.top, "", "top should not be modified" );
+});
+
+test("nw", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-nw", target = $("#resizable1").resizable({ handles: "all" });
+
+	testHelper.drag(handle, -50, -50);
+	equal( target.width(), 150, "compare width" );
+	equal( target.height(), 150, "compare height" );
+
+	testHelper.drag(handle, 50, 50);
+	equal( target.width(), 100, "compare width" );
+	equal( target.height(), 100, "compare height" );
+});
+
+test("handle with complex markup (#8756)", function() {
+	expect(2);
+
+	$("#resizable1")
+		.append(
+			$("<div>")
+				.addClass("ui-resizable-handle")
+				.addClass("ui-resizable-w")
+				.append($("<div>"))
+		);
+
+	var handle = ".ui-resizable-w div", target = $("#resizable1").resizable({ handles: "all" });
+
+	testHelper.drag(handle, -50);
+	equal( target.width(), 150, "compare width" );
+
+	testHelper.drag(handle, 50);
+	equal( target.width(), 100, "compare width" );
+});
+
+test("resizable accounts for scroll position correctly (#3815)", function() {
+	expect( 4 );
+
+	var position, top, left,
+		container = $("<div style='overflow:scroll;height:300px;width:300px;position:relative;'></div>").appendTo("#qunit-fixture"),
+		overflowed = $("<div style='width: 1000px; height: 1000px;'></div>").appendTo( container ),
+		el = $("<div style='height:100px;width:100px;position:absolute;top:10px;left:10px;'></div>").appendTo( overflowed ).resizable({ handles: "all" }),
+		handle = ".ui-resizable-e",
+		handlePosition = $(handle).position().left;
+
+	container.scrollLeft( 100 ).scrollTop( 100 );
+
+	position = el.position();
+	left = el.css("left");
+	top = el.css("top");
+
+	testHelper.drag(handle, 50, 50);
+	deepEqual( el.position(), position, "position stays the same when resized" );
+	equal( el.css("left"), left, "css('left') stays the same when resized" );
+	equal( el.css("top"), top, "css('top') stays the same when resized" );
+	equal( $(handle).position().left, handlePosition + 50, "handle also moved" );
+});
+
+test( "resizable stores correct size when using helper and grid (#9547)", function() {
+	expect( 2 );
+
+	var handle = ".ui-resizable-se",
+		target = $( "#resizable1" ).resizable({
+			handles: "all",
+			helper: "ui-resizable-helper",
+			grid: [ 10, 10 ]
+		});
+
+	testHelper.drag( handle, 1, 1 );
+	equal( target.width(), 100, "compare width" );
+	equal( target.height(), 100, "compare height" );
+});
+
+test( "nested resizable", function() {
+	expect( 4 );
+
+	var outer = $( "<div id='outer' style='width:50px'></div>" ),
+		inner = $( "<div id='inner' style='width:30px'></div>" ),
+		target = $( "#resizable1" ),
+		innerHandle,
+		outerHandle;
+
+	outer.appendTo( target );
+	inner.appendTo( outer );
+
+	inner.resizable( { handles : "e" } );
+	outer.resizable( { handles : "e" } );
+	target.resizable( { handles : "e" } );
+
+	innerHandle = $( "#inner > .ui-resizable-e" );
+	outerHandle = $( "#outer > .ui-resizable-e" );
+
+	testHelper.drag( innerHandle, 10 );
+	equal( inner.width(), 40, "compare width of inner element" );
+	testHelper.drag( innerHandle, -10 );
+	equal( inner.width(), 30, "compare width of inner element" );
+
+	testHelper.drag( outerHandle, 10 );
+	equal( outer.width(), 60, "compare width of outer element" );
+	testHelper.drag( outerHandle, -10 );
+	equal( outer.width(), 50, "compare width of outer element" );
+
+	inner.remove();
+	outer.remove();
+});
+
+} );
diff --git a/tests/unit/resizable/events.js b/tests/unit/resizable/events.js
new file mode 100644
index 000000000..2a06f87cc
--- /dev/null
+++ b/tests/unit/resizable/events.js
@@ -0,0 +1,242 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/resizable"
+], function( $, testHelper ) {
+
+module("resizable: events");
+
+test("start", function() {
+
+	expect(5);
+
+	var count = 0,
+		handle = ".ui-resizable-se";
+
+	$("#resizable1").resizable({
+		handles: "all",
+		start: function(event, ui) {
+			equal( ui.size.width, 100, "compare width" );
+			equal( ui.size.height, 100, "compare height" );
+			equal( ui.originalSize.width, 100, "compare original width" );
+			equal( ui.originalSize.height, 100, "compare original height" );
+			count++;
+		}
+	});
+
+	testHelper.drag(handle, 50, 50);
+
+	equal(count, 1, "start callback should happen exactly once");
+
+});
+
+test( "resize", function() {
+
+	expect( 9 );
+
+	var count = 0,
+		handle = ".ui-resizable-se";
+
+	$("#resizable1").resizable({
+		handles: "all",
+		resize: function( event, ui ) {
+			if ( count === 0 ) {
+				equal( ui.size.width, 125, "compare width" );
+				equal( ui.size.height, 125, "compare height" );
+				equal( ui.originalSize.width, 100, "compare original width" );
+				equal( ui.originalSize.height, 100, "compare original height" );
+			} else {
+				equal( ui.size.width, 150, "compare width" );
+				equal( ui.size.height, 150, "compare height" );
+				equal( ui.originalSize.width, 100, "compare original width" );
+				equal( ui.originalSize.height, 100, "compare original height" );
+			}
+			count++;
+		}
+	});
+
+	testHelper.drag( handle, 50, 50 );
+
+	equal( count, 2, "resize callback should happen exactly once per size adjustment" );
+
+});
+
+test( "resize (min/max dimensions)", function() {
+
+	expect( 5 );
+
+	var count = 0,
+		handle = ".ui-resizable-se";
+
+	$("#resizable1").resizable({
+		handles: "all",
+		minWidth: 60,
+		minHeight: 60,
+		maxWidth: 100,
+		maxHeight: 100,
+		resize: function( event, ui ) {
+			equal( ui.size.width, 60, "compare width" );
+			equal( ui.size.height, 60, "compare height" );
+			equal( ui.originalSize.width, 100, "compare original width" );
+			equal( ui.originalSize.height, 100, "compare original height" );
+			count++;
+		}
+	});
+
+	testHelper.drag( handle, -200, -200 );
+
+	equal( count, 1, "resize callback should happen exactly once per size adjustment" );
+
+});
+
+test( "resize (containment)", function() {
+
+	expect( 5 );
+
+	var count = 0,
+		handle = ".ui-resizable-se",
+		container = $("#resizable1").wrap("<div>").parent().css({
+			height: "100px",
+			width: "100px"
+		});
+
+	$("#resizable1").resizable({
+		handles: "all",
+		containment: container,
+		resize: function( event, ui ) {
+			equal( ui.size.width, 10, "compare width" );
+			equal( ui.size.height, 10, "compare height" );
+			equal( ui.originalSize.width, 100, "compare original width" );
+			equal( ui.originalSize.height, 100, "compare original height" );
+			count++;
+		}
+	});
+
+	// Prove you can't resize outside containment by dragging southeast corner southeast
+	testHelper.drag( handle, 100, 100 );
+
+	// Prove you can't resize outside containment by dragging southeast corner northwest
+	testHelper.drag( handle, -200, -200 );
+
+	equal( count, 1, "resize callback should happen exactly once per size adjustment" );
+
+});
+
+test("resize (grid)", function() {
+
+	expect(5);
+
+	var count = 0,
+		handle = ".ui-resizable-se";
+
+	$("#resizable1").resizable({
+		handles: "all",
+		grid: 50,
+		resize: function(event, ui) {
+			equal( ui.size.width, 150, "compare width" );
+			equal( ui.size.height, 150, "compare height" );
+			equal( ui.originalSize.width, 100, "compare original width" );
+			equal( ui.originalSize.height, 100, "compare original height" );
+			count++;
+		}
+	});
+
+	testHelper.drag(handle, 50, 50);
+
+	equal(count, 1, "resize callback should happen exactly once per grid-unit size adjustment");
+
+});
+
+test( "resize, custom adjustment", function() {
+	expect( 4 );
+
+	var handle = ".ui-resizable-se",
+		element = $( "#resizable1" ).resizable({
+			resize: function( event, ui ) {
+				ui.size.width = 100;
+				ui.size.height = 200;
+				ui.position.left = 300;
+				ui.position.top = 400;
+			}
+		});
+
+	testHelper.drag( handle, 50, 50 );
+
+	equal( element.width(), 100, "resize event can control width" );
+	equal( element.height(), 200, "resize event can control height" );
+	equal( element.position().left, 300, "resize event can control left" );
+	equal( element.position().top, 400, "resize event can control top" );
+});
+
+test("stop", function() {
+
+	expect(5);
+
+	var count = 0,
+		handle = ".ui-resizable-se";
+
+	$("#resizable1").resizable({
+		handles: "all",
+		stop: function(event, ui) {
+			equal( ui.size.width, 150, "compare width" );
+			equal( ui.size.height, 150, "compare height" );
+			equal( ui.originalSize.width, 100, "compare original width" );
+			equal( ui.originalSize.height, 100, "compare original height" );
+			count++;
+		}
+	});
+
+	testHelper.drag(handle, 50, 50);
+
+	equal(count, 1, "stop callback should happen exactly once");
+
+});
+
+test( "resize (containment) works with parent with negative offset", function() {
+
+	expect( 1 );
+
+	var widthBefore, widthAfter,
+		handle = ".ui-resizable-e",
+		target = $( "#resizable1" ),
+		absoluteContainer = target.wrap( "<div />" ).parent(),
+		fixedContainer = absoluteContainer.wrap( "<div />" ).parent(),
+		increaseWidthBy = 50;
+
+	// position fixed container in window top left
+	fixedContainer.css({
+		width: 400,
+		height: 100,
+		position: "fixed",
+		top: 0,
+		left: 0
+	});
+
+	// position absolute container within fixed on slightly outside window
+	absoluteContainer.css({
+		width: 400,
+		height: 100,
+		position: "absolute",
+		top: 0,
+		left: -50
+	});
+
+	// set up resizable to be contained within absolute container
+	target.resizable({
+		handles: "all",
+		containment: "parent"
+	}).css({
+		width: 300
+	});
+
+	widthBefore = target.width();
+
+	testHelper.drag( handle, increaseWidthBy, 0 );
+
+	widthAfter = target.width();
+
+	equal( widthAfter, ( widthBefore + increaseWidthBy ), "resizable width should be increased by the value dragged" );
+
+});
+
+} );
diff --git a/tests/unit/resizable/helper.js b/tests/unit/resizable/helper.js
new file mode 100644
index 000000000..494c1a073
--- /dev/null
+++ b/tests/unit/resizable/helper.js
@@ -0,0 +1,18 @@
+define( [
+	"jquery",
+	"lib/helper"
+], function( $, helper ) {
+
+return $.extend( helper, {
+	drag: function( el, dx, dy ) {
+		// this mouseover is to work around a limitation in resizable
+		// TODO: fix resizable so handle doesn't require mouseover in order to be used
+		$( el ).simulate("mouseover").simulate( "drag", {
+			moves: 2,
+			dx: dx,
+			dy: dy
+		});
+	}
+} );
+
+} );
diff --git a/tests/unit/resizable/methods.js b/tests/unit/resizable/methods.js
new file mode 100644
index 000000000..a7056a105
--- /dev/null
+++ b/tests/unit/resizable/methods.js
@@ -0,0 +1,21 @@
+define( [
+	"jquery",
+	"ui/resizable"
+], function( $ ) {
+
+module( "resizable: methods" );
+
+test( "disable", function( assert ) {
+	expect( 5 );
+
+	var element = $( "#resizable1" ).resizable({ disabled: false }),
+		chainable = element.resizable( "disable" );
+
+	assert.lacksClasses( element.resizable( "widget" ), "ui-state-disabled" );
+	ok( !element.resizable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
+	assert.hasClasses( element.resizable( "widget" ), "ui-resizable-disabled" );
+	equal( element.resizable( "option", "disabled" ), true, "disabled option setter" );
+	equal( chainable, element, "disable is chainable" );
+});
+
+} );
diff --git a/tests/unit/resizable/options.js b/tests/unit/resizable/options.js
new file mode 100644
index 000000000..7d9615b64
--- /dev/null
+++ b/tests/unit/resizable/options.js
@@ -0,0 +1,466 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/resizable"
+], function( $, testHelper ) {
+
+module("resizable: options");
+
+test( "alsoResize", function() {
+	expect( 2 );
+
+	var other = $( "<div>" )
+			.css({
+				width: 50,
+				height: 50
+			})
+			.appendTo( "body" ),
+		element = $( "#resizable1" ).resizable({
+			alsoResize: other
+		}),
+		handle = ".ui-resizable-e";
+
+	testHelper.drag( handle, 80 );
+	equal( element.width(), 180, "resizable width" );
+	equal( other.width(), 130, "alsoResize width" );
+});
+
+test("aspectRatio: 'preserve' (e)", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-e", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+
+	testHelper.drag(handle, 80);
+	equal( target.width(), 130, "compare maxWidth");
+	equal( target.height(), 130, "compare maxHeight");
+
+	testHelper.drag(handle, -130);
+	equal( target.width(), 70, "compare minWidth");
+	equal( target.height(), 70, "compare minHeight");
+});
+
+test("aspectRatio: 'preserve' (w)", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-w", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+
+	testHelper.drag(handle, -80);
+	equal( target.width(), 130, "compare maxWidth");
+	equal( target.height(), 130, "compare maxHeight");
+
+	testHelper.drag(handle, 130);
+	equal( target.width(), 70, "compare minWidth");
+	equal( target.height(), 70, "compare minHeight");
+});
+
+test("aspectRatio: 'preserve' (n)", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-n", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+
+	testHelper.drag(handle, 0, -80);
+	equal( target.width(), 130, "compare maxWidth");
+	equal( target.height(), 130, "compare maxHeight");
+
+	testHelper.drag(handle, 0, 80);
+	equal( target.width(), 70, "compare minWidth");
+	equal( target.height(), 70, "compare minHeight");
+});
+
+test("aspectRatio: 'preserve' (s)", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-s", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+
+	testHelper.drag(handle, 0, 80);
+	equal( target.width(), 130, "compare maxWidth");
+	equal( target.height(), 130, "compare maxHeight");
+
+	testHelper.drag(handle, 0, -80);
+	equal( target.width(), 70, "compare minWidth");
+	equal( target.height(), 70, "compare minHeight");
+});
+
+test("aspectRatio: 'preserve' (se)", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+
+	testHelper.drag(handle, 80, 80);
+	equal( target.width(), 130, "compare maxWidth");
+	equal( target.height(), 130, "compare maxHeight");
+
+	testHelper.drag(handle, -80, -80);
+	equal( target.width(), 70, "compare minWidth");
+	equal( target.height(), 70, "compare minHeight");
+});
+
+test("aspectRatio: 'preserve' (sw)", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+
+	testHelper.drag(handle, -80, 80);
+	equal( target.width(), 130, "compare maxWidth");
+	equal( target.height(), 130, "compare maxHeight");
+
+	testHelper.drag(handle, 80, -80);
+	equal( target.width(), 70, "compare minWidth");
+	equal( target.height(), 70, "compare minHeight");
+});
+
+test("aspectRatio: 'preserve' (ne)", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-ne", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+
+	testHelper.drag(handle, 80, -80);
+	equal( target.width(), 130, "compare maxWidth");
+	equal( target.height(), 130, "compare maxHeight");
+
+	testHelper.drag(handle, -80, 80);
+	equal( target.width(), 70, "compare minWidth");
+	equal( target.height(), 70, "compare minHeight");
+});
+
+test( "aspectRatio: Resizing can move objects", function() {
+	expect( 7 );
+
+	// http://bugs.jqueryui.com/ticket/7018 - Resizing can move objects
+	var handleW = ".ui-resizable-w",
+		handleNW = ".ui-resizable-nw",
+		target = $( "#resizable1" ).resizable({
+			aspectRatio: true,
+			handles: "all",
+			containment: "parent"
+		});
+
+	$( "#container" ).css({ width: 200, height: 300 });
+	$( "#resizable1" ).css({ width: 100, height: 100, left: 75, top: 200 });
+
+	testHelper.drag( handleW, -20 );
+	equal( target.width(), 100, "compare width - no size change" );
+	equal( target.height(), 100, "compare height - no size change" );
+	equal( target.position().left, 75, "compare left - no movement" );
+
+	// http://bugs.jqueryui.com/ticket/9107 - aspectRatio and containment not handled correctly
+	$( "#container" ).css({ width: 200, height: 300, position: "absolute", left: 100, top: 100 });
+	$( "#resizable1" ).css({ width: 100, height: 100, left: 0, top: 0 });
+
+	testHelper.drag( handleNW, -20, -20 );
+	equal( target.width(), 100, "compare width - no size change" );
+	equal( target.height(), 100, "compare height - no size change" );
+	equal( target.position().left, 0, "compare left - no movement" );
+	equal( target.position().top, 0, "compare top - no movement" );
+});
+
+test( "containment", function() {
+	expect( 4 );
+
+	var element = $( "#resizable1" ).resizable({
+		containment: "#container"
+	});
+
+	testHelper.drag( ".ui-resizable-se", 20, 30 );
+	equal( element.width(), 120, "unconstrained width within container" );
+	equal( element.height(), 130, "unconstrained height within container" );
+
+	testHelper.drag( ".ui-resizable-se", 400, 400 );
+	equal( element.width(), 300, "constrained width at containment edge" );
+	equal( element.height(), 200, "constrained height at containment edge" );
+});
+
+test( "containment - not immediate parent", function() {
+	expect( 4 );
+
+	// http://bugs.jqueryui.com/ticket/7485 - Resizable: Containment calculation is wrong
+	// when containment element is not the immediate parent
+	var element = $( "#child" ).resizable({
+		containment: "#container2",
+		handles: "all"
+	});
+
+	testHelper.drag( ".ui-resizable-e", 300, 0 );
+	equal( element.width(), 400, "Relative, contained within container width" );
+
+	testHelper.drag( ".ui-resizable-s", 0, 300 );
+	equal( element.height(), 400, "Relative, contained within container height" );
+
+	$( "#child" ).css( { left: 50, top: 50 } );
+	$( "#parent" ).css( { left: 50, top: 50 } );
+	$( "#container2" ).css( { left: 50, top: 50 } );
+
+	element = $( "#child" ).resizable({
+		containment: "#container2",
+		handles: "all"
+	});
+
+	testHelper.drag( ".ui-resizable-e", 400, 0 );
+	equal( element.width(), 300, "Relative with Left, contained within container width" );
+
+	testHelper.drag( ".ui-resizable-s", 0, 400 );
+	equal( element.height(), 300, "Relative with Top, contained within container height" );
+});
+
+test( "containment - immediate parent", function() {
+	expect( 4 );
+
+	// http://bugs.jqueryui.com/ticket/10140 - Resizable: Width calculation is wrong when containment element is "position: relative"
+	// when containment element is  immediate parent
+	var element = $( "#child" ).resizable({
+		containment: "parent",
+		handles: "all"
+	});
+
+	testHelper.drag( ".ui-resizable-e", 400, 0 );
+	equal( element.width(), 300, "Relative, contained within container width" );
+
+	testHelper.drag( ".ui-resizable-s", 0, 400 );
+	equal( element.height(), 300, "Relative, contained within container height" );
+
+	$( "#child" ).css( { left: 50, top: 50 } );
+	$( "#parent" ).css( { left: 50, top: 50 } );
+	$( "#container2" ).css( { left: 50, top: 50 } );
+
+	element = $( "#child" ).resizable({
+		containment: "parent",
+		handles: "all"
+	});
+
+	testHelper.drag( ".ui-resizable-e", 400, 0 );
+	equal( element.width(), 250, "Relative with Left, contained within container width" );
+
+	testHelper.drag( ".ui-resizable-s", 0, 400 );
+	equal( element.height(), 250, "Relative with Top, contained within container height" );
+});
+
+test("grid", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", grid: [ 0, 20 ] });
+
+	testHelper.drag(handle, 3, 9);
+	equal( target.width(), 103, "compare width");
+	equal( target.height(), 100, "compare height");
+
+	testHelper.drag(handle, 15, 11);
+	equal( target.width(), 118, "compare width");
+	equal( target.height(), 120, "compare height");
+});
+
+test("grid (min/max dimensions)", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", grid: 20, minWidth: 65, minHeight: 65, maxWidth: 135, maxHeight: 135 });
+
+	testHelper.drag(handle, 50, 50);
+	equal( target.width(), 120, "grid should respect maxWidth");
+	equal( target.height(), 120, "grid should respect maxHeight");
+
+	testHelper.drag(handle, -100, -100);
+	equal( target.width(), 80, "grid should respect minWidth");
+	equal( target.height(), 80, "grid should respect minHeight");
+});
+
+test("grid (wrapped)", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-se", target = $("#resizable2").resizable({ handles: "all", grid: [ 0, 20 ] });
+
+	testHelper.drag(handle, 3, 9);
+	equal( target.width(), 103, "compare width");
+	equal( target.height(), 100, "compare height");
+
+	testHelper.drag(handle, 15, 11);
+	equal( target.width(), 118, "compare width");
+	equal( target.height(), 120, "compare height");
+});
+
+test( "grid - Resizable: can be moved when grid option is set (#9611)", function() {
+	expect( 6 );
+
+	var oldPosition,
+		handle = ".ui-resizable-nw",
+		target = $( "#resizable1" ).resizable({
+			handles: "all",
+			grid: 50
+		});
+
+	testHelper.drag( handle, 50, 50 );
+	equal( target.width(), 50, "compare width" );
+	equal( target.height(), 50, "compare height" );
+
+	oldPosition = target.position();
+
+	testHelper.drag( handle, 50, 50 );
+	equal( target.width(), 50, "compare width" );
+	equal( target.height(), 50, "compare height" );
+	equal( target.position().top, oldPosition.top, "compare top" );
+	equal( target.position().left, oldPosition.left, "compare left" );
+});
+
+test( "grid - maintains grid with padding and border when approaching no dimensions", function() {
+	expect( 2 );
+
+	// http://bugs.jqueryui.com/ticket/10437 - Resizable: border with grid option working wrong
+	var handle = ".ui-resizable-nw",
+		target = $( "#resizable1" ).css({
+			padding: 5,
+			border: "5px solid black",
+			width: 80,
+			height: 80
+		}).resizable({
+			handles: "all",
+			grid: [ 50, 12 ]
+		});
+
+	testHelper.drag( handle, 50, 50 );
+	equal( target.outerWidth(), 50, "compare width" );
+	equal( target.outerHeight(), 52, "compare height" );
+});
+
+test("ui-resizable-se { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
+
+	testHelper.drag(handle, -50, -50);
+	equal( target.width(), 60, "compare minWidth" );
+	equal( target.height(), 60, "compare minHeight" );
+
+	testHelper.drag(handle, 70, 70);
+	equal( target.width(), 100, "compare maxWidth" );
+	equal( target.height(), 100, "compare maxHeight" );
+});
+
+test("ui-resizable-sw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
+
+	testHelper.drag(handle, 50, -50);
+	equal( target.width(), 60, "compare minWidth" );
+	equal( target.height(), 60, "compare minHeight" );
+
+	testHelper.drag(handle, -70, 70);
+	equal( target.width(), 100, "compare maxWidth" );
+	equal( target.height(), 100, "compare maxHeight" );
+});
+
+test("ui-resizable-ne { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-ne", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
+
+	testHelper.drag(handle, -50, 50);
+	equal( target.width(), 60, "compare minWidth" );
+	equal( target.height(), 60, "compare minHeight" );
+
+	testHelper.drag(handle, 70, -70);
+	equal( target.width(), 100, "compare maxWidth" );
+	equal( target.height(), 100, "compare maxHeight" );
+});
+
+test("ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
+	expect(4);
+
+	var handle = ".ui-resizable-nw", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
+
+	testHelper.drag(handle, 70, 70);
+	equal( target.width(), 60, "compare minWidth" );
+	equal( target.height(), 60, "compare minHeight" );
+
+	testHelper.drag(handle, -70, -70);
+	equal( target.width(), 100, "compare maxWidth" );
+	equal( target.height(), 100, "compare maxHeight" );
+});
+
+
+test( "custom handles { handles: { 's': $('#resizer1'), containment: 'parent' }", function () {
+	expect( 2 );
+
+	var handle = "#resizer1",
+		target = $( "#resizable1" ).resizable({ handles: { "s": $( "#resizer1" ) }, containment: "parent" });
+
+	testHelper.drag( handle, 0, 70 );
+	equal( target.height(), 170, "compare height" );
+
+	testHelper.drag( handle, 0, -70 );
+	equal( target.height(), 100, "compare height" );
+});
+
+
+test( "custom handles { handles: { 's': $('#resizer1')[0], containment: 'parent' }", function () {
+	expect( 2 );
+
+	var handle = "#resizer1",
+		target = $( "#resizable1" ).resizable({ handles: { "s": $( "#resizer1" )[ 0 ] }, containment: "parent" });
+
+	testHelper.drag( handle, 0, 70 );
+	equal( target.height(), 170, "compare height" );
+
+	testHelper.drag( handle, 0, -70 );
+	equal( target.height(), 100, "compare height" );
+});
+
+
+test("zIndex, applied to all handles", function() {
+	expect(8);
+
+	var target = $("<div></div>").resizable({ handles: "all", zIndex: 100 });
+	target.children( ".ui-resizable-handle" ).each( function( index, handle ) {
+		equal( $( handle ).css( "zIndex" ), 100, "compare zIndex" );
+	});
+});
+
+test( "alsoResize + containment", function() {
+	expect( 4 );
+	var other = $( "<div>" )
+			.css({
+				width: 50,
+				height: 50
+			})
+			.appendTo( "body" ),
+		element = $( "#resizable1" ).resizable({
+			alsoResize: other,
+			containment: "#container"
+		});
+
+	testHelper.drag( ".ui-resizable-se", 400, 400 );
+	equal( element.width(), 300, "resizable constrained width at containment edge" );
+	equal( element.height(), 200, "resizable constrained height at containment edge" );
+	equal( other.width(), 250, "alsoResize constrained width at containment edge" );
+	equal( other.height(), 150, "alsoResize constrained height at containment edge" );
+});
+
+test( "alsoResize + multiple selection", function() {
+	expect( 6 );
+	var other1 = $( "<div>" )
+			.addClass( "other" )
+			.css({
+				width: 50,
+				height: 50
+			})
+			.appendTo( "body" ),
+		other2 = $( "<div>" )
+			.addClass( "other" )
+			.css({
+				width: 50,
+				height: 50
+			})
+			.appendTo( "body"),
+		element = $( "#resizable1" ).resizable({
+			alsoResize: other1.add( other2 ),
+			containment: "#container"
+		});
+
+	testHelper.drag( ".ui-resizable-se", 400, 400 );
+	equal( element.width(), 300, "resizable constrained width at containment edge" );
+	equal( element.height(), 200, "resizable constrained height at containment edge" );
+	equal( other1.width(), 250, "alsoResize o1 constrained width at containment edge" );
+	equal( other1.height(), 150, "alsoResize o1 constrained height at containment edge" );
+	equal( other2.width(), 250, "alsoResize o2 constrained width at containment edge" );
+	equal( other2.height(), 150, "alsoResize o2 constrained height at containment edge" );
+});
+
+} );
diff --git a/tests/unit/resizable/resizable_common.js b/tests/unit/resizable/resizable_common.js
deleted file mode 100644
index 822a4db87..000000000
--- a/tests/unit/resizable/resizable_common.js
+++ /dev/null
@@ -1,40 +0,0 @@
-define( [
-	"lib/common",
-	"ui/resizable"
-], function( common ) {
-
-common.testWidget( "resizable", {
-	defaults: {
-		alsoResize: false,
-		animate: false,
-		animateDuration: "slow",
-		animateEasing: "swing",
-		aspectRatio: false,
-		autoHide: false,
-		cancel: "input, textarea, button, select, option",
-		classes: {
-			"ui-resizable-se": "ui-icon ui-icon-gripsmall-diagonal-se"
-		},
-		containment: false,
-		delay: 0,
-		disabled: false,
-		distance: 1,
-		ghost: false,
-		grid: false,
-		handles: "e,s,se",
-		helper: false,
-		maxHeight: null,
-		maxWidth: null,
-		minHeight: 10,
-		minWidth: 10,
-		zIndex: 90,
-
-		// callbacks
-		create: null,
-		resize: null,
-		start: null,
-		stop: null
-	}
-});
-
-} );
diff --git a/tests/unit/resizable/resizable_core.js b/tests/unit/resizable/resizable_core.js
deleted file mode 100644
index a63189511..000000000
--- a/tests/unit/resizable/resizable_core.js
+++ /dev/null
@@ -1,244 +0,0 @@
-define( [
-	"jquery",
-	"./resizable_test_helpers",
-	"ui/resizable"
-], function( $, testHelper ) {
-
-module("resizable: core");
-
-/*
-test("element types", function() {
-	var typeNames = ("p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form"
-		+ ",table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr"
-		+ ",acronym,code,samp,kbd,var,img,object,hr"
-		+ ",input,button,label,select,iframe").split(",");
-
-	$.each(typeNames, function(i) {
-		var typeName = typeNames[i];
-		el = $(document.createElement(typeName)).appendTo("body");
-		(typeName == "table" && el.append("<tr><td>content</td></tr>"));
-		el.resizable();
-		ok(true, "$('&lt;" + typeName + "/&gt').resizable()");
-		el.resizable("destroy");
-		el.remove();
-	});
-});
-*/
-
-test("n", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-n", target = $("#resizable1").resizable({ handles: "all" });
-
-	testHelper.drag(handle, 0, -50);
-	equal( target.height(), 150, "compare height" );
-
-	testHelper.drag(handle, 0, 50);
-	equal( target.height(), 100, "compare height" );
-
-	equal( target[0].style.left, "", "left should not be modified" );
-	equal( target[0].style.width, "", "width should not be modified" );
-});
-
-test("s", function() {
-	expect(5);
-
-	var handle = ".ui-resizable-s", target = $("#resizable1").resizable({ handles: "all" });
-
-	testHelper.drag(handle, 0, 50);
-	equal( target.height(), 150, "compare height" );
-
-	testHelper.drag(handle, 0, -50);
-	equal( target.height(), 100, "compare height" );
-
-	equal( target[0].style.top, "", "top should not be modified" );
-	equal( target[0].style.left, "", "left should not be modified" );
-	equal( target[0].style.width, "", "width should not be modified" );
-});
-
-test("e", function() {
-	expect(5);
-
-	var handle = ".ui-resizable-e", target = $("#resizable1").resizable({ handles: "all" });
-
-	testHelper.drag(handle, 50);
-	equal( target.width(), 150, "compare width");
-
-	testHelper.drag(handle, -50);
-	equal( target.width(), 100, "compare width" );
-
-	equal( target[0].style.height, "", "height should not be modified" );
-	equal( target[0].style.top, "", "top should not be modified" );
-	equal( target[0].style.left, "", "left should not be modified" );
-});
-
-test("w", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-w", target = $("#resizable1").resizable({ handles: "all" });
-
-	testHelper.drag(handle, -50);
-	equal( target.width(), 150, "compare width" );
-
-	testHelper.drag(handle, 50);
-	equal( target.width(), 100, "compare width" );
-
-	equal( target[0].style.height, "", "height should not be modified" );
-	equal( target[0].style.top, "", "top should not be modified" );
-});
-
-test("ne", function() {
-	expect(5);
-
-	var handle = ".ui-resizable-ne", target = $("#resizable1").css({ overflow: "hidden" }).resizable({ handles: "all" });
-
-	testHelper.drag(handle, -50, -50);
-	equal( target.width(), 50, "compare width" );
-	equal( target.height(), 150, "compare height" );
-
-	testHelper.drag(handle, 50, 50);
-	equal( target.width(), 100, "compare width" );
-	equal( target.height(), 100, "compare height" );
-
-	equal( target[0].style.left, "", "left should not be modified" );
-});
-
-test("se", function() {
-	expect(6);
-
-	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all" });
-
-	testHelper.drag(handle, 50, 50);
-	equal( target.width(), 150, "compare width" );
-	equal( target.height(), 150, "compare height" );
-
-	testHelper.drag(handle, -50, -50);
-	equal( target.width(), 100, "compare width" );
-	equal( target.height(), 100, "compare height" );
-
-	equal( target[0].style.top, "", "top should not be modified" );
-	equal( target[0].style.left, "", "left should not be modified" );
-});
-
-test("sw", function() {
-	expect(5);
-
-	var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ handles: "all" });
-
-	testHelper.drag(handle, -50, -50);
-	equal( target.width(), 150, "compare width" );
-	equal( target.height(), 50, "compare height" );
-
-	testHelper.drag(handle, 50, 50);
-	equal( target.width(), 100, "compare width" );
-	equal( target.height(), 100, "compare height" );
-
-	equal( target[0].style.top, "", "top should not be modified" );
-});
-
-test("nw", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-nw", target = $("#resizable1").resizable({ handles: "all" });
-
-	testHelper.drag(handle, -50, -50);
-	equal( target.width(), 150, "compare width" );
-	equal( target.height(), 150, "compare height" );
-
-	testHelper.drag(handle, 50, 50);
-	equal( target.width(), 100, "compare width" );
-	equal( target.height(), 100, "compare height" );
-});
-
-test("handle with complex markup (#8756)", function() {
-	expect(2);
-
-	$("#resizable1")
-		.append(
-			$("<div>")
-				.addClass("ui-resizable-handle")
-				.addClass("ui-resizable-w")
-				.append($("<div>"))
-		);
-
-	var handle = ".ui-resizable-w div", target = $("#resizable1").resizable({ handles: "all" });
-
-	testHelper.drag(handle, -50);
-	equal( target.width(), 150, "compare width" );
-
-	testHelper.drag(handle, 50);
-	equal( target.width(), 100, "compare width" );
-});
-
-test("resizable accounts for scroll position correctly (#3815)", function() {
-	expect( 4 );
-
-	var position, top, left,
-		container = $("<div style='overflow:scroll;height:300px;width:300px;position:relative;'></div>").appendTo("#qunit-fixture"),
-		overflowed = $("<div style='width: 1000px; height: 1000px;'></div>").appendTo( container ),
-		el = $("<div style='height:100px;width:100px;position:absolute;top:10px;left:10px;'></div>").appendTo( overflowed ).resizable({ handles: "all" }),
-		handle = ".ui-resizable-e",
-		handlePosition = $(handle).position().left;
-
-	container.scrollLeft( 100 ).scrollTop( 100 );
-
-	position = el.position();
-	left = el.css("left");
-	top = el.css("top");
-
-	testHelper.drag(handle, 50, 50);
-	deepEqual( el.position(), position, "position stays the same when resized" );
-	equal( el.css("left"), left, "css('left') stays the same when resized" );
-	equal( el.css("top"), top, "css('top') stays the same when resized" );
-	equal( $(handle).position().left, handlePosition + 50, "handle also moved" );
-});
-
-test( "resizable stores correct size when using helper and grid (#9547)", function() {
-	expect( 2 );
-
-	var handle = ".ui-resizable-se",
-		target = $( "#resizable1" ).resizable({
-			handles: "all",
-			helper: "ui-resizable-helper",
-			grid: [ 10, 10 ]
-		});
-
-	testHelper.drag( handle, 1, 1 );
-	equal( target.width(), 100, "compare width" );
-	equal( target.height(), 100, "compare height" );
-});
-
-test( "nested resizable", function() {
-	expect( 4 );
-
-	var outer = $( "<div id='outer' style='width:50px'></div>" ),
-		inner = $( "<div id='inner' style='width:30px'></div>" ),
-		target = $( "#resizable1" ),
-		innerHandle,
-		outerHandle;
-
-	outer.appendTo( target );
-	inner.appendTo( outer );
-
-	inner.resizable( { handles : "e" } );
-	outer.resizable( { handles : "e" } );
-	target.resizable( { handles : "e" } );
-
-	innerHandle = $( "#inner > .ui-resizable-e" );
-	outerHandle = $( "#outer > .ui-resizable-e" );
-
-	testHelper.drag( innerHandle, 10 );
-	equal( inner.width(), 40, "compare width of inner element" );
-	testHelper.drag( innerHandle, -10 );
-	equal( inner.width(), 30, "compare width of inner element" );
-
-	testHelper.drag( outerHandle, 10 );
-	equal( outer.width(), 60, "compare width of outer element" );
-	testHelper.drag( outerHandle, -10 );
-	equal( outer.width(), 50, "compare width of outer element" );
-
-	inner.remove();
-	outer.remove();
-});
-
-} );
diff --git a/tests/unit/resizable/resizable_events.js b/tests/unit/resizable/resizable_events.js
deleted file mode 100644
index a26824137..000000000
--- a/tests/unit/resizable/resizable_events.js
+++ /dev/null
@@ -1,242 +0,0 @@
-define( [
-	"jquery",
-	"./resizable_test_helpers",
-	"ui/resizable"
-], function( $, testHelper ) {
-
-module("resizable: events");
-
-test("start", function() {
-
-	expect(5);
-
-	var count = 0,
-		handle = ".ui-resizable-se";
-
-	$("#resizable1").resizable({
-		handles: "all",
-		start: function(event, ui) {
-			equal( ui.size.width, 100, "compare width" );
-			equal( ui.size.height, 100, "compare height" );
-			equal( ui.originalSize.width, 100, "compare original width" );
-			equal( ui.originalSize.height, 100, "compare original height" );
-			count++;
-		}
-	});
-
-	testHelper.drag(handle, 50, 50);
-
-	equal(count, 1, "start callback should happen exactly once");
-
-});
-
-test( "resize", function() {
-
-	expect( 9 );
-
-	var count = 0,
-		handle = ".ui-resizable-se";
-
-	$("#resizable1").resizable({
-		handles: "all",
-		resize: function( event, ui ) {
-			if ( count === 0 ) {
-				equal( ui.size.width, 125, "compare width" );
-				equal( ui.size.height, 125, "compare height" );
-				equal( ui.originalSize.width, 100, "compare original width" );
-				equal( ui.originalSize.height, 100, "compare original height" );
-			} else {
-				equal( ui.size.width, 150, "compare width" );
-				equal( ui.size.height, 150, "compare height" );
-				equal( ui.originalSize.width, 100, "compare original width" );
-				equal( ui.originalSize.height, 100, "compare original height" );
-			}
-			count++;
-		}
-	});
-
-	testHelper.drag( handle, 50, 50 );
-
-	equal( count, 2, "resize callback should happen exactly once per size adjustment" );
-
-});
-
-test( "resize (min/max dimensions)", function() {
-
-	expect( 5 );
-
-	var count = 0,
-		handle = ".ui-resizable-se";
-
-	$("#resizable1").resizable({
-		handles: "all",
-		minWidth: 60,
-		minHeight: 60,
-		maxWidth: 100,
-		maxHeight: 100,
-		resize: function( event, ui ) {
-			equal( ui.size.width, 60, "compare width" );
-			equal( ui.size.height, 60, "compare height" );
-			equal( ui.originalSize.width, 100, "compare original width" );
-			equal( ui.originalSize.height, 100, "compare original height" );
-			count++;
-		}
-	});
-
-	testHelper.drag( handle, -200, -200 );
-
-	equal( count, 1, "resize callback should happen exactly once per size adjustment" );
-
-});
-
-test( "resize (containment)", function() {
-
-	expect( 5 );
-
-	var count = 0,
-		handle = ".ui-resizable-se",
-		container = $("#resizable1").wrap("<div>").parent().css({
-			height: "100px",
-			width: "100px"
-		});
-
-	$("#resizable1").resizable({
-		handles: "all",
-		containment: container,
-		resize: function( event, ui ) {
-			equal( ui.size.width, 10, "compare width" );
-			equal( ui.size.height, 10, "compare height" );
-			equal( ui.originalSize.width, 100, "compare original width" );
-			equal( ui.originalSize.height, 100, "compare original height" );
-			count++;
-		}
-	});
-
-	// Prove you can't resize outside containment by dragging southeast corner southeast
-	testHelper.drag( handle, 100, 100 );
-
-	// Prove you can't resize outside containment by dragging southeast corner northwest
-	testHelper.drag( handle, -200, -200 );
-
-	equal( count, 1, "resize callback should happen exactly once per size adjustment" );
-
-});
-
-test("resize (grid)", function() {
-
-	expect(5);
-
-	var count = 0,
-		handle = ".ui-resizable-se";
-
-	$("#resizable1").resizable({
-		handles: "all",
-		grid: 50,
-		resize: function(event, ui) {
-			equal( ui.size.width, 150, "compare width" );
-			equal( ui.size.height, 150, "compare height" );
-			equal( ui.originalSize.width, 100, "compare original width" );
-			equal( ui.originalSize.height, 100, "compare original height" );
-			count++;
-		}
-	});
-
-	testHelper.drag(handle, 50, 50);
-
-	equal(count, 1, "resize callback should happen exactly once per grid-unit size adjustment");
-
-});
-
-test( "resize, custom adjustment", function() {
-	expect( 4 );
-
-	var handle = ".ui-resizable-se",
-		element = $( "#resizable1" ).resizable({
-			resize: function( event, ui ) {
-				ui.size.width = 100;
-				ui.size.height = 200;
-				ui.position.left = 300;
-				ui.position.top = 400;
-			}
-		});
-
-	testHelper.drag( handle, 50, 50 );
-
-	equal( element.width(), 100, "resize event can control width" );
-	equal( element.height(), 200, "resize event can control height" );
-	equal( element.position().left, 300, "resize event can control left" );
-	equal( element.position().top, 400, "resize event can control top" );
-});
-
-test("stop", function() {
-
-	expect(5);
-
-	var count = 0,
-		handle = ".ui-resizable-se";
-
-	$("#resizable1").resizable({
-		handles: "all",
-		stop: function(event, ui) {
-			equal( ui.size.width, 150, "compare width" );
-			equal( ui.size.height, 150, "compare height" );
-			equal( ui.originalSize.width, 100, "compare original width" );
-			equal( ui.originalSize.height, 100, "compare original height" );
-			count++;
-		}
-	});
-
-	testHelper.drag(handle, 50, 50);
-
-	equal(count, 1, "stop callback should happen exactly once");
-
-});
-
-test( "resize (containment) works with parent with negative offset", function() {
-
-	expect( 1 );
-
-	var widthBefore, widthAfter,
-		handle = ".ui-resizable-e",
-		target = $( "#resizable1" ),
-		absoluteContainer = target.wrap( "<div />" ).parent(),
-		fixedContainer = absoluteContainer.wrap( "<div />" ).parent(),
-		increaseWidthBy = 50;
-
-	// position fixed container in window top left
-	fixedContainer.css({
-		width: 400,
-		height: 100,
-		position: "fixed",
-		top: 0,
-		left: 0
-	});
-
-	// position absolute container within fixed on slightly outside window
-	absoluteContainer.css({
-		width: 400,
-		height: 100,
-		position: "absolute",
-		top: 0,
-		left: -50
-	});
-
-	// set up resizable to be contained within absolute container
-	target.resizable({
-		handles: "all",
-		containment: "parent"
-	}).css({
-		width: 300
-	});
-
-	widthBefore = target.width();
-
-	testHelper.drag( handle, increaseWidthBy, 0 );
-
-	widthAfter = target.width();
-
-	equal( widthAfter, ( widthBefore + increaseWidthBy ), "resizable width should be increased by the value dragged" );
-
-});
-
-} );
diff --git a/tests/unit/resizable/resizable_methods.js b/tests/unit/resizable/resizable_methods.js
deleted file mode 100644
index a7056a105..000000000
--- a/tests/unit/resizable/resizable_methods.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define( [
-	"jquery",
-	"ui/resizable"
-], function( $ ) {
-
-module( "resizable: methods" );
-
-test( "disable", function( assert ) {
-	expect( 5 );
-
-	var element = $( "#resizable1" ).resizable({ disabled: false }),
-		chainable = element.resizable( "disable" );
-
-	assert.lacksClasses( element.resizable( "widget" ), "ui-state-disabled" );
-	ok( !element.resizable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
-	assert.hasClasses( element.resizable( "widget" ), "ui-resizable-disabled" );
-	equal( element.resizable( "option", "disabled" ), true, "disabled option setter" );
-	equal( chainable, element, "disable is chainable" );
-});
-
-} );
diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js
deleted file mode 100644
index bf9033f13..000000000
--- a/tests/unit/resizable/resizable_options.js
+++ /dev/null
@@ -1,466 +0,0 @@
-define( [
-	"jquery",
-	"./resizable_test_helpers",
-	"ui/resizable"
-], function( $, testHelper ) {
-
-module("resizable: options");
-
-test( "alsoResize", function() {
-	expect( 2 );
-
-	var other = $( "<div>" )
-			.css({
-				width: 50,
-				height: 50
-			})
-			.appendTo( "body" ),
-		element = $( "#resizable1" ).resizable({
-			alsoResize: other
-		}),
-		handle = ".ui-resizable-e";
-
-	testHelper.drag( handle, 80 );
-	equal( element.width(), 180, "resizable width" );
-	equal( other.width(), 130, "alsoResize width" );
-});
-
-test("aspectRatio: 'preserve' (e)", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-e", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
-
-	testHelper.drag(handle, 80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
-
-	testHelper.drag(handle, -130);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
-
-test("aspectRatio: 'preserve' (w)", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-w", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
-
-	testHelper.drag(handle, -80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
-
-	testHelper.drag(handle, 130);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
-
-test("aspectRatio: 'preserve' (n)", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-n", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
-
-	testHelper.drag(handle, 0, -80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
-
-	testHelper.drag(handle, 0, 80);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
-
-test("aspectRatio: 'preserve' (s)", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-s", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
-
-	testHelper.drag(handle, 0, 80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
-
-	testHelper.drag(handle, 0, -80);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
-
-test("aspectRatio: 'preserve' (se)", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
-
-	testHelper.drag(handle, 80, 80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
-
-	testHelper.drag(handle, -80, -80);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
-
-test("aspectRatio: 'preserve' (sw)", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
-
-	testHelper.drag(handle, -80, 80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
-
-	testHelper.drag(handle, 80, -80);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
-
-test("aspectRatio: 'preserve' (ne)", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-ne", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
-
-	testHelper.drag(handle, 80, -80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
-
-	testHelper.drag(handle, -80, 80);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
-
-test( "aspectRatio: Resizing can move objects", function() {
-	expect( 7 );
-
-	// http://bugs.jqueryui.com/ticket/7018 - Resizing can move objects
-	var handleW = ".ui-resizable-w",
-		handleNW = ".ui-resizable-nw",
-		target = $( "#resizable1" ).resizable({
-			aspectRatio: true,
-			handles: "all",
-			containment: "parent"
-		});
-
-	$( "#container" ).css({ width: 200, height: 300 });
-	$( "#resizable1" ).css({ width: 100, height: 100, left: 75, top: 200 });
-
-	testHelper.drag( handleW, -20 );
-	equal( target.width(), 100, "compare width - no size change" );
-	equal( target.height(), 100, "compare height - no size change" );
-	equal( target.position().left, 75, "compare left - no movement" );
-
-	// http://bugs.jqueryui.com/ticket/9107 - aspectRatio and containment not handled correctly
-	$( "#container" ).css({ width: 200, height: 300, position: "absolute", left: 100, top: 100 });
-	$( "#resizable1" ).css({ width: 100, height: 100, left: 0, top: 0 });
-
-	testHelper.drag( handleNW, -20, -20 );
-	equal( target.width(), 100, "compare width - no size change" );
-	equal( target.height(), 100, "compare height - no size change" );
-	equal( target.position().left, 0, "compare left - no movement" );
-	equal( target.position().top, 0, "compare top - no movement" );
-});
-
-test( "containment", function() {
-	expect( 4 );
-
-	var element = $( "#resizable1" ).resizable({
-		containment: "#container"
-	});
-
-	testHelper.drag( ".ui-resizable-se", 20, 30 );
-	equal( element.width(), 120, "unconstrained width within container" );
-	equal( element.height(), 130, "unconstrained height within container" );
-
-	testHelper.drag( ".ui-resizable-se", 400, 400 );
-	equal( element.width(), 300, "constrained width at containment edge" );
-	equal( element.height(), 200, "constrained height at containment edge" );
-});
-
-test( "containment - not immediate parent", function() {
-	expect( 4 );
-
-	// http://bugs.jqueryui.com/ticket/7485 - Resizable: Containment calculation is wrong
-	// when containment element is not the immediate parent
-	var element = $( "#child" ).resizable({
-		containment: "#container2",
-		handles: "all"
-	});
-
-	testHelper.drag( ".ui-resizable-e", 300, 0 );
-	equal( element.width(), 400, "Relative, contained within container width" );
-
-	testHelper.drag( ".ui-resizable-s", 0, 300 );
-	equal( element.height(), 400, "Relative, contained within container height" );
-
-	$( "#child" ).css( { left: 50, top: 50 } );
-	$( "#parent" ).css( { left: 50, top: 50 } );
-	$( "#container2" ).css( { left: 50, top: 50 } );
-
-	element = $( "#child" ).resizable({
-		containment: "#container2",
-		handles: "all"
-	});
-
-	testHelper.drag( ".ui-resizable-e", 400, 0 );
-	equal( element.width(), 300, "Relative with Left, contained within container width" );
-
-	testHelper.drag( ".ui-resizable-s", 0, 400 );
-	equal( element.height(), 300, "Relative with Top, contained within container height" );
-});
-
-test( "containment - immediate parent", function() {
-	expect( 4 );
-
-	// http://bugs.jqueryui.com/ticket/10140 - Resizable: Width calculation is wrong when containment element is "position: relative"
-	// when containment element is  immediate parent
-	var element = $( "#child" ).resizable({
-		containment: "parent",
-		handles: "all"
-	});
-
-	testHelper.drag( ".ui-resizable-e", 400, 0 );
-	equal( element.width(), 300, "Relative, contained within container width" );
-
-	testHelper.drag( ".ui-resizable-s", 0, 400 );
-	equal( element.height(), 300, "Relative, contained within container height" );
-
-	$( "#child" ).css( { left: 50, top: 50 } );
-	$( "#parent" ).css( { left: 50, top: 50 } );
-	$( "#container2" ).css( { left: 50, top: 50 } );
-
-	element = $( "#child" ).resizable({
-		containment: "parent",
-		handles: "all"
-	});
-
-	testHelper.drag( ".ui-resizable-e", 400, 0 );
-	equal( element.width(), 250, "Relative with Left, contained within container width" );
-
-	testHelper.drag( ".ui-resizable-s", 0, 400 );
-	equal( element.height(), 250, "Relative with Top, contained within container height" );
-});
-
-test("grid", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", grid: [ 0, 20 ] });
-
-	testHelper.drag(handle, 3, 9);
-	equal( target.width(), 103, "compare width");
-	equal( target.height(), 100, "compare height");
-
-	testHelper.drag(handle, 15, 11);
-	equal( target.width(), 118, "compare width");
-	equal( target.height(), 120, "compare height");
-});
-
-test("grid (min/max dimensions)", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", grid: 20, minWidth: 65, minHeight: 65, maxWidth: 135, maxHeight: 135 });
-
-	testHelper.drag(handle, 50, 50);
-	equal( target.width(), 120, "grid should respect maxWidth");
-	equal( target.height(), 120, "grid should respect maxHeight");
-
-	testHelper.drag(handle, -100, -100);
-	equal( target.width(), 80, "grid should respect minWidth");
-	equal( target.height(), 80, "grid should respect minHeight");
-});
-
-test("grid (wrapped)", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-se", target = $("#resizable2").resizable({ handles: "all", grid: [ 0, 20 ] });
-
-	testHelper.drag(handle, 3, 9);
-	equal( target.width(), 103, "compare width");
-	equal( target.height(), 100, "compare height");
-
-	testHelper.drag(handle, 15, 11);
-	equal( target.width(), 118, "compare width");
-	equal( target.height(), 120, "compare height");
-});
-
-test( "grid - Resizable: can be moved when grid option is set (#9611)", function() {
-	expect( 6 );
-
-	var oldPosition,
-		handle = ".ui-resizable-nw",
-		target = $( "#resizable1" ).resizable({
-			handles: "all",
-			grid: 50
-		});
-
-	testHelper.drag( handle, 50, 50 );
-	equal( target.width(), 50, "compare width" );
-	equal( target.height(), 50, "compare height" );
-
-	oldPosition = target.position();
-
-	testHelper.drag( handle, 50, 50 );
-	equal( target.width(), 50, "compare width" );
-	equal( target.height(), 50, "compare height" );
-	equal( target.position().top, oldPosition.top, "compare top" );
-	equal( target.position().left, oldPosition.left, "compare left" );
-});
-
-test( "grid - maintains grid with padding and border when approaching no dimensions", function() {
-	expect( 2 );
-
-	// http://bugs.jqueryui.com/ticket/10437 - Resizable: border with grid option working wrong
-	var handle = ".ui-resizable-nw",
-		target = $( "#resizable1" ).css({
-			padding: 5,
-			border: "5px solid black",
-			width: 80,
-			height: 80
-		}).resizable({
-			handles: "all",
-			grid: [ 50, 12 ]
-		});
-
-	testHelper.drag( handle, 50, 50 );
-	equal( target.outerWidth(), 50, "compare width" );
-	equal( target.outerHeight(), 52, "compare height" );
-});
-
-test("ui-resizable-se { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
-
-	testHelper.drag(handle, -50, -50);
-	equal( target.width(), 60, "compare minWidth" );
-	equal( target.height(), 60, "compare minHeight" );
-
-	testHelper.drag(handle, 70, 70);
-	equal( target.width(), 100, "compare maxWidth" );
-	equal( target.height(), 100, "compare maxHeight" );
-});
-
-test("ui-resizable-sw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
-
-	testHelper.drag(handle, 50, -50);
-	equal( target.width(), 60, "compare minWidth" );
-	equal( target.height(), 60, "compare minHeight" );
-
-	testHelper.drag(handle, -70, 70);
-	equal( target.width(), 100, "compare maxWidth" );
-	equal( target.height(), 100, "compare maxHeight" );
-});
-
-test("ui-resizable-ne { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-ne", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
-
-	testHelper.drag(handle, -50, 50);
-	equal( target.width(), 60, "compare minWidth" );
-	equal( target.height(), 60, "compare minHeight" );
-
-	testHelper.drag(handle, 70, -70);
-	equal( target.width(), 100, "compare maxWidth" );
-	equal( target.height(), 100, "compare maxHeight" );
-});
-
-test("ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
-	expect(4);
-
-	var handle = ".ui-resizable-nw", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
-
-	testHelper.drag(handle, 70, 70);
-	equal( target.width(), 60, "compare minWidth" );
-	equal( target.height(), 60, "compare minHeight" );
-
-	testHelper.drag(handle, -70, -70);
-	equal( target.width(), 100, "compare maxWidth" );
-	equal( target.height(), 100, "compare maxHeight" );
-});
-
-
-test( "custom handles { handles: { 's': $('#resizer1'), containment: 'parent' }", function () {
-	expect( 2 );
-
-	var handle = "#resizer1",
-		target = $( "#resizable1" ).resizable({ handles: { "s": $( "#resizer1" ) }, containment: "parent" });
-
-	testHelper.drag( handle, 0, 70 );
-	equal( target.height(), 170, "compare height" );
-
-	testHelper.drag( handle, 0, -70 );
-	equal( target.height(), 100, "compare height" );
-});
-
-
-test( "custom handles { handles: { 's': $('#resizer1')[0], containment: 'parent' }", function () {
-	expect( 2 );
-
-	var handle = "#resizer1",
-		target = $( "#resizable1" ).resizable({ handles: { "s": $( "#resizer1" )[ 0 ] }, containment: "parent" });
-
-	testHelper.drag( handle, 0, 70 );
-	equal( target.height(), 170, "compare height" );
-
-	testHelper.drag( handle, 0, -70 );
-	equal( target.height(), 100, "compare height" );
-});
-
-
-test("zIndex, applied to all handles", function() {
-	expect(8);
-
-	var target = $("<div></div>").resizable({ handles: "all", zIndex: 100 });
-	target.children( ".ui-resizable-handle" ).each( function( index, handle ) {
-		equal( $( handle ).css( "zIndex" ), 100, "compare zIndex" );
-	});
-});
-
-test( "alsoResize + containment", function() {
-	expect( 4 );
-	var other = $( "<div>" )
-			.css({
-				width: 50,
-				height: 50
-			})
-			.appendTo( "body" ),
-		element = $( "#resizable1" ).resizable({
-			alsoResize: other,
-			containment: "#container"
-		});
-
-	testHelper.drag( ".ui-resizable-se", 400, 400 );
-	equal( element.width(), 300, "resizable constrained width at containment edge" );
-	equal( element.height(), 200, "resizable constrained height at containment edge" );
-	equal( other.width(), 250, "alsoResize constrained width at containment edge" );
-	equal( other.height(), 150, "alsoResize constrained height at containment edge" );
-});
-
-test( "alsoResize + multiple selection", function() {
-	expect( 6 );
-	var other1 = $( "<div>" )
-			.addClass( "other" )
-			.css({
-				width: 50,
-				height: 50
-			})
-			.appendTo( "body" ),
-		other2 = $( "<div>" )
-			.addClass( "other" )
-			.css({
-				width: 50,
-				height: 50
-			})
-			.appendTo( "body"),
-		element = $( "#resizable1" ).resizable({
-			alsoResize: other1.add( other2 ),
-			containment: "#container"
-		});
-
-	testHelper.drag( ".ui-resizable-se", 400, 400 );
-	equal( element.width(), 300, "resizable constrained width at containment edge" );
-	equal( element.height(), 200, "resizable constrained height at containment edge" );
-	equal( other1.width(), 250, "alsoResize o1 constrained width at containment edge" );
-	equal( other1.height(), 150, "alsoResize o1 constrained height at containment edge" );
-	equal( other2.width(), 250, "alsoResize o2 constrained width at containment edge" );
-	equal( other2.height(), 150, "alsoResize o2 constrained height at containment edge" );
-});
-
-} );
diff --git a/tests/unit/resizable/resizable_test_helpers.js b/tests/unit/resizable/resizable_test_helpers.js
deleted file mode 100644
index 494c1a073..000000000
--- a/tests/unit/resizable/resizable_test_helpers.js
+++ /dev/null
@@ -1,18 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper"
-], function( $, helper ) {
-
-return $.extend( helper, {
-	drag: function( el, dx, dy ) {
-		// this mouseover is to work around a limitation in resizable
-		// TODO: fix resizable so handle doesn't require mouseover in order to be used
-		$( el ).simulate("mouseover").simulate( "drag", {
-			moves: 2,
-			dx: dx,
-			dy: dy
-		});
-	}
-} );
-
-} );
diff --git a/tests/unit/selectable/common.js b/tests/unit/selectable/common.js
new file mode 100644
index 000000000..9a14e6df5
--- /dev/null
+++ b/tests/unit/selectable/common.js
@@ -0,0 +1,29 @@
+define( [
+	"lib/common",
+	"ui/selectable"
+], function( common ) {
+
+common.testWidget( "selectable", {
+	defaults: {
+		appendTo: "body",
+		autoRefresh: true,
+		cancel: "input, textarea, button, select, option",
+		classes: {},
+		delay: 0,
+		disabled: false,
+		distance: 0,
+		filter: "*",
+		tolerance: "touch",
+
+		// callbacks
+		create: null,
+		selected: null,
+		selecting: null,
+		start: null,
+		stop: null,
+		unselected: null,
+		unselecting: null
+	}
+});
+
+} );
diff --git a/tests/unit/selectable/core.js b/tests/unit/selectable/core.js
new file mode 100644
index 000000000..c3ace5370
--- /dev/null
+++ b/tests/unit/selectable/core.js
@@ -0,0 +1,3 @@
+/*
+ * selectable_core.js
+ */
diff --git a/tests/unit/selectable/events.js b/tests/unit/selectable/events.js
new file mode 100644
index 000000000..6eb99f325
--- /dev/null
+++ b/tests/unit/selectable/events.js
@@ -0,0 +1,63 @@
+define( [
+	"jquery",
+	"lib/helper",
+	"ui/selectable"
+], function( $, testHelpers ) {
+
+module("selectable: events");
+
+test( "start", function() {
+	expect( 2 );
+	var el = $("#selectable1");
+	el.selectable({
+		start: function() {
+			ok( true, "drag fired start callback" );
+			equal( this, el[0], "context of callback" );
+		}
+	});
+	el.simulate( "drag", {
+		dx: 20,
+		dy: 20
+	});
+});
+
+test( "stop", function() {
+	expect( 2 );
+	var el = $("#selectable1");
+	el.selectable({
+		start: function() {
+			ok( true, "drag fired stop callback" );
+			equal( this, el[0], "context of callback" );
+		}
+	});
+	el.simulate( "drag", {
+		dx: 20,
+		dy: 20
+	});
+});
+
+test( "mousedown: initial position of helper", function() {
+	expect( 2 );
+
+	var helperOffset,
+		element = $( "#selectable1" ).selectable(),
+		contentToForceScroll = testHelpers.forceScrollableWindow( "body" );
+
+	$( window ).scrollTop( 100 ).scrollLeft( 100 );
+
+	element.simulate( "mousedown", {
+		clientX: 10,
+		clientY: 10
+	});
+
+	helperOffset = $( ".ui-selectable-helper" ).offset();
+	ok( helperOffset.top, 110, "Scroll top should be accounted for." );
+	ok( helperOffset.left, 110, "Scroll left should be accounted for." );
+
+	// Cleanup
+	element.simulate( "mouseup" );
+	contentToForceScroll.remove();
+	$( window ).scrollTop( 0 ).scrollLeft( 0 );
+});
+
+} );
diff --git a/tests/unit/selectable/methods.js b/tests/unit/selectable/methods.js
new file mode 100644
index 000000000..045809670
--- /dev/null
+++ b/tests/unit/selectable/methods.js
@@ -0,0 +1,111 @@
+define( [
+	"jquery",
+	"ui/selectable"
+], function( $ ) {
+
+module("selectable: methods");
+
+test("init", function() {
+	expect( 5 );
+
+	$("<div></div>").appendTo("body").selectable().remove();
+	ok(true, ".selectable() called on element");
+
+	$([]).selectable().remove();
+	ok(true, ".selectable() called on empty collection");
+
+	$("<div></div>").selectable().remove();
+	ok(true, ".selectable() called on disconnected DOMElement");
+
+	var el = $("<div></div>").selectable();
+	el.selectable("option", "foo");
+	el.remove();
+	ok(true, "arbitrary option getter after init");
+
+	$("<div></div>").selectable().selectable("option", "foo", "bar").remove();
+	ok(true, "arbitrary option setter after init");
+});
+
+test("destroy", function() {
+	expect( 4 );
+
+	$("<div></div>").appendTo("body").selectable().selectable("destroy").remove();
+	ok(true, ".selectable('destroy') called on element");
+
+	$([]).selectable().selectable("destroy").remove();
+	ok(true, ".selectable('destroy') called on empty collection");
+
+	$("<div></div>").selectable().selectable("destroy").remove();
+	ok(true, ".selectable('destroy') called on disconnected DOMElement");
+
+	var expected = $("<div></div>").selectable(),
+		actual = expected.selectable("destroy");
+	equal(actual, expected, "destroy is chainable");
+});
+
+test("enable", function() {
+	expect(3);
+	var expected, actual,
+		fired = false,
+		el = $("#selectable1");
+
+	el.selectable({
+		disabled: true,
+		start: function() { fired = true; }
+	});
+	el.simulate( "drag", {
+		dx: 20,
+		dy: 20
+	});
+	equal(fired, false, "start fired");
+	el.selectable("enable");
+	el.simulate( "drag", {
+		dx: 20,
+		dy: 20
+	});
+	equal(fired, true, "start fired");
+	el.selectable("destroy");
+
+	expected = $("<div></div>").selectable();
+	actual = expected.selectable("enable");
+	equal(actual, expected, "enable is chainable");
+});
+
+test( "disable", function( assert ) {
+	expect( 6 );
+	var chainable,
+		fired = false,
+		element = $( "#selectable1" );
+
+	element.selectable({
+		disabled: false,
+		start: function() {
+			fired = true;
+		}
+	});
+	element.simulate( "drag", {
+		dx: 20,
+		dy: 20
+	});
+	equal( fired, true, "start fired" );
+
+	chainable = element.selectable( "disable" );
+	fired = false;
+
+	element.simulate( "drag", {
+		dx: 20,
+		dy: 20
+	});
+	equal( fired, false, "start fired" );
+
+	assert.lacksClasses( element.selectable( "widget" ), "ui-state-disabled" );
+
+	ok( !element.selectable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
+	assert.hasClasses( element.selectable( "widget" ), "ui-selectable-disabled" );
+
+	element.selectable( "destroy" );
+
+	equal( chainable, element, "disable is chainable" );
+});
+
+} );
diff --git a/tests/unit/selectable/options.js b/tests/unit/selectable/options.js
new file mode 100644
index 000000000..cdbfb4aab
--- /dev/null
+++ b/tests/unit/selectable/options.js
@@ -0,0 +1,64 @@
+define( [
+	"jquery",
+	"ui/selectable"
+], function( $ ) {
+
+module("selectable: options");
+
+test("autoRefresh", function() {
+	expect(3);
+
+	var actual = 0,
+		el = $("#selectable1"),
+		sel = $("*", el),
+		selected = function() { actual += 1; };
+
+	el = $("#selectable1").selectable({ autoRefresh: false,	selected: selected });
+	sel.hide();
+	el.simulate( "drag", {
+		dx: 1000,
+		dy: 1000
+	});
+	equal(actual, sel.length);
+	el.selectable("destroy");
+
+	actual = 0;
+	sel.show();
+	el = $("#selectable1").selectable({ autoRefresh: true,	selected: selected });
+	sel.hide();
+	el.simulate( "drag", {
+		dx: 1000,
+		dy: 1000
+	});
+	equal(actual, 0);
+
+	sel.show();
+	$( sel[ 0 ] ).simulate( "drag", {
+		dx: 1000,
+		dy: 1000
+	});
+	equal(actual, sel.length);
+
+	el.selectable("destroy");
+	sel.show();
+});
+
+test("filter", function() {
+	expect(2);
+
+	var actual =0,
+		el = $("#selectable1"),
+		sel = $("*", el),
+		selected = function() { actual += 1; };
+
+	el = $("#selectable1").selectable({ filter: ".special", selected: selected });
+	el.simulate( "drag", {
+		dx: 1000,
+		dy: 1000
+	});
+	ok(sel.length !== 1, "this test assumes more than 1 selectee");
+	equal(actual, 1);
+	el.selectable("destroy");
+});
+
+} );
diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js
deleted file mode 100644
index 9a14e6df5..000000000
--- a/tests/unit/selectable/selectable_common.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define( [
-	"lib/common",
-	"ui/selectable"
-], function( common ) {
-
-common.testWidget( "selectable", {
-	defaults: {
-		appendTo: "body",
-		autoRefresh: true,
-		cancel: "input, textarea, button, select, option",
-		classes: {},
-		delay: 0,
-		disabled: false,
-		distance: 0,
-		filter: "*",
-		tolerance: "touch",
-
-		// callbacks
-		create: null,
-		selected: null,
-		selecting: null,
-		start: null,
-		stop: null,
-		unselected: null,
-		unselecting: null
-	}
-});
-
-} );
diff --git a/tests/unit/selectable/selectable_core.js b/tests/unit/selectable/selectable_core.js
deleted file mode 100644
index c3ace5370..000000000
--- a/tests/unit/selectable/selectable_core.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- * selectable_core.js
- */
diff --git a/tests/unit/selectable/selectable_events.js b/tests/unit/selectable/selectable_events.js
deleted file mode 100644
index 6eb99f325..000000000
--- a/tests/unit/selectable/selectable_events.js
+++ /dev/null
@@ -1,63 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper",
-	"ui/selectable"
-], function( $, testHelpers ) {
-
-module("selectable: events");
-
-test( "start", function() {
-	expect( 2 );
-	var el = $("#selectable1");
-	el.selectable({
-		start: function() {
-			ok( true, "drag fired start callback" );
-			equal( this, el[0], "context of callback" );
-		}
-	});
-	el.simulate( "drag", {
-		dx: 20,
-		dy: 20
-	});
-});
-
-test( "stop", function() {
-	expect( 2 );
-	var el = $("#selectable1");
-	el.selectable({
-		start: function() {
-			ok( true, "drag fired stop callback" );
-			equal( this, el[0], "context of callback" );
-		}
-	});
-	el.simulate( "drag", {
-		dx: 20,
-		dy: 20
-	});
-});
-
-test( "mousedown: initial position of helper", function() {
-	expect( 2 );
-
-	var helperOffset,
-		element = $( "#selectable1" ).selectable(),
-		contentToForceScroll = testHelpers.forceScrollableWindow( "body" );
-
-	$( window ).scrollTop( 100 ).scrollLeft( 100 );
-
-	element.simulate( "mousedown", {
-		clientX: 10,
-		clientY: 10
-	});
-
-	helperOffset = $( ".ui-selectable-helper" ).offset();
-	ok( helperOffset.top, 110, "Scroll top should be accounted for." );
-	ok( helperOffset.left, 110, "Scroll left should be accounted for." );
-
-	// Cleanup
-	element.simulate( "mouseup" );
-	contentToForceScroll.remove();
-	$( window ).scrollTop( 0 ).scrollLeft( 0 );
-});
-
-} );
diff --git a/tests/unit/selectable/selectable_methods.js b/tests/unit/selectable/selectable_methods.js
deleted file mode 100644
index 045809670..000000000
--- a/tests/unit/selectable/selectable_methods.js
+++ /dev/null
@@ -1,111 +0,0 @@
-define( [
-	"jquery",
-	"ui/selectable"
-], function( $ ) {
-
-module("selectable: methods");
-
-test("init", function() {
-	expect( 5 );
-
-	$("<div></div>").appendTo("body").selectable().remove();
-	ok(true, ".selectable() called on element");
-
-	$([]).selectable().remove();
-	ok(true, ".selectable() called on empty collection");
-
-	$("<div></div>").selectable().remove();
-	ok(true, ".selectable() called on disconnected DOMElement");
-
-	var el = $("<div></div>").selectable();
-	el.selectable("option", "foo");
-	el.remove();
-	ok(true, "arbitrary option getter after init");
-
-	$("<div></div>").selectable().selectable("option", "foo", "bar").remove();
-	ok(true, "arbitrary option setter after init");
-});
-
-test("destroy", function() {
-	expect( 4 );
-
-	$("<div></div>").appendTo("body").selectable().selectable("destroy").remove();
-	ok(true, ".selectable('destroy') called on element");
-
-	$([]).selectable().selectable("destroy").remove();
-	ok(true, ".selectable('destroy') called on empty collection");
-
-	$("<div></div>").selectable().selectable("destroy").remove();
-	ok(true, ".selectable('destroy') called on disconnected DOMElement");
-
-	var expected = $("<div></div>").selectable(),
-		actual = expected.selectable("destroy");
-	equal(actual, expected, "destroy is chainable");
-});
-
-test("enable", function() {
-	expect(3);
-	var expected, actual,
-		fired = false,
-		el = $("#selectable1");
-
-	el.selectable({
-		disabled: true,
-		start: function() { fired = true; }
-	});
-	el.simulate( "drag", {
-		dx: 20,
-		dy: 20
-	});
-	equal(fired, false, "start fired");
-	el.selectable("enable");
-	el.simulate( "drag", {
-		dx: 20,
-		dy: 20
-	});
-	equal(fired, true, "start fired");
-	el.selectable("destroy");
-
-	expected = $("<div></div>").selectable();
-	actual = expected.selectable("enable");
-	equal(actual, expected, "enable is chainable");
-});
-
-test( "disable", function( assert ) {
-	expect( 6 );
-	var chainable,
-		fired = false,
-		element = $( "#selectable1" );
-
-	element.selectable({
-		disabled: false,
-		start: function() {
-			fired = true;
-		}
-	});
-	element.simulate( "drag", {
-		dx: 20,
-		dy: 20
-	});
-	equal( fired, true, "start fired" );
-
-	chainable = element.selectable( "disable" );
-	fired = false;
-
-	element.simulate( "drag", {
-		dx: 20,
-		dy: 20
-	});
-	equal( fired, false, "start fired" );
-
-	assert.lacksClasses( element.selectable( "widget" ), "ui-state-disabled" );
-
-	ok( !element.selectable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
-	assert.hasClasses( element.selectable( "widget" ), "ui-selectable-disabled" );
-
-	element.selectable( "destroy" );
-
-	equal( chainable, element, "disable is chainable" );
-});
-
-} );
diff --git a/tests/unit/selectable/selectable_options.js b/tests/unit/selectable/selectable_options.js
deleted file mode 100644
index cdbfb4aab..000000000
--- a/tests/unit/selectable/selectable_options.js
+++ /dev/null
@@ -1,64 +0,0 @@
-define( [
-	"jquery",
-	"ui/selectable"
-], function( $ ) {
-
-module("selectable: options");
-
-test("autoRefresh", function() {
-	expect(3);
-
-	var actual = 0,
-		el = $("#selectable1"),
-		sel = $("*", el),
-		selected = function() { actual += 1; };
-
-	el = $("#selectable1").selectable({ autoRefresh: false,	selected: selected });
-	sel.hide();
-	el.simulate( "drag", {
-		dx: 1000,
-		dy: 1000
-	});
-	equal(actual, sel.length);
-	el.selectable("destroy");
-
-	actual = 0;
-	sel.show();
-	el = $("#selectable1").selectable({ autoRefresh: true,	selected: selected });
-	sel.hide();
-	el.simulate( "drag", {
-		dx: 1000,
-		dy: 1000
-	});
-	equal(actual, 0);
-
-	sel.show();
-	$( sel[ 0 ] ).simulate( "drag", {
-		dx: 1000,
-		dy: 1000
-	});
-	equal(actual, sel.length);
-
-	el.selectable("destroy");
-	sel.show();
-});
-
-test("filter", function() {
-	expect(2);
-
-	var actual =0,
-		el = $("#selectable1"),
-		sel = $("*", el),
-		selected = function() { actual += 1; };
-
-	el = $("#selectable1").selectable({ filter: ".special", selected: selected });
-	el.simulate( "drag", {
-		dx: 1000,
-		dy: 1000
-	});
-	ok(sel.length !== 1, "this test assumes more than 1 selectee");
-	equal(actual, 1);
-	el.selectable("destroy");
-});
-
-} );
diff --git a/tests/unit/selectmenu/common.js b/tests/unit/selectmenu/common.js
new file mode 100644
index 000000000..b24b8dace
--- /dev/null
+++ b/tests/unit/selectmenu/common.js
@@ -0,0 +1,34 @@
+define( [
+	"lib/common",
+	"ui/selectmenu"
+], function( common ) {
+
+common.testWidget( "selectmenu", {
+	defaults: {
+		appendTo: null,
+		classes: {
+			"ui-selectmenu-button-open": "ui-corner-top",
+			"ui-selectmenu-button-closed": "ui-corner-all"
+		},
+		disabled: null,
+		icons: {
+			button: "ui-icon-triangle-1-s"
+		},
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		width: false,
+
+		// callbacks
+		change: null,
+		close: null,
+		create: null,
+		focus: null,
+		open: null,
+		select: null
+	}
+});
+
+} );
diff --git a/tests/unit/selectmenu/core.js b/tests/unit/selectmenu/core.js
new file mode 100644
index 000000000..e5807817e
--- /dev/null
+++ b/tests/unit/selectmenu/core.js
@@ -0,0 +1,332 @@
+define( [
+	"jquery",
+	"ui/selectmenu"
+], function( $ ) {
+
+module( "selectmenu: core" );
+
+test( "markup structure", function( assert ) {
+	expect( 4 );
+
+	var element = $( "#files" ).selectmenu(),
+		button = element.selectmenu( "widget" ),
+		menu = element.selectmenu( "menuWidget" ),
+		menuWrap = menu.parent();
+
+	assert.hasClasses( button,
+		"ui-selectmenu-button ui-selectmenu-button-closed ui-widget" );
+	assert.lacksClasses( button, "ui-selectmenu-button-open" );
+	assert.hasClasses( menuWrap, "ui-selectmenu-menu" );
+	assert.lacksClasses( menuWrap, "ui-selectmenu-menu-open" );
+});
+
+asyncTest( "accessibility", function() {
+	var wrappers, button, menu,
+		element = $( "#speed" ).attr( "title", "A demo title" );
+
+	element.find( "option" ).each(function( index ) {
+		$( this ).attr( "title", "A demo title #" + index );
+	});
+
+	element.selectmenu();
+	button = element.selectmenu( "widget" );
+	menu = element.selectmenu( "menuWidget" );
+
+	button.simulate( "focus" );
+	wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
+
+	expect( 13 + wrappers.length * 3 );
+
+	setTimeout(function() {
+		equal( button.attr( "role" ), "combobox", "button role" );
+		equal( button.attr( "aria-haspopup" ), "true", "button aria-haspopup" );
+		equal( button.attr( "aria-expanded" ), "false", "button aria-expanded" );
+		equal( button.attr( "aria-autocomplete" ), "list", "button aria-autocomplete" );
+		equal( button.attr( "aria-owns" ), menu.attr( "id" ), "button aria-owns" );
+		equal(
+			button.attr( "aria-labelledby" ),
+			wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
+			"button link aria-labelledby"
+		);
+		equal( button.attr( "tabindex" ), 0, "button link tabindex" );
+		equal( button.attr( "title" ), "A demo title", "button title" );
+
+		equal( menu.attr( "role" ), "listbox", "menu role" );
+		equal( menu.attr( "aria-labelledby" ), button.attr( "id" ), "menu aria-labelledby" );
+		equal( menu.attr( "aria-hidden" ), "true", "menu aria-hidden" );
+		equal( menu.attr( "tabindex" ), 0, "menu tabindex" );
+		equal(
+			menu.attr( "aria-activedescendant" ),
+			wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
+			"menu aria-activedescendant"
+		);
+		$.each( wrappers, function( index ) {
+			var item = $( this );
+			equal( item.attr( "role" ), "option", "menu item #" + index +" role" );
+			equal( item.attr( "tabindex" ), -1, "menu item #" + index +" tabindex" );
+			equal( item.attr( "title" ), "A demo title #" + index, "menu item #" + index + " title" );
+		});
+		start();
+	});
+});
+
+test( "_renderButtonItem()", function() {
+	expect( 2 );
+
+	var option,
+		element = $( "#speed" ).selectmenu(),
+		instance = element.selectmenu( "instance" ),
+		button = element.selectmenu( "widget" ),
+		menu = element.selectmenu( "menuWidget" );
+
+	instance._renderButtonItem = function( item ) {
+		var buttonItem = $( "<span>" );
+		this._setText( buttonItem, item.label + item.index );
+
+		return buttonItem;
+	};
+
+	element.selectmenu( "refresh" );
+	option = element.find( "option:selected" );
+	equal(
+		option.text() + element[ 0 ].selectedIndex,
+		button.text(),
+		"refresh: button item text"
+	);
+
+	button.trigger( "click" );
+	menu.find( "li" ).last().simulate( "mouseover" ).trigger( "click" );
+	option = element.find( "option" ).last();
+	equal(
+		option.text() + element[ 0 ].selectedIndex,
+		button.text(),
+		"click: button item text"
+	);
+});
+
+$.each([
+	{
+		type: "default",
+		selector: "#speed"
+	},
+	{
+		type: "optgroups",
+		selector: "#files"
+	}
+], function( i, settings ) {
+	asyncTest( "state synchronization - after keydown on button - " + settings.type, function() {
+		expect( 4 );
+
+		var wrappers,
+			element = $( settings.selector ).selectmenu(),
+			button = element.selectmenu( "widget" ),
+			menu = element.selectmenu( "menuWidget" ),
+
+			// Get the option after the currently selected option because
+			// we simulate pressing DOWN.
+			selected = element.find( "option:selected" ).next();
+
+		button.simulate( "focus" );
+		setTimeout(function() {
+			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
+
+			button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+			equal(
+				menu.attr( "aria-activedescendant" ),
+				wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
+				"menu aria-activedescendant"
+			);
+			equal(
+				button.attr( "aria-activedescendant" ),
+				wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
+				"button aria-activedescendant"
+			);
+			equal(
+				element.find( "option:selected" ).val(),
+				selected.val() ,
+				"original select state"
+			);
+			equal( button.text(), selected.text(), "button text" );
+			start();
+		});
+	});
+
+	asyncTest( "state synchronization - after click on item - " + settings.type, function() {
+		expect( 4 );
+
+		var wrappers,
+			element = $( settings.selector ).selectmenu(),
+			button = element.selectmenu( "widget" ),
+			menu = element.selectmenu( "menuWidget" ),
+			selected = element.find( "option" ).last();
+
+		button.simulate( "focus" );
+		setTimeout(function() {
+			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
+
+			button.trigger( "click" );
+			menu.find( "li" ).last().simulate( "mouseover" ).trigger( "click" );
+			equal(
+				menu.attr( "aria-activedescendant" ),
+				wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
+				"menu aria-activedescendant"
+			);
+			equal(
+				button.attr( "aria-activedescendant" ),
+				wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
+				"button aria-activedescendant"
+			);
+			equal(
+				element.find( "option:selected" ).val(),
+				selected.val(),
+				"original select state"
+			);
+			equal( button.text(), selected.text(), "button text" );
+			start();
+		}, 1 );
+	});
+
+	asyncTest( "state synchronization - " +
+			"after focus item and keydown on button - " + settings.type, function() {
+		expect( 4 );
+
+		var wrappers,
+			element = $( settings.selector ).selectmenu(),
+			button = element.selectmenu( "widget" ),
+			menu = element.selectmenu( "menuWidget" ),
+			options = element.find( "option" );
+
+		// Init menu
+		button.simulate( "focus" );
+
+		setTimeout(function() {
+			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
+
+			// Open menu and click first item
+			button.trigger( "click" );
+			wrappers.first().simulate( "mouseover" ).trigger( "click" );
+
+			// Open menu again and hover item
+			button.trigger( "click" );
+			wrappers.eq( 3 ).simulate( "mouseover" );
+
+			// Close and use keyboard control on button
+			button.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+			button.simulate( "focus" );
+			setTimeout(function() {
+				button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+
+				equal( menu.attr( "aria-activedescendant" ), wrappers.eq( 1 ).attr( "id" ),
+					"menu aria-activedescendant" );
+				equal( button.attr( "aria-activedescendant" ), wrappers.eq( 1 ).attr( "id" ),
+					"button aria-activedescendant" );
+				equal( element.find( "option:selected" ).val(), options.eq( 1 ).val() ,
+					"original select state" );
+				equal( button.text(), options.eq( 1 ).text(), "button text" );
+				start();
+			});
+		});
+	});
+
+	asyncTest( "item looping - " + settings.type, function() {
+		expect( 4 );
+
+		var wrappers,
+			element = $( settings.selector ).selectmenu(),
+			button = element.selectmenu( "widget" ),
+			menu = element.selectmenu( "menuWidget" );
+
+		button.simulate( "focus" );
+		setTimeout(function() {
+			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
+
+			button.trigger( "click" );
+			wrappers.first().simulate( "mouseover" ).trigger( "click" );
+			equal( element[ 0 ].selectedIndex, 0, "First item is selected" );
+			button.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+			equal( element[ 0 ].selectedIndex, 0, "No looping beyond first item" );
+
+			button.trigger( "click" );
+			wrappers.last().simulate( "mouseover" ).trigger( "click" );
+			equal( element[ 0 ].selectedIndex, wrappers.length - 1, "Last item is selected" );
+			button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+			equal( element[ 0 ].selectedIndex, wrappers.length - 1, "No looping behind last item" );
+			start();
+		});
+	});
+
+	asyncTest( "item focus and active state - " + settings.type, function() {
+		expect( 4 );
+
+		var wrappers, focusedItem,
+			element = $( settings.selector ).selectmenu(),
+			button = element.selectmenu( "widget" ),
+			menu = element.selectmenu( "menuWidget" );
+
+		button.simulate( "focus" );
+		setTimeout(function() {
+			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
+
+			button.trigger( "click" );
+			setTimeout(function() {
+				checkItemClasses();
+
+				wrappers.eq( 3 ).simulate( "mouseover" ).trigger( "click" );
+
+				button.trigger( "click" );
+				wrappers.eq( 2 ).simulate( "mouseover" );
+				$( document ).trigger( "click" );
+
+				button.trigger( "click" );
+				wrappers.eq( 1 ).simulate( "mouseover" );
+				$( document ).trigger( "click" );
+
+				button.trigger( "click" );
+				setTimeout(function() {
+					checkItemClasses();
+					start();
+				});
+			});
+		});
+
+		function checkItemClasses() {
+			focusedItem = menu.find( ".ui-menu-item-wrapper.ui-state-active" );
+			equal( focusedItem.length, 1, "only one item has ui-state-focus class" );
+			equal( focusedItem.attr( "id" ), wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
+				"selected item has ui-state-focus class" );
+		}
+	});
+
+	asyncTest( "empty option - " + settings.type, function( assert ) {
+		expect( 7 );
+
+		var button, menu, wrappers, wrapper,
+			element = $( settings.selector );
+
+		element.find( "option" ).first().text( "" );
+		element.selectmenu();
+		button = element.selectmenu( "widget" );
+		menu = element.selectmenu( "menuWidget" );
+
+		button.simulate( "focus" );
+		setTimeout(function() {
+			wrappers = menu.find( "li:not(.ui-selectmenu-optgroup) .ui-menu-item-wrapper" );
+			wrapper = wrappers.first();
+
+			button.trigger( "click" );
+
+			equal( wrappers.length, element.find( "option" ).length,
+				"correct amount of list elements" );
+			ok( wrapper.outerHeight() > 10, "empty item seems to have reasonable height" );
+			ok( wrapper.attr( "id" ), "empty item has id attribute" );
+			assert.hasClasses( wrapper.parent(), "ui-menu-item" );
+			assert.lacksClasses( wrapper, "ui-menu-divider" );
+			equal( wrapper.attr( "tabindex" ), -1, "empty item has tabindex" );
+			equal( wrapper.attr( "role" ), "option", "empty item has role option" );
+
+			start();
+		});
+	});
+});
+
+} );
diff --git a/tests/unit/selectmenu/events.js b/tests/unit/selectmenu/events.js
new file mode 100644
index 000000000..d5c463fa9
--- /dev/null
+++ b/tests/unit/selectmenu/events.js
@@ -0,0 +1,136 @@
+define( [
+	"jquery",
+	"ui/selectmenu"
+], function( $ ) {
+
+module( "selectmenu: events", {
+	setup: function() {
+		this.element = $( "#speed" );
+	}
+});
+
+asyncTest( "change", function() {
+	expect( 3 );
+
+	var button, menu, options,
+		optionIndex = 1;
+
+	this.element.selectmenu({
+		change: function ( event, ui ) {
+			equal( ui.item.index, optionIndex, "ui.item.index contains correct option index" );
+			equal( ui.item.element[ 0 ], options.eq( optionIndex )[ 0 ],
+				"ui.item.element contains original option element" );
+			equal( ui.item.value, options.eq( optionIndex ).text(),
+				"ui.item.value property updated correctly" );
+		}
+	});
+
+	button = this.element.selectmenu( "widget" );
+	menu = this.element.selectmenu( "menuWidget" );
+	options = this.element.find( "option" );
+
+	button.simulate( "focus" );
+
+	setTimeout(function() {
+		button.trigger( "click" );
+		menu.find( "li" ).eq( optionIndex ).simulate( "mouseover" ).trigger( "click" );
+		start();
+	});
+});
+
+test( "close", function() {
+	expect( 2 );
+
+	var shouldFire;
+
+	this.element.selectmenu({
+		close: function() {
+			ok( shouldFire, "close event fired on close" );
+		}
+	});
+
+	shouldFire = false;
+	this.element.selectmenu( "open" );
+	shouldFire = true;
+	this.element.selectmenu( "close" );
+	shouldFire = false;
+	this.element.selectmenu( "open" );
+	shouldFire = true;
+	$( "body" ).trigger( "mousedown" );
+});
+
+asyncTest( "focus", function() {
+	expect( 9 );
+
+	var button, menu, links,
+		that = this,
+		optionIndex = this.element[ 0 ].selectedIndex + 1,
+		options = this.element.find( "option" );
+
+	this.element.selectmenu({
+		focus: function( event, ui ) {
+			ok( true, "focus event fired on element #" + optionIndex + " mouseover" );
+			equal( ui.item.index, optionIndex, "ui.item.index contains correct option index" );
+			equal( ui.item.element[ 0 ], options.eq( optionIndex )[ 0 ],
+				"ui.item.element contains original option element" );
+		}
+	});
+
+	button = this.element.selectmenu( "widget" );
+	menu = this.element.selectmenu( "menuWidget" );
+
+	button.simulate( "focus" );
+	setTimeout(function() {
+		button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+
+		button.trigger( "click" );
+		links = menu.find( "li.ui-menu-item" );
+		optionIndex = 0;
+		links.eq( optionIndex ).simulate( "mouseover" );
+		optionIndex += 1;
+		links.eq( optionIndex ).simulate( "mouseover" );
+
+		// This tests for unwanted, additional focus event on close
+		that.element.selectmenu( "close" );
+		start();
+	});
+});
+
+test( "open", function() {
+	expect( 1 );
+
+	this.element.selectmenu({
+		open: function() {
+			ok( true, "open event fired on open" );
+		}
+	});
+
+	this.element.selectmenu( "open" );
+});
+
+asyncTest( "select", function() {
+	expect( 3 );
+
+	this.element.selectmenu({
+		select: function( event, ui ) {
+			ok( true, "select event fired on item select" );
+			equal( ui.item.index, optionIndex, "ui.item.index contains correct option index" );
+			equal( ui.item.element[ 0 ], options.eq( optionIndex )[ 0 ],
+				"ui.item.element contains original option element" );
+		}
+	});
+
+	var button = this.element.selectmenu( "widget" ),
+		menu = this.element.selectmenu( "menuWidget" ),
+		options = this.element.find( "option" ),
+		optionIndex = 1;
+
+	button.simulate( "focus" );
+	setTimeout(function() {
+		button.trigger( "click" );
+		menu.find( "li" ).eq( optionIndex ).simulate( "mouseover" ).trigger( "click" );
+		start();
+	});
+});
+
+} );
diff --git a/tests/unit/selectmenu/methods.js b/tests/unit/selectmenu/methods.js
new file mode 100644
index 000000000..8481e804e
--- /dev/null
+++ b/tests/unit/selectmenu/methods.js
@@ -0,0 +1,189 @@
+define( [
+	"jquery",
+	"ui/selectmenu"
+], function( $ ) {
+
+module( "selectmenu: methods" );
+
+test( "destroy", function( assert ) {
+	expect( 1 );
+	assert.domEqual( "#speed", function() {
+		$( "#speed" ).selectmenu().selectmenu( "destroy" );
+	});
+});
+
+test( "open / close", function() {
+	expect( 5 );
+
+	var element = $( "#speed" ).selectmenu(),
+		menu = element.selectmenu( "menuWidget" );
+
+	ok( menu.is( ":hidden" ), "menu hidden on init" );
+
+	element.selectmenu( "open" );
+	ok( menu.is( ":visible" ), "open: menu visible" );
+	equal( menu.attr( "aria-hidden" ), "false", "open: menu aria-disabled" );
+
+	element.selectmenu( "close" );
+	ok( menu.is( ":hidden" ), "close: menu hidden" );
+	equal( menu.attr( "aria-hidden" ), "true", "close: menu aria-disabled" );
+});
+
+test( "enable / disable", function() {
+	expect( 10 );
+
+	var element = $( "#speed" ).selectmenu(),
+		button = element.selectmenu( "widget" ),
+		menu = element.selectmenu( "menuWidget" );
+
+	element.selectmenu( "disable" );
+	ok( element.selectmenu( "option", "disabled" ), "disable: widget option" );
+	equal( element.attr( "disabled" ), "disabled", "disable: native select disabled" );
+	equal( button.attr( "aria-disabled" ), "true", "disable: button ARIA" );
+	equal( button.attr( "tabindex" ), -1, "disable: button tabindex" );
+	equal( menu.attr( "aria-disabled" ), "true", "disable: menu ARIA" );
+
+	element.selectmenu( "enable" );
+	ok( !element.selectmenu( "option", "disabled" ), "enable: widget option" );
+	equal( element.attr( "disabled" ), undefined, "enable: native select disabled" );
+	equal( button.attr( "aria-disabled" ), "false", "enable: button ARIA" );
+	equal( button.attr( "tabindex" ), 0, "enable: button tabindex" );
+	equal( menu.attr( "aria-disabled" ), "false", "enable: menu ARIA" );
+});
+
+test( "refresh - structure", function() {
+	expect( 3 );
+
+	var menuItems,
+		element = $( "#speed" ).selectmenu(),
+		menu = element.selectmenu( "menuWidget" ),
+		options = element.find( "option" );
+
+	options.eq( 0 )
+		.attr( "value", "changed_value" )
+		.text( "Changed value" );
+	options.eq( 2 ).remove();
+	options.eq( 3 ).remove();
+	element.append( "<option value=\"added_option\">Added option</option>" );
+	element.selectmenu( "refresh" );
+
+	options = element.find( "option" );
+	menuItems = menu.find( "li" ).not( ".ui-selectmenu-optgroup" );
+
+	equal( options.length, menuItems.length, "menu item length" );
+	equal( "Added option", menuItems.last().text(), "added item" );
+	equal( "Changed value", menuItems.eq( 0 ).text(), "changed item" );
+});
+
+asyncTest( "refresh - change selected option", function() {
+	expect( 4 );
+
+	var element = $( "#speed" ).selectmenu(),
+		button = element.selectmenu( "widget" );
+
+	equal( element.find( "option:selected" ).text(), button.text(), "button text after init" );
+
+	button.simulate( "focus" );
+	setTimeout(function() {
+		equal( element.find( "option:selected" ).text(), button.text(), "button text after focus" );
+
+		element[ 0 ].selectedIndex = 0;
+		element.selectmenu( "refresh" );
+		equal( element.find( "option:selected" ).text(), button.text(),
+			"button text after changing selected option" );
+
+		element.find( "option" ).prop( "selected", false );
+		element.append( "<option selected value=\"selected_option\">Selected option</option>" );
+		element.selectmenu( "refresh" );
+		equal( "Selected option", button.text(), "button text after adding selected option" );
+
+		start();
+	});
+});
+
+test( "refresh - disabled select", function() {
+	expect( 4 );
+
+	var element = $( "#speed" ).selectmenu(),
+		button = element.selectmenu( "widget" ),
+		menu = element.selectmenu( "menuWidget" );
+
+	element.prop( "disabled", true );
+	element.selectmenu( "refresh" );
+
+	ok( element.selectmenu( "option", "disabled" ), "widget option" );
+	equal( button.attr( "aria-disabled" ), "true", "button ARIA" );
+	equal( button.attr( "tabindex" ), -1, "button tabindex" );
+	equal( menu.attr( "aria-disabled" ), "true", "menu ARIA" );
+});
+
+test( "refresh - disabled option", function( assert ) {
+	expect( 1 );
+
+	var disabledItem,
+		element = $( "#speed" ).selectmenu(),
+		menu = element.selectmenu( "menuWidget" ).parent();
+
+	element.find( "option" ).eq( 2 ).prop( "disabled", true );
+	element.selectmenu( "refresh" );
+
+	disabledItem = menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).eq( 2 );
+	assert.hasClasses( disabledItem, "ui-state-disabled" );
+});
+
+test( "refresh - disabled optgroup", function( assert ) {
+	var i, item,
+		element = $( "#files" ).selectmenu(),
+		menu = element.selectmenu( "menuWidget" ).parent(),
+		originalDisabledOptgroup = element.find( "optgroup" ).first(),
+		originalDisabledOptions = originalDisabledOptgroup.find( "option" );
+
+	expect( 2 + originalDisabledOptions.length );
+
+	originalDisabledOptgroup.prop( "disabled", true );
+	element.selectmenu( "refresh" );
+
+	item = menu.find( "li.ui-selectmenu-optgroup" ).first();
+
+	assert.hasClasses( item, "ui-state-disabled" );
+
+	equal(
+		menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).filter( ".ui-state-disabled" ).length,
+		originalDisabledOptions.length,
+		"disabled options"
+	);
+	for ( i = 0; i < originalDisabledOptions.length; i++ ) {
+		item = item.next( "li" );
+		assert.hasClasses( item, "ui-state-disabled" );
+	}
+});
+
+test( "refresh - remove all options", function() {
+	expect( 2 );
+
+	var element = $( "#speed" ).selectmenu(),
+		button = element.selectmenu( "widget" ),
+		menu = element.selectmenu( "menuWidget" );
+
+	element.children().remove();
+	element.selectmenu( "refresh" );
+	equal( button.find( ".ui-selectmenu-text" ).html(), $( "<span>&#160;</span>" ).html(),
+		"Empty button text" );
+	equal( menu.children().length, 0, "Empty menu" );
+});
+
+test( "widget and menuWidget", function( assert ) {
+	expect( 4 );
+
+	var element = $( "#speed" ).selectmenu(),
+		button = element.selectmenu( "widget" ),
+		menu = element.selectmenu( "menuWidget" );
+
+	equal( button.length, 1, "button: one element" );
+	assert.hasClasses( button, "ui-selectmenu-button" );
+
+	equal( menu.length, 1, "Menu Widget: one element" );
+	ok( menu.is( "ul.ui-menu" ), "Menu Widget: element and class" );
+});
+
+} );
diff --git a/tests/unit/selectmenu/options.js b/tests/unit/selectmenu/options.js
new file mode 100644
index 000000000..deb7a6d3a
--- /dev/null
+++ b/tests/unit/selectmenu/options.js
@@ -0,0 +1,128 @@
+define( [
+	"jquery",
+	"ui/selectmenu"
+], function( $ ) {
+
+module( "selectmenu: options" );
+
+test( "appendTo: null", function() {
+	expect( 1 );
+
+	var element = $( "#speed" ).selectmenu();
+	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], document.body,
+		"defaults to body" );
+});
+
+test( "appendTo: explicit", function() {
+	expect( 6 );
+
+	var detached = $( "<div>" ),
+		element = $( "#speed" );
+
+	element.selectmenu({
+		appendTo: ".selectmenu-wrap"
+	});
+	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ],
+		$( "#selectmenu-wrap1" )[ 0 ], "first found element" );
+	equal( $( "#selectmenu-wrap2 .ui-selectmenu" ).length, 0, "only appends to one element" );
+	element.selectmenu( "destroy" );
+
+	element.selectmenu().selectmenu( "option", "appendTo", "#selectmenu-wrap1" );
+	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ],
+		$( "#selectmenu-wrap1" )[ 0 ], "modified after init" );
+	element.selectmenu( "destroy" );
+
+	element.selectmenu({
+		appendTo: detached
+	});
+	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], detached[ 0 ],
+		"detached jQuery object" );
+	element.selectmenu( "destroy" );
+
+	element.selectmenu({
+		appendTo: detached[ 0 ]
+	});
+	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], detached[ 0 ],
+		"detached DOM element" );
+	element.selectmenu( "destroy" );
+
+	element.selectmenu().selectmenu( "option", "appendTo", detached );
+	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], detached[ 0 ],
+		"detached DOM element via option()" );
+	element.selectmenu( "destroy" );
+});
+
+test( "appendTo: ui-front", function() {
+	expect( 2 );
+
+	var element = $( "#speed" );
+
+	$( "#selectmenu-wrap2" ).addClass( "ui-front" );
+	element.selectmenu();
+	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ],
+		$( "#selectmenu-wrap2" )[ 0 ], "null, inside .ui-front" );
+	element.selectmenu( "destroy" );
+
+	element.selectmenu({
+		appendTo: $()
+	});
+	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ],
+		$( "#selectmenu-wrap2" )[ 0 ], "empty jQuery object, inside .ui-front" );
+});
+
+test( "CSS styles", function( assert ) {
+	expect( 5 );
+
+	var element = $( "#speed" ).selectmenu(),
+		button = element.selectmenu( "widget" ),
+		menu = element.selectmenu( "menuWidget" );
+
+	element.selectmenu( "open" );
+
+	assert.hasClasses( button, "ui-corner-top" );
+	assert.lacksClasses( button, "ui-corner-all" );
+	assert.hasClasses( button.find( "span.ui-icon" ), "ui-icon-triangle-1-s" );
+	assert.hasClasses( menu, "ui-corner-bottom" );
+	assert.lacksClasses( button, "ui-corner-all" );
+});
+
+test( "width", function() {
+	expect( 6 );
+
+	var button,
+		element = $( "#speed" );
+
+	element.selectmenu();
+	button = element.selectmenu( "widget" );
+
+	equal( button[ 0 ].style.width, "", "no inline style" );
+
+	element.selectmenu( "option", "width", null );
+	equal( button.outerWidth(), element.outerWidth(), "button width auto" );
+
+	element.outerWidth( 100 );
+	element.selectmenu( "refresh" );
+	equal( button.outerWidth(), 100, "button width set by CSS" );
+
+	element
+		.width( "" )
+		.selectmenu( "option", "width", 100 )
+		.selectmenu( "refresh" );
+	equal( button.outerWidth(), 100, "button width set by JS option" );
+
+	element
+		.append( $( "<option>", { text: "Option with a little longer text" } ) )
+		.selectmenu( "option", "width", null )
+		.selectmenu( "refresh" );
+	equal( button.outerWidth(), element.outerWidth(), "button width with long option" );
+
+	element.parent().outerWidth( 300 );
+	element
+		.selectmenu( "destroy" )
+		.css( "width", "100%" )
+		.selectmenu({ width: null });
+	button = element.selectmenu( "widget" );
+	equal( button.outerWidth(), 300, "button width fills container" );
+});
+
+} );
diff --git a/tests/unit/selectmenu/selectmenu_common.js b/tests/unit/selectmenu/selectmenu_common.js
deleted file mode 100644
index b24b8dace..000000000
--- a/tests/unit/selectmenu/selectmenu_common.js
+++ /dev/null
@@ -1,34 +0,0 @@
-define( [
-	"lib/common",
-	"ui/selectmenu"
-], function( common ) {
-
-common.testWidget( "selectmenu", {
-	defaults: {
-		appendTo: null,
-		classes: {
-			"ui-selectmenu-button-open": "ui-corner-top",
-			"ui-selectmenu-button-closed": "ui-corner-all"
-		},
-		disabled: null,
-		icons: {
-			button: "ui-icon-triangle-1-s"
-		},
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		width: false,
-
-		// callbacks
-		change: null,
-		close: null,
-		create: null,
-		focus: null,
-		open: null,
-		select: null
-	}
-});
-
-} );
diff --git a/tests/unit/selectmenu/selectmenu_core.js b/tests/unit/selectmenu/selectmenu_core.js
deleted file mode 100644
index e5807817e..000000000
--- a/tests/unit/selectmenu/selectmenu_core.js
+++ /dev/null
@@ -1,332 +0,0 @@
-define( [
-	"jquery",
-	"ui/selectmenu"
-], function( $ ) {
-
-module( "selectmenu: core" );
-
-test( "markup structure", function( assert ) {
-	expect( 4 );
-
-	var element = $( "#files" ).selectmenu(),
-		button = element.selectmenu( "widget" ),
-		menu = element.selectmenu( "menuWidget" ),
-		menuWrap = menu.parent();
-
-	assert.hasClasses( button,
-		"ui-selectmenu-button ui-selectmenu-button-closed ui-widget" );
-	assert.lacksClasses( button, "ui-selectmenu-button-open" );
-	assert.hasClasses( menuWrap, "ui-selectmenu-menu" );
-	assert.lacksClasses( menuWrap, "ui-selectmenu-menu-open" );
-});
-
-asyncTest( "accessibility", function() {
-	var wrappers, button, menu,
-		element = $( "#speed" ).attr( "title", "A demo title" );
-
-	element.find( "option" ).each(function( index ) {
-		$( this ).attr( "title", "A demo title #" + index );
-	});
-
-	element.selectmenu();
-	button = element.selectmenu( "widget" );
-	menu = element.selectmenu( "menuWidget" );
-
-	button.simulate( "focus" );
-	wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
-
-	expect( 13 + wrappers.length * 3 );
-
-	setTimeout(function() {
-		equal( button.attr( "role" ), "combobox", "button role" );
-		equal( button.attr( "aria-haspopup" ), "true", "button aria-haspopup" );
-		equal( button.attr( "aria-expanded" ), "false", "button aria-expanded" );
-		equal( button.attr( "aria-autocomplete" ), "list", "button aria-autocomplete" );
-		equal( button.attr( "aria-owns" ), menu.attr( "id" ), "button aria-owns" );
-		equal(
-			button.attr( "aria-labelledby" ),
-			wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
-			"button link aria-labelledby"
-		);
-		equal( button.attr( "tabindex" ), 0, "button link tabindex" );
-		equal( button.attr( "title" ), "A demo title", "button title" );
-
-		equal( menu.attr( "role" ), "listbox", "menu role" );
-		equal( menu.attr( "aria-labelledby" ), button.attr( "id" ), "menu aria-labelledby" );
-		equal( menu.attr( "aria-hidden" ), "true", "menu aria-hidden" );
-		equal( menu.attr( "tabindex" ), 0, "menu tabindex" );
-		equal(
-			menu.attr( "aria-activedescendant" ),
-			wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
-			"menu aria-activedescendant"
-		);
-		$.each( wrappers, function( index ) {
-			var item = $( this );
-			equal( item.attr( "role" ), "option", "menu item #" + index +" role" );
-			equal( item.attr( "tabindex" ), -1, "menu item #" + index +" tabindex" );
-			equal( item.attr( "title" ), "A demo title #" + index, "menu item #" + index + " title" );
-		});
-		start();
-	});
-});
-
-test( "_renderButtonItem()", function() {
-	expect( 2 );
-
-	var option,
-		element = $( "#speed" ).selectmenu(),
-		instance = element.selectmenu( "instance" ),
-		button = element.selectmenu( "widget" ),
-		menu = element.selectmenu( "menuWidget" );
-
-	instance._renderButtonItem = function( item ) {
-		var buttonItem = $( "<span>" );
-		this._setText( buttonItem, item.label + item.index );
-
-		return buttonItem;
-	};
-
-	element.selectmenu( "refresh" );
-	option = element.find( "option:selected" );
-	equal(
-		option.text() + element[ 0 ].selectedIndex,
-		button.text(),
-		"refresh: button item text"
-	);
-
-	button.trigger( "click" );
-	menu.find( "li" ).last().simulate( "mouseover" ).trigger( "click" );
-	option = element.find( "option" ).last();
-	equal(
-		option.text() + element[ 0 ].selectedIndex,
-		button.text(),
-		"click: button item text"
-	);
-});
-
-$.each([
-	{
-		type: "default",
-		selector: "#speed"
-	},
-	{
-		type: "optgroups",
-		selector: "#files"
-	}
-], function( i, settings ) {
-	asyncTest( "state synchronization - after keydown on button - " + settings.type, function() {
-		expect( 4 );
-
-		var wrappers,
-			element = $( settings.selector ).selectmenu(),
-			button = element.selectmenu( "widget" ),
-			menu = element.selectmenu( "menuWidget" ),
-
-			// Get the option after the currently selected option because
-			// we simulate pressing DOWN.
-			selected = element.find( "option:selected" ).next();
-
-		button.simulate( "focus" );
-		setTimeout(function() {
-			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
-
-			button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-			equal(
-				menu.attr( "aria-activedescendant" ),
-				wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
-				"menu aria-activedescendant"
-			);
-			equal(
-				button.attr( "aria-activedescendant" ),
-				wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
-				"button aria-activedescendant"
-			);
-			equal(
-				element.find( "option:selected" ).val(),
-				selected.val() ,
-				"original select state"
-			);
-			equal( button.text(), selected.text(), "button text" );
-			start();
-		});
-	});
-
-	asyncTest( "state synchronization - after click on item - " + settings.type, function() {
-		expect( 4 );
-
-		var wrappers,
-			element = $( settings.selector ).selectmenu(),
-			button = element.selectmenu( "widget" ),
-			menu = element.selectmenu( "menuWidget" ),
-			selected = element.find( "option" ).last();
-
-		button.simulate( "focus" );
-		setTimeout(function() {
-			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
-
-			button.trigger( "click" );
-			menu.find( "li" ).last().simulate( "mouseover" ).trigger( "click" );
-			equal(
-				menu.attr( "aria-activedescendant" ),
-				wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
-				"menu aria-activedescendant"
-			);
-			equal(
-				button.attr( "aria-activedescendant" ),
-				wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
-				"button aria-activedescendant"
-			);
-			equal(
-				element.find( "option:selected" ).val(),
-				selected.val(),
-				"original select state"
-			);
-			equal( button.text(), selected.text(), "button text" );
-			start();
-		}, 1 );
-	});
-
-	asyncTest( "state synchronization - " +
-			"after focus item and keydown on button - " + settings.type, function() {
-		expect( 4 );
-
-		var wrappers,
-			element = $( settings.selector ).selectmenu(),
-			button = element.selectmenu( "widget" ),
-			menu = element.selectmenu( "menuWidget" ),
-			options = element.find( "option" );
-
-		// Init menu
-		button.simulate( "focus" );
-
-		setTimeout(function() {
-			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
-
-			// Open menu and click first item
-			button.trigger( "click" );
-			wrappers.first().simulate( "mouseover" ).trigger( "click" );
-
-			// Open menu again and hover item
-			button.trigger( "click" );
-			wrappers.eq( 3 ).simulate( "mouseover" );
-
-			// Close and use keyboard control on button
-			button.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-			button.simulate( "focus" );
-			setTimeout(function() {
-				button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-
-				equal( menu.attr( "aria-activedescendant" ), wrappers.eq( 1 ).attr( "id" ),
-					"menu aria-activedescendant" );
-				equal( button.attr( "aria-activedescendant" ), wrappers.eq( 1 ).attr( "id" ),
-					"button aria-activedescendant" );
-				equal( element.find( "option:selected" ).val(), options.eq( 1 ).val() ,
-					"original select state" );
-				equal( button.text(), options.eq( 1 ).text(), "button text" );
-				start();
-			});
-		});
-	});
-
-	asyncTest( "item looping - " + settings.type, function() {
-		expect( 4 );
-
-		var wrappers,
-			element = $( settings.selector ).selectmenu(),
-			button = element.selectmenu( "widget" ),
-			menu = element.selectmenu( "menuWidget" );
-
-		button.simulate( "focus" );
-		setTimeout(function() {
-			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
-
-			button.trigger( "click" );
-			wrappers.first().simulate( "mouseover" ).trigger( "click" );
-			equal( element[ 0 ].selectedIndex, 0, "First item is selected" );
-			button.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-			equal( element[ 0 ].selectedIndex, 0, "No looping beyond first item" );
-
-			button.trigger( "click" );
-			wrappers.last().simulate( "mouseover" ).trigger( "click" );
-			equal( element[ 0 ].selectedIndex, wrappers.length - 1, "Last item is selected" );
-			button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-			equal( element[ 0 ].selectedIndex, wrappers.length - 1, "No looping behind last item" );
-			start();
-		});
-	});
-
-	asyncTest( "item focus and active state - " + settings.type, function() {
-		expect( 4 );
-
-		var wrappers, focusedItem,
-			element = $( settings.selector ).selectmenu(),
-			button = element.selectmenu( "widget" ),
-			menu = element.selectmenu( "menuWidget" );
-
-		button.simulate( "focus" );
-		setTimeout(function() {
-			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
-
-			button.trigger( "click" );
-			setTimeout(function() {
-				checkItemClasses();
-
-				wrappers.eq( 3 ).simulate( "mouseover" ).trigger( "click" );
-
-				button.trigger( "click" );
-				wrappers.eq( 2 ).simulate( "mouseover" );
-				$( document ).trigger( "click" );
-
-				button.trigger( "click" );
-				wrappers.eq( 1 ).simulate( "mouseover" );
-				$( document ).trigger( "click" );
-
-				button.trigger( "click" );
-				setTimeout(function() {
-					checkItemClasses();
-					start();
-				});
-			});
-		});
-
-		function checkItemClasses() {
-			focusedItem = menu.find( ".ui-menu-item-wrapper.ui-state-active" );
-			equal( focusedItem.length, 1, "only one item has ui-state-focus class" );
-			equal( focusedItem.attr( "id" ), wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
-				"selected item has ui-state-focus class" );
-		}
-	});
-
-	asyncTest( "empty option - " + settings.type, function( assert ) {
-		expect( 7 );
-
-		var button, menu, wrappers, wrapper,
-			element = $( settings.selector );
-
-		element.find( "option" ).first().text( "" );
-		element.selectmenu();
-		button = element.selectmenu( "widget" );
-		menu = element.selectmenu( "menuWidget" );
-
-		button.simulate( "focus" );
-		setTimeout(function() {
-			wrappers = menu.find( "li:not(.ui-selectmenu-optgroup) .ui-menu-item-wrapper" );
-			wrapper = wrappers.first();
-
-			button.trigger( "click" );
-
-			equal( wrappers.length, element.find( "option" ).length,
-				"correct amount of list elements" );
-			ok( wrapper.outerHeight() > 10, "empty item seems to have reasonable height" );
-			ok( wrapper.attr( "id" ), "empty item has id attribute" );
-			assert.hasClasses( wrapper.parent(), "ui-menu-item" );
-			assert.lacksClasses( wrapper, "ui-menu-divider" );
-			equal( wrapper.attr( "tabindex" ), -1, "empty item has tabindex" );
-			equal( wrapper.attr( "role" ), "option", "empty item has role option" );
-
-			start();
-		});
-	});
-});
-
-} );
diff --git a/tests/unit/selectmenu/selectmenu_events.js b/tests/unit/selectmenu/selectmenu_events.js
deleted file mode 100644
index d5c463fa9..000000000
--- a/tests/unit/selectmenu/selectmenu_events.js
+++ /dev/null
@@ -1,136 +0,0 @@
-define( [
-	"jquery",
-	"ui/selectmenu"
-], function( $ ) {
-
-module( "selectmenu: events", {
-	setup: function() {
-		this.element = $( "#speed" );
-	}
-});
-
-asyncTest( "change", function() {
-	expect( 3 );
-
-	var button, menu, options,
-		optionIndex = 1;
-
-	this.element.selectmenu({
-		change: function ( event, ui ) {
-			equal( ui.item.index, optionIndex, "ui.item.index contains correct option index" );
-			equal( ui.item.element[ 0 ], options.eq( optionIndex )[ 0 ],
-				"ui.item.element contains original option element" );
-			equal( ui.item.value, options.eq( optionIndex ).text(),
-				"ui.item.value property updated correctly" );
-		}
-	});
-
-	button = this.element.selectmenu( "widget" );
-	menu = this.element.selectmenu( "menuWidget" );
-	options = this.element.find( "option" );
-
-	button.simulate( "focus" );
-
-	setTimeout(function() {
-		button.trigger( "click" );
-		menu.find( "li" ).eq( optionIndex ).simulate( "mouseover" ).trigger( "click" );
-		start();
-	});
-});
-
-test( "close", function() {
-	expect( 2 );
-
-	var shouldFire;
-
-	this.element.selectmenu({
-		close: function() {
-			ok( shouldFire, "close event fired on close" );
-		}
-	});
-
-	shouldFire = false;
-	this.element.selectmenu( "open" );
-	shouldFire = true;
-	this.element.selectmenu( "close" );
-	shouldFire = false;
-	this.element.selectmenu( "open" );
-	shouldFire = true;
-	$( "body" ).trigger( "mousedown" );
-});
-
-asyncTest( "focus", function() {
-	expect( 9 );
-
-	var button, menu, links,
-		that = this,
-		optionIndex = this.element[ 0 ].selectedIndex + 1,
-		options = this.element.find( "option" );
-
-	this.element.selectmenu({
-		focus: function( event, ui ) {
-			ok( true, "focus event fired on element #" + optionIndex + " mouseover" );
-			equal( ui.item.index, optionIndex, "ui.item.index contains correct option index" );
-			equal( ui.item.element[ 0 ], options.eq( optionIndex )[ 0 ],
-				"ui.item.element contains original option element" );
-		}
-	});
-
-	button = this.element.selectmenu( "widget" );
-	menu = this.element.selectmenu( "menuWidget" );
-
-	button.simulate( "focus" );
-	setTimeout(function() {
-		button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-
-		button.trigger( "click" );
-		links = menu.find( "li.ui-menu-item" );
-		optionIndex = 0;
-		links.eq( optionIndex ).simulate( "mouseover" );
-		optionIndex += 1;
-		links.eq( optionIndex ).simulate( "mouseover" );
-
-		// This tests for unwanted, additional focus event on close
-		that.element.selectmenu( "close" );
-		start();
-	});
-});
-
-test( "open", function() {
-	expect( 1 );
-
-	this.element.selectmenu({
-		open: function() {
-			ok( true, "open event fired on open" );
-		}
-	});
-
-	this.element.selectmenu( "open" );
-});
-
-asyncTest( "select", function() {
-	expect( 3 );
-
-	this.element.selectmenu({
-		select: function( event, ui ) {
-			ok( true, "select event fired on item select" );
-			equal( ui.item.index, optionIndex, "ui.item.index contains correct option index" );
-			equal( ui.item.element[ 0 ], options.eq( optionIndex )[ 0 ],
-				"ui.item.element contains original option element" );
-		}
-	});
-
-	var button = this.element.selectmenu( "widget" ),
-		menu = this.element.selectmenu( "menuWidget" ),
-		options = this.element.find( "option" ),
-		optionIndex = 1;
-
-	button.simulate( "focus" );
-	setTimeout(function() {
-		button.trigger( "click" );
-		menu.find( "li" ).eq( optionIndex ).simulate( "mouseover" ).trigger( "click" );
-		start();
-	});
-});
-
-} );
diff --git a/tests/unit/selectmenu/selectmenu_methods.js b/tests/unit/selectmenu/selectmenu_methods.js
deleted file mode 100644
index 8481e804e..000000000
--- a/tests/unit/selectmenu/selectmenu_methods.js
+++ /dev/null
@@ -1,189 +0,0 @@
-define( [
-	"jquery",
-	"ui/selectmenu"
-], function( $ ) {
-
-module( "selectmenu: methods" );
-
-test( "destroy", function( assert ) {
-	expect( 1 );
-	assert.domEqual( "#speed", function() {
-		$( "#speed" ).selectmenu().selectmenu( "destroy" );
-	});
-});
-
-test( "open / close", function() {
-	expect( 5 );
-
-	var element = $( "#speed" ).selectmenu(),
-		menu = element.selectmenu( "menuWidget" );
-
-	ok( menu.is( ":hidden" ), "menu hidden on init" );
-
-	element.selectmenu( "open" );
-	ok( menu.is( ":visible" ), "open: menu visible" );
-	equal( menu.attr( "aria-hidden" ), "false", "open: menu aria-disabled" );
-
-	element.selectmenu( "close" );
-	ok( menu.is( ":hidden" ), "close: menu hidden" );
-	equal( menu.attr( "aria-hidden" ), "true", "close: menu aria-disabled" );
-});
-
-test( "enable / disable", function() {
-	expect( 10 );
-
-	var element = $( "#speed" ).selectmenu(),
-		button = element.selectmenu( "widget" ),
-		menu = element.selectmenu( "menuWidget" );
-
-	element.selectmenu( "disable" );
-	ok( element.selectmenu( "option", "disabled" ), "disable: widget option" );
-	equal( element.attr( "disabled" ), "disabled", "disable: native select disabled" );
-	equal( button.attr( "aria-disabled" ), "true", "disable: button ARIA" );
-	equal( button.attr( "tabindex" ), -1, "disable: button tabindex" );
-	equal( menu.attr( "aria-disabled" ), "true", "disable: menu ARIA" );
-
-	element.selectmenu( "enable" );
-	ok( !element.selectmenu( "option", "disabled" ), "enable: widget option" );
-	equal( element.attr( "disabled" ), undefined, "enable: native select disabled" );
-	equal( button.attr( "aria-disabled" ), "false", "enable: button ARIA" );
-	equal( button.attr( "tabindex" ), 0, "enable: button tabindex" );
-	equal( menu.attr( "aria-disabled" ), "false", "enable: menu ARIA" );
-});
-
-test( "refresh - structure", function() {
-	expect( 3 );
-
-	var menuItems,
-		element = $( "#speed" ).selectmenu(),
-		menu = element.selectmenu( "menuWidget" ),
-		options = element.find( "option" );
-
-	options.eq( 0 )
-		.attr( "value", "changed_value" )
-		.text( "Changed value" );
-	options.eq( 2 ).remove();
-	options.eq( 3 ).remove();
-	element.append( "<option value=\"added_option\">Added option</option>" );
-	element.selectmenu( "refresh" );
-
-	options = element.find( "option" );
-	menuItems = menu.find( "li" ).not( ".ui-selectmenu-optgroup" );
-
-	equal( options.length, menuItems.length, "menu item length" );
-	equal( "Added option", menuItems.last().text(), "added item" );
-	equal( "Changed value", menuItems.eq( 0 ).text(), "changed item" );
-});
-
-asyncTest( "refresh - change selected option", function() {
-	expect( 4 );
-
-	var element = $( "#speed" ).selectmenu(),
-		button = element.selectmenu( "widget" );
-
-	equal( element.find( "option:selected" ).text(), button.text(), "button text after init" );
-
-	button.simulate( "focus" );
-	setTimeout(function() {
-		equal( element.find( "option:selected" ).text(), button.text(), "button text after focus" );
-
-		element[ 0 ].selectedIndex = 0;
-		element.selectmenu( "refresh" );
-		equal( element.find( "option:selected" ).text(), button.text(),
-			"button text after changing selected option" );
-
-		element.find( "option" ).prop( "selected", false );
-		element.append( "<option selected value=\"selected_option\">Selected option</option>" );
-		element.selectmenu( "refresh" );
-		equal( "Selected option", button.text(), "button text after adding selected option" );
-
-		start();
-	});
-});
-
-test( "refresh - disabled select", function() {
-	expect( 4 );
-
-	var element = $( "#speed" ).selectmenu(),
-		button = element.selectmenu( "widget" ),
-		menu = element.selectmenu( "menuWidget" );
-
-	element.prop( "disabled", true );
-	element.selectmenu( "refresh" );
-
-	ok( element.selectmenu( "option", "disabled" ), "widget option" );
-	equal( button.attr( "aria-disabled" ), "true", "button ARIA" );
-	equal( button.attr( "tabindex" ), -1, "button tabindex" );
-	equal( menu.attr( "aria-disabled" ), "true", "menu ARIA" );
-});
-
-test( "refresh - disabled option", function( assert ) {
-	expect( 1 );
-
-	var disabledItem,
-		element = $( "#speed" ).selectmenu(),
-		menu = element.selectmenu( "menuWidget" ).parent();
-
-	element.find( "option" ).eq( 2 ).prop( "disabled", true );
-	element.selectmenu( "refresh" );
-
-	disabledItem = menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).eq( 2 );
-	assert.hasClasses( disabledItem, "ui-state-disabled" );
-});
-
-test( "refresh - disabled optgroup", function( assert ) {
-	var i, item,
-		element = $( "#files" ).selectmenu(),
-		menu = element.selectmenu( "menuWidget" ).parent(),
-		originalDisabledOptgroup = element.find( "optgroup" ).first(),
-		originalDisabledOptions = originalDisabledOptgroup.find( "option" );
-
-	expect( 2 + originalDisabledOptions.length );
-
-	originalDisabledOptgroup.prop( "disabled", true );
-	element.selectmenu( "refresh" );
-
-	item = menu.find( "li.ui-selectmenu-optgroup" ).first();
-
-	assert.hasClasses( item, "ui-state-disabled" );
-
-	equal(
-		menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).filter( ".ui-state-disabled" ).length,
-		originalDisabledOptions.length,
-		"disabled options"
-	);
-	for ( i = 0; i < originalDisabledOptions.length; i++ ) {
-		item = item.next( "li" );
-		assert.hasClasses( item, "ui-state-disabled" );
-	}
-});
-
-test( "refresh - remove all options", function() {
-	expect( 2 );
-
-	var element = $( "#speed" ).selectmenu(),
-		button = element.selectmenu( "widget" ),
-		menu = element.selectmenu( "menuWidget" );
-
-	element.children().remove();
-	element.selectmenu( "refresh" );
-	equal( button.find( ".ui-selectmenu-text" ).html(), $( "<span>&#160;</span>" ).html(),
-		"Empty button text" );
-	equal( menu.children().length, 0, "Empty menu" );
-});
-
-test( "widget and menuWidget", function( assert ) {
-	expect( 4 );
-
-	var element = $( "#speed" ).selectmenu(),
-		button = element.selectmenu( "widget" ),
-		menu = element.selectmenu( "menuWidget" );
-
-	equal( button.length, 1, "button: one element" );
-	assert.hasClasses( button, "ui-selectmenu-button" );
-
-	equal( menu.length, 1, "Menu Widget: one element" );
-	ok( menu.is( "ul.ui-menu" ), "Menu Widget: element and class" );
-});
-
-} );
diff --git a/tests/unit/selectmenu/selectmenu_options.js b/tests/unit/selectmenu/selectmenu_options.js
deleted file mode 100644
index deb7a6d3a..000000000
--- a/tests/unit/selectmenu/selectmenu_options.js
+++ /dev/null
@@ -1,128 +0,0 @@
-define( [
-	"jquery",
-	"ui/selectmenu"
-], function( $ ) {
-
-module( "selectmenu: options" );
-
-test( "appendTo: null", function() {
-	expect( 1 );
-
-	var element = $( "#speed" ).selectmenu();
-	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], document.body,
-		"defaults to body" );
-});
-
-test( "appendTo: explicit", function() {
-	expect( 6 );
-
-	var detached = $( "<div>" ),
-		element = $( "#speed" );
-
-	element.selectmenu({
-		appendTo: ".selectmenu-wrap"
-	});
-	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ],
-		$( "#selectmenu-wrap1" )[ 0 ], "first found element" );
-	equal( $( "#selectmenu-wrap2 .ui-selectmenu" ).length, 0, "only appends to one element" );
-	element.selectmenu( "destroy" );
-
-	element.selectmenu().selectmenu( "option", "appendTo", "#selectmenu-wrap1" );
-	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ],
-		$( "#selectmenu-wrap1" )[ 0 ], "modified after init" );
-	element.selectmenu( "destroy" );
-
-	element.selectmenu({
-		appendTo: detached
-	});
-	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], detached[ 0 ],
-		"detached jQuery object" );
-	element.selectmenu( "destroy" );
-
-	element.selectmenu({
-		appendTo: detached[ 0 ]
-	});
-	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], detached[ 0 ],
-		"detached DOM element" );
-	element.selectmenu( "destroy" );
-
-	element.selectmenu().selectmenu( "option", "appendTo", detached );
-	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], detached[ 0 ],
-		"detached DOM element via option()" );
-	element.selectmenu( "destroy" );
-});
-
-test( "appendTo: ui-front", function() {
-	expect( 2 );
-
-	var element = $( "#speed" );
-
-	$( "#selectmenu-wrap2" ).addClass( "ui-front" );
-	element.selectmenu();
-	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ],
-		$( "#selectmenu-wrap2" )[ 0 ], "null, inside .ui-front" );
-	element.selectmenu( "destroy" );
-
-	element.selectmenu({
-		appendTo: $()
-	});
-	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ],
-		$( "#selectmenu-wrap2" )[ 0 ], "empty jQuery object, inside .ui-front" );
-});
-
-test( "CSS styles", function( assert ) {
-	expect( 5 );
-
-	var element = $( "#speed" ).selectmenu(),
-		button = element.selectmenu( "widget" ),
-		menu = element.selectmenu( "menuWidget" );
-
-	element.selectmenu( "open" );
-
-	assert.hasClasses( button, "ui-corner-top" );
-	assert.lacksClasses( button, "ui-corner-all" );
-	assert.hasClasses( button.find( "span.ui-icon" ), "ui-icon-triangle-1-s" );
-	assert.hasClasses( menu, "ui-corner-bottom" );
-	assert.lacksClasses( button, "ui-corner-all" );
-});
-
-test( "width", function() {
-	expect( 6 );
-
-	var button,
-		element = $( "#speed" );
-
-	element.selectmenu();
-	button = element.selectmenu( "widget" );
-
-	equal( button[ 0 ].style.width, "", "no inline style" );
-
-	element.selectmenu( "option", "width", null );
-	equal( button.outerWidth(), element.outerWidth(), "button width auto" );
-
-	element.outerWidth( 100 );
-	element.selectmenu( "refresh" );
-	equal( button.outerWidth(), 100, "button width set by CSS" );
-
-	element
-		.width( "" )
-		.selectmenu( "option", "width", 100 )
-		.selectmenu( "refresh" );
-	equal( button.outerWidth(), 100, "button width set by JS option" );
-
-	element
-		.append( $( "<option>", { text: "Option with a little longer text" } ) )
-		.selectmenu( "option", "width", null )
-		.selectmenu( "refresh" );
-	equal( button.outerWidth(), element.outerWidth(), "button width with long option" );
-
-	element.parent().outerWidth( 300 );
-	element
-		.selectmenu( "destroy" )
-		.css( "width", "100%" )
-		.selectmenu({ width: null });
-	button = element.selectmenu( "widget" );
-	equal( button.outerWidth(), 300, "button width fills container" );
-});
-
-} );
diff --git a/tests/unit/slider/common.js b/tests/unit/slider/common.js
new file mode 100644
index 000000000..77004d159
--- /dev/null
+++ b/tests/unit/slider/common.js
@@ -0,0 +1,35 @@
+define( [
+	"lib/common",
+	"ui/slider"
+], function( common ) {
+
+common.testWidget( "slider", {
+	defaults: {
+		animate: false,
+		cancel: "input, textarea, button, select, option",
+		classes: {
+			"ui-slider": "ui-corner-all",
+			"ui-slider-handle": "ui-corner-all",
+			"ui-slider-range": "ui-corner-all ui-widget-header"
+		},
+		delay: 0,
+		disabled: false,
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: "horizontal",
+		range: false,
+		step: 1,
+		value: 0,
+		values: null,
+
+		// callbacks
+		create: null,
+		change: null,
+		slide: null,
+		start: null,
+		stop: null
+	}
+});
+
+} );
diff --git a/tests/unit/slider/core.js b/tests/unit/slider/core.js
new file mode 100644
index 000000000..797d5525c
--- /dev/null
+++ b/tests/unit/slider/core.js
@@ -0,0 +1,309 @@
+define( [
+	"jquery",
+	"ui/slider"
+], function( $ ) {
+
+var element, options;
+
+function handle() {
+	return element.find( ".ui-slider-handle" );
+}
+
+// Slider Tests
+module( "slider: core" );
+
+test( "markup structure", function( assert ) {
+	expect( 4 );
+	var element = $( "<div>" ).slider({ range: true }),
+		handle = element.find( "span" ),
+		range = element.find( "div" );
+
+	assert.hasClasses( element, "ui-slider ui-slider-horizontal ui-widget ui-widget-content" );
+	assert.hasClasses( range, "ui-slider-range ui-widget-header" );
+	assert.hasClasses( handle[ 0 ], "ui-slider-handle" );
+	assert.hasClasses( handle[ 1 ], "ui-slider-handle" );
+});
+
+test( "keydown HOME on handle sets value to min", function() {
+	expect( 2 );
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "horizontal",
+		step: 1
+	};
+	element.slider( options );
+
+	element.slider( "value", 0 );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+	equal(element.slider( "value" ), options.min );
+
+	element.slider( "destroy" );
+
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "vertical",
+		step: 1
+	};
+	element.slider( options );
+
+	element.slider( "value", 0 );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+	equal(element.slider( "value" ), options.min) ;
+
+	element.slider( "destroy" );
+});
+
+test( "keydown END on handle sets value to max", function() {
+	expect( 2 );
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "horizontal",
+		step: 1
+	};
+	element.slider( options );
+
+	element.slider( "value", 0 );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+	equal(element.slider( "value" ), options.max) ;
+
+	element.slider( "destroy" );
+
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "vertical",
+		step: 1
+	};
+	element.slider( options );
+
+	element.slider( "value", 0 );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+	equal(element.slider( "value" ), options.max );
+
+	element.slider( "destroy" );
+});
+
+test( "keydown PAGE_UP on handle increases value by 1/5 range, not greater than max", function() {
+	expect( 4 );
+	$.each( [ "horizontal", "vertical" ], function( i, orientation ) {
+		element = $( "<div></div>" );
+		options = {
+			max: 100,
+			min: 0,
+			orientation: orientation,
+			step: 1
+		};
+		element.slider( options );
+
+		element.slider( "value", 70);
+
+		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal(element.slider( "value" ), 90);
+
+		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equal(element.slider( "value" ), 100);
+
+		element.slider( "destroy" );
+	});
+});
+
+test( "keydown PAGE_DOWN on handle decreases value by 1/5 range, not less than min", function() {
+	expect( 4 );
+	$.each( [ "horizontal", "vertical" ], function( i, orientation ) {
+		element = $( "<div></div>" );
+		options = {
+			max: 100,
+			min: 0,
+			orientation: orientation,
+			step: 1
+		};
+		element.slider( options );
+
+		element.slider( "value", 30);
+
+		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal(element.slider( "value" ), 10);
+
+		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equal(element.slider( "value" ), 0 );
+
+		element.slider( "destroy" );
+	});
+});
+
+test( "keydown UP on handle increases value by step, not greater than max", function() {
+	expect( 4 );
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "horizontal",
+		step: 1
+	};
+	element.slider(options);
+
+	element.slider( "value", options.max - options.step );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+	equal(element.slider( "value" ), options.max );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+	equal(element.slider( "value" ), options.max );
+
+	element.slider( "destroy" );
+
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "vertical",
+		step: 1
+	};
+	element.slider( options );
+
+	element.slider( "value", options.max - options.step );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+	equal(element.slider( "value" ), options.max );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+	equal(element.slider( "value" ), options.max );
+
+	element.slider( "destroy" );
+});
+
+test( "keydown RIGHT on handle increases value by step, not greater than max", function() {
+	expect( 4 );
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "horizontal",
+		step: 1
+	};
+	element.slider(options);
+
+	element.slider( "value", options.max - options.step );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+	equal(element.slider( "value" ), options.max);
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+	equal(element.slider( "value" ), options.max );
+
+	element.slider( "destroy" );
+
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "vertical",
+		step: 1
+	};
+	element.slider( options );
+
+	element.slider( "value", options.max - options.step );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+	equal(element.slider( "value" ), options.max );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+	equal(element.slider( "value" ), options.max );
+
+	element.slider( "destroy" );
+});
+
+test( "keydown DOWN on handle decreases value by step, not less than min", function() {
+	expect( 4 );
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "horizontal",
+		step: 1
+	};
+	element.slider( options );
+
+	element.slider( "value", options.min + options.step );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+	equal(element.slider( "value" ), options.min);
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+	equal(element.slider( "value" ), options.min );
+
+	element.slider( "destroy" );
+
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "vertical",
+		step: 1
+	};
+	element.slider( options );
+
+	element.slider( "value", options.min + options.step );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+	equal(element.slider( "value" ), options.min);
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+	equal(element.slider( "value" ), options.min );
+
+	element.slider( "destroy" );
+});
+
+test( "keydown LEFT on handle decreases value by step, not less than min", function() {
+	expect( 4 );
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "horizontal",
+		step: 1
+	};
+	element.slider(options);
+
+	element.slider( "value", options.min + options.step );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+	equal(element.slider( "value" ), options.min );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+	equal(element.slider( "value" ), options.min );
+
+	element.slider( "destroy" );
+
+	element = $( "<div></div>" );
+	options = {
+		max: 5,
+		min: -5,
+		orientation: "vertical",
+		step: 1
+	};
+	element.slider( options );
+
+	element.slider( "value", options.min + options.step );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+	equal(element.slider( "value" ), options.min );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+	equal(element.slider( "value" ), options.min );
+
+	element.slider( "destroy" );
+});
+
+} );
diff --git a/tests/unit/slider/events.js b/tests/unit/slider/events.js
new file mode 100644
index 000000000..0d22577f1
--- /dev/null
+++ b/tests/unit/slider/events.js
@@ -0,0 +1,208 @@
+define( [
+	"jquery",
+	"ui/slider"
+], function( $ ) {
+
+module( "slider: events" );
+
+//Specs from http://wiki.jqueryui.com/Slider#specs
+//"change callback: triggers when the slider has stopped moving and has a new
+// value (even if same as previous value), via mouse(mouseup) or keyboard(keyup)
+// or value method/option"
+test( "mouse based interaction", function() {
+	expect( 4 );
+
+	var element = $( "#slider1" )
+		.slider({
+			start: function( event ) {
+				equal( event.originalEvent.type, "mousedown", "start triggered by mousedown" );
+			},
+			slide: function( event) {
+				equal( event.originalEvent.type, "mousemove", "slider triggered by mousemove" );
+			},
+			stop: function( event ) {
+				equal( event.originalEvent.type, "mouseup", "stop triggered by mouseup" );
+			},
+			change: function( event ) {
+				equal( event.originalEvent.type, "mouseup", "change triggered by mouseup" );
+			}
+		});
+
+	element.find( ".ui-slider-handle" ).eq( 0 )
+		.simulate( "drag", { dx: 10, dy: 10 } );
+
+});
+test( "keyboard based interaction", function() {
+	expect( 3 );
+
+	// Test keyup at end of handle slide (keyboard)
+	var element = $( "#slider1" )
+		.slider({
+			start: function( event ) {
+				equal( event.originalEvent.type, "keydown", "start triggered by keydown" );
+			},
+			slide: function() {
+				ok( false, "Slider never triggered by keys" );
+			},
+			stop: function( event ) {
+				equal( event.originalEvent.type, "keyup", "stop triggered by keyup" );
+			},
+			change: function( event ) {
+				equal( event.originalEvent.type, "keyup", "change triggered by keyup" );
+			}
+		});
+
+	element.find( ".ui-slider-handle" ).eq( 0 )
+		.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } )
+		.simulate( "keypress", { keyCode: $.ui.keyCode.LEFT } )
+		.simulate( "keyup", { keyCode: $.ui.keyCode.LEFT } );
+
+});
+test( "programmatic event triggers", function() {
+	expect( 6 );
+
+	// Test value method
+	var element = $( "<div></div>" )
+		.slider({
+			change: function() {
+				ok( true, "change triggered by value method" );
+			}
+		})
+		.slider( "value", 0 );
+
+	// Test values method
+	element = $( "<div></div>" )
+		.slider({
+			values: [ 10, 20 ],
+			change: function() {
+				ok( true, "change triggered by values method" );
+			}
+		})
+		.slider( "values", [ 80, 90 ] );
+
+	// Test value option
+	element = $( "<div></div>" )
+		.slider({
+			change: function() {
+				ok( true, "change triggered by value option" );
+			}
+		})
+		.slider( "option", "value", 0 );
+
+	// Test values option
+	element = $( "<div></div>" )
+		.slider({
+			values: [ 10, 20 ],
+			change: function() {
+				ok( true, "change triggered by values option" );
+			}
+		})
+		.slider( "option", "values", [ 80, 90 ] );
+
+});
+
+test( "mouse based interaction part two: when handles overlap", function() {
+	expect( 6 );
+
+	var element = $( "#slider1" )
+		.slider({
+			values: [ 0, 0, 0 ],
+			start: function( event, ui ) {
+				equal( handles.index( ui.handle ), 2, "rightmost handle activated when overlapping at minimum (#3736)" );
+			}
+		}),
+		handles = element.find( ".ui-slider-handle" );
+	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
+	element.slider( "destroy" );
+
+	element = $( "#slider1" )
+		.slider({
+			values: [ 10, 10, 10 ],
+			max: 10,
+			start: function( event, ui ) {
+				equal( handles.index( ui.handle ), 0, "leftmost handle activated when overlapping at maximum" );
+			}
+		}),
+		handles = element.find( ".ui-slider-handle" );
+	handles.eq( 0 ).simulate( "drag", { dx: -10 } );
+	element.slider( "destroy" );
+
+	element = $( "#slider1" )
+		.slider({
+			values: [ 19, 20 ]
+		}),
+		handles = element.find( ".ui-slider-handle" );
+	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
+	element.one( "slidestart", function( event, ui ) {
+		equal( handles.index( ui.handle ), 0, "left handle activated if left was moved last" );
+	});
+	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
+	element.slider( "destroy" );
+
+	element = $( "#slider1" )
+		.slider({
+			values: [ 19, 20 ]
+		}),
+		handles = element.find( ".ui-slider-handle" );
+	handles.eq( 1 ).simulate( "drag", { dx: -10 } );
+	element.one( "slidestart", function( event, ui ) {
+		equal( handles.index( ui.handle ), 1, "right handle activated if right was moved last (#3467)" );
+	});
+	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
+
+	element = $( "#slider1" )
+		.slider({
+			range: true,
+			min: 0,
+			max: 100,
+			values: [ 0, 50 ]
+		}),
+		handles = element.find( ".ui-slider-handle" );
+
+	element.slider( "option", { values: [ 100, 100 ] } );
+	handles.eq( 0 ).simulate( "drag", { dx: -10 } );
+	equal( element.slider( "values" )[ 0 ], 99, "setting both values of range slider to the maximum doesn't lock slider" );
+
+	element.slider( "option", { values: [ 0, 0 ] } );
+	handles.eq( 1 ).simulate( "drag", { dx: 10 } );
+	equal( element.slider( "values" )[ 1 ], 1, "setting both values of range slider to the minimum  doesn't lock slider" );
+});
+
+test( "event data", function() {
+	expect( 4 );
+
+	var slideHandleIndex = 3,
+		values = [ 8, 9, 7, 4 ],
+		newValues = [ 8, 9, 7, 5 ],
+		element = $( "#slider1" )
+			.slider({
+				values: values,
+				start: function( event, ui ) {
+					deepEqual( ui, expectedUiHash, "passing ui to start event" );
+				},
+				slide: function( event, ui ) {
+					deepEqual( ui, expectedChangedUiHash, "passing ui to slide event" );
+				},
+				stop: function( event, ui ) {
+					deepEqual( ui, expectedChangedUiHash, "passing ui to stop event" );
+				},
+				change: function( event, ui ) {
+					deepEqual( ui, expectedChangedUiHash, "passing ui to change event" );
+				}
+			}),
+		handles = element.find( ".ui-slider-handle" ),
+		expectedUiHash = {
+			handle: handles.eq( slideHandleIndex )[ 0 ],
+			handleIndex: slideHandleIndex,
+			values: values,
+			value: values[ slideHandleIndex ]
+		},
+		expectedChangedUiHash = $.extend( {}, expectedUiHash, {
+			values: newValues,
+			value: newValues[ slideHandleIndex ]
+		});
+
+	handles.eq( slideHandleIndex ).simulate( "drag", { dx: 10 } );
+});
+
+} );
diff --git a/tests/unit/slider/methods.js b/tests/unit/slider/methods.js
new file mode 100644
index 000000000..bddafefca
--- /dev/null
+++ b/tests/unit/slider/methods.js
@@ -0,0 +1,116 @@
+define( [
+	"jquery",
+	"ui/slider"
+], function( $ ) {
+
+module( "slider: methods" );
+
+test( "init", function() {
+	expect(5);
+
+	$( "<div></div>" ).appendTo( "body" ).slider().remove();
+	ok( true, ".slider() called on element" );
+
+	$( [] ).slider().remove();
+	ok( true, ".slider() called on empty collection" );
+
+	$( "<div></div>" ).slider().remove();
+	ok( true, ".slider() called on disconnected DOMElement" );
+
+	var element = $( "<div></div>" ).slider();
+	element.slider( "option", "foo" );
+	element.remove();
+	ok( true, "arbitrary option getter after init" );
+
+	$( "<div></div>" ).slider().slider( "option", "foo", "bar" ).remove();
+	ok( true, "arbitrary option setter after init" );
+});
+
+test( "destroy", function( assert ) {
+	expect( 1 );
+	assert.domEqual( "#slider1", function() {
+		$( "#slider1" ).slider().slider( "destroy" );
+	});
+});
+
+test( "enable", function( assert ) {
+	expect( 3 );
+	var element,
+		expected = $( "<div></div>" ).slider(),
+		actual = expected.slider( "enable" );
+	equal(actual, expected, "enable is chainable" );
+
+	element = $( "<div></div>" ).slider({ disabled: true });
+	assert.hasClasses( element, "ui-state-disabled ui-slider-disabled" );
+	element.slider( "enable" );
+	assert.lacksClasses( element, "ui-state-disabled ui-slider-disabled" );
+});
+
+test( "disable", function( assert ) {
+	expect( 4 );
+	var element,
+		expected = $( "<div></div>" ).slider(),
+		actual = expected.slider( "disable" );
+	equal(actual, expected, "disable is chainable" );
+
+	element = $( "<div></div>" ).slider({ disabled: false });
+	assert.lacksClasses( element, "ui-state-disabled ui-slider-disabled" );
+	element.slider( "disable" );
+	assert.hasClasses( element, "ui-state-disabled ui-slider-disabled" );
+	ok( !element.attr( "aria-disabled" ), "slider does not have aria-disabled attr after disable method call" );
+});
+
+test( "value", function() {
+	expect( 19 );
+	$( [ false, "min", "max" ] ).each(function() {
+		var element = $( "<div></div>" ).slider({
+			range: this,
+			value: 5
+		});
+		equal( element.slider( "value" ), 5, "range: " + this + " slider method get" );
+		equal( element.slider( "value", 10), element, "value method is chainable" );
+		equal( element.slider( "value" ), 10, "range: " + this + " slider method set" );
+		element.remove();
+	});
+	var element = $( "<div></div>" ).slider({
+		min: -1, value: 0, max: 1
+	});
+	// min with value option vs value method
+	element.slider( "option", "value", -2 );
+	equal( element.slider( "option", "value" ), -2, "value option does not respect min" );
+	equal( element.slider( "value" ), -1, "value method get respects min" );
+	equal( element.slider( "value", -2 ), element, "value method is chainable" );
+	equal( element.slider( "option", "value" ), -1, "value method set respects min" );
+	// max with value option vs value method
+	element.slider( "option", "value", 2);
+	equal( element.slider( "option", "value" ), 2, "value option does not respect max" );
+	equal( element.slider( "value" ), 1, "value method get respects max" );
+	equal( element.slider( "value", 2 ), element, "value method is chainable" );
+	equal( element.slider( "option", "value" ), 1, "value method set respects max" );
+
+	// set max value with step 0.01
+	element.slider( "option", {
+		min: 2,
+		value: 2,
+		max: 2.4,
+		step: 0.01
+	});
+	element.slider( "option", "value", 2.4 );
+	equal( element.slider( "value" ), 2.4, "value is set to max with 0.01 step" );
+
+	element = $( "<div></div>" ).slider({
+		value: 100,
+		min: 10,
+		max: 500,
+		step: 50
+	});
+
+	element.slider( "option", "value", 510 );
+	equal( element.slider( "value" ), 460, "value is restricted to maximum valid step" );
+});
+
+//test( "values", function() {
+//	ok(false, "missing test - untested code is broken code." );
+//});
+
+} );
diff --git a/tests/unit/slider/options.js b/tests/unit/slider/options.js
new file mode 100644
index 000000000..923c3c1c9
--- /dev/null
+++ b/tests/unit/slider/options.js
@@ -0,0 +1,349 @@
+define( [
+	"jquery",
+	"ui/slider"
+], function( $ ) {
+
+var element, options;
+
+function handle() {
+	return element.find( ".ui-slider-handle" );
+}
+
+module( "slider: options" );
+
+test( "disabled", function( assert ){
+	expect( 8 );
+	var count = 0;
+
+	element = $( "#slider1" ).slider();
+	element.bind( "slidestart", function() {
+		count++;
+	});
+
+	// enabled
+	assert.lacksClasses( element, "ui-slider-disabled" );
+	equal( element.slider( "option", "disabled" ), false , "is not disabled" );
+
+	handle().simulate( "drag", { dx: 10 } );
+	equal( count, 1, "slider moved" );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+	equal( count, 2, "slider moved" );
+
+	// disabled
+	element.slider( "option", "disabled", true );
+	assert.hasClasses( element, "ui-slider-disabled" );
+	equal( element.slider( "option", "disabled" ), true, "is disabled" );
+
+	handle().simulate( "drag", { dx: 10 } );
+	equal( count, 2, "slider did not move" );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+	equal( count, 2, "slider did not move" );
+});
+
+test( "max", function() {
+	expect( 5 );
+	element = $( "<div></div>" );
+
+	options = {
+		max: 37,
+		min: 6,
+		orientation: "horizontal",
+		step: 1,
+		value: 50
+	};
+
+	element.slider( options );
+	ok( element.slider( "option", "value" ) === options.value, "value option is not contained by max" );
+	ok( element.slider( "value" ) === options.max, "value method is contained by max" );
+
+	options = {
+		max: 9,
+		min: 1,
+		orientation: "horizontal",
+		step: 3,
+		value: 8.75
+	};
+
+	element.slider( options );
+	ok( element.slider( "value" ) === 7, "value method is within max, edge Case" );
+
+	options.step = 2;
+
+	element.slider( options );
+	ok( element.slider( "value" ) === options.max, "value method will max, step is changed" );
+	element.slider( "destroy" );
+
+	options = {
+		max: 60,
+		min: 50,
+		orientation: "horizontal",
+		step: 0.1,
+		value: 60
+	};
+
+	element.slider( options );
+	ok( element.slider( "value" ) === options.max, "value method will max, step is changed and step is float" );
+	element.slider( "destroy" );
+
+});
+
+test( "min", function() {
+	expect( 2 );
+	element = $( "<div></div>" );
+
+	options = {
+		max: 37,
+		min: 6,
+		orientation: "vertical",
+		step: 1,
+		value: 2
+	};
+
+	element.slider( options );
+	ok( element.slider( "option", "value" ) === options.value, "value option is not contained by min" );
+	ok( element.slider( "value" ) === options.min, "value method is contained by min" );
+	element.slider( "destroy" );
+
+});
+
+test( "orientation", function( assert ) {
+	expect( 8 );
+	element = $( "#slider1" );
+
+	options = {
+		max: 2,
+		min: -2,
+		orientation: "vertical",
+		value: 1
+	};
+
+	var percentVal = ( options.value - options.min ) / ( options.max - options.min ) * 100;
+
+	element.slider( options ).slider( "option", "orientation", "horizontal" );
+	assert.hasClasses( element, "ui-slider-horizontal" );
+	assert.lacksClasses( element, "ui-slider-vertical" );
+	equal( element.find( ".ui-slider-handle" )[ 0 ].style.bottom, "", "CSS bottom reset" );
+	equal( handle()[0].style.left, percentVal + "%", "horizontal slider handle is positioned with left: %" );
+
+	element.slider( "destroy" ) ;
+
+	options = {
+		max: 2,
+		min: -2,
+		orientation: "horizontal",
+		value: -1
+	};
+
+	percentVal = ( options.value - options.min ) / ( options.max - options.min ) * 100;
+
+	element.slider( options ).slider( "option", "orientation", "vertical" );
+	assert.hasClasses( element, "ui-slider-vertical" );
+	assert.lacksClasses( element, "ui-slider-horizontal" );
+	equal( element.find( ".ui-slider-handle" )[ 0 ].style.left, "", "CSS left reset" );
+	equal( handle()[0].style.bottom, percentVal + "%", "vertical slider handle is positioned with bottom: %" );
+
+	element.slider( "destroy" );
+
+});
+
+//spec: http://wiki.jqueryui.com/Slider#specs
+// value option/method: the value option is not restricted by min/max/step.
+// What is returned by the value method is restricted by min (>=), max (<=), and step (even multiple)
+test( "step", function() {
+	expect( 9 );
+	element = $( "<div></div>" ).slider({
+		min: 0,
+		value: 0,
+		step: 10,
+		max: 100
+	});
+	equal( element.slider( "value" ), 0 );
+
+	element.slider( "value", 1 );
+	equal( element.slider( "value" ), 0 );
+
+	element.slider( "value", 9 );
+	equal( element.slider( "value" ), 10 );
+
+	element.slider( "value", 11 );
+	equal( element.slider( "value" ), 10 );
+
+	element.slider( "value", 19 );
+	equal( element.slider( "value" ), 20 );
+
+	element = $( "<div></div>" ).slider({
+		min: 0,
+		value: 0,
+		step: 20,
+		max: 100
+	});
+	element.slider( "value", 0 );
+
+	element.slider( "option", "value", 1 );
+	equal( element.slider( "value" ), 0 );
+
+	element.slider( "option", "value", 9 );
+	equal( element.slider( "value" ), 0 );
+
+	element.slider( "option", "value", 11 );
+	equal( element.slider( "value" ), 20 );
+
+	element.slider( "option", "value", 19 );
+	equal( element.slider( "value" ), 20 );
+
+	element.slider( "destroy" );
+});
+
+//test( "value", function() {
+//	ok(false, "missing test - untested code is broken code." );
+//});
+
+test( "values", function() {
+	expect( 2 );
+
+	// testing multiple ranges on the same page, the object reference to the values
+	// property is preserved via multiple range elements, so updating options.values
+	// of 1 slider updates options.values of all the others
+	var ranges = $([
+		document.createElement( "div" ),
+		document.createElement( "div" )
+	]).slider({
+		range: true,
+		values: [ 25, 75 ]
+	});
+
+	notStrictEqual(
+		ranges.eq( 0 ).slider( "instance" ).options.values,
+		ranges.eq( 1 ).slider( "instance" ).options.values,
+		"multiple range sliders should not have a reference to the same options.values array"
+	);
+
+	ranges.eq( 0 ).slider( "values", 0, 10 );
+
+	notEqual(
+		ranges.eq( 0 ).slider( "values", 0 ),
+		ranges.eq( 1 ).slider( "values", 0 ),
+		"the values for multiple sliders should be different"
+	);
+});
+
+test( "range", function( assert ) {
+	expect( 32 );
+	var range;
+
+	// min
+	element = $( "<div></div>" ).slider({
+		range: "min",
+		min: 1,
+		max: 10,
+		step: 1
+	});
+
+	equal( element.find( ".ui-slider-handle" ).length, 1, "range min, one handle" );
+	equal( element.find( ".ui-slider-range-min" ).length, 1, "range min" );
+	element.slider( "destroy" );
+
+	// max
+	element = $( "<div></div>" ).slider({
+		range: "max",
+		min: 1,
+		max: 10,
+		step: 1
+	});
+
+	equal( element.find( ".ui-slider-handle" ).length, 1, "range max, one handle" );
+	equal( element.find( ".ui-slider-range-max" ).length, 1, "range max" );
+	element.slider( "destroy" );
+
+	// true
+	element = $( "<div></div>" ).slider({
+		range: true,
+		min: 1,
+		max: 10,
+		step: 1
+	});
+
+	range = element.find( ".ui-slider-range" );
+	equal( element.find( ".ui-slider-handle" ).length, 2, "range true, two handles" );
+	assert.lacksClasses( range, "ui-slider-range-max ui-slider-range-min" );
+	element.slider( "destroy" );
+
+	// Change range from min to max
+	element = $( "<div></div>" ).slider({
+		range: "min",
+		min: 1,
+		max: 10,
+		step: 1
+	}).slider( "option", "range", "max" );
+
+	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from min to max, one handle" );
+	equal( element.find( ".ui-slider-range-min" ).length, 0, "range switch from min to max" );
+	equal( element.find( ".ui-slider-range-max" ).length, 1, "range switch from min to max" );
+	element.slider( "destroy" );
+
+	// Change range from max to min
+	element = $( "<div></div>" ).slider({
+		range: "max",
+		min: 1,
+		max: 10,
+		step: 1
+	}).slider( "option", "range", "min" );
+
+	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from max to min, one handle" );
+	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from max to min" );
+	equal( element.find( ".ui-slider-range-min" ).length, 1, "range switch from max to min" );
+	element.slider( "destroy" );
+
+	// Change range from max to true
+	element = $( "<div></div>" ).slider({
+		range: "max",
+		min: 1,
+		max: 10,
+		step: 1
+	}).slider( "option", "range", true );
+
+	equal( element.find( ".ui-slider-handle" ).length, 2, "range switch from max to true, two handles" );
+	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from max to true" );
+	equal( element.find( ".ui-slider-range-min" ).length, 0, "range switch from max to true" );
+	equal( element.slider( "option", "value" ), 0 , "option value" );
+	equal( element.slider( "value" ), 1 , "value" );
+	deepEqual( element.slider( "option", "values" ), [1, 1], "option values" );
+	deepEqual( element.slider( "values" ), [1, 1], "values" );
+	element.slider( "destroy" );
+
+	// Change range from true to min
+	element = $( "<div></div>" ).slider({
+		range: true,
+		min: 1,
+		max: 10,
+		step: 1
+	}).slider( "option", "range", "min" );
+
+	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from true to min, one handle" );
+	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from true to min" );
+	equal( element.find( ".ui-slider-range-min" ).length, 1, "range switch from true to min" );
+	equal( element.slider( "option", "value" ), 1, "value" );
+	equal( element.slider( "value" ), 1 , "value" );
+	equal( element.slider( "option", "values" ), null, "values" );
+	deepEqual( element.slider( "values" ), [] , "values" );
+	element.slider( "destroy" );
+
+	// Change range from true to false
+	element = $( "<div></div>" ).slider({
+		range: true,
+		min: 1,
+		max: 10,
+		step: 1
+	}).slider( "option", "range", false );
+	equal( element.find( ".ui-slider-handle" ).length, 2, "range switch from true to false, both handles remain" );
+	equal( element.find( ".ui-slider-range" ).length, 0, "range switch from true to false" );
+	equal( element.slider( "option", "value" ), 0 , "option value" );
+	equal( element.slider( "value" ), 1 , "value" );
+	deepEqual( element.slider( "option", "values" ), [1, 1], "option values" );
+	deepEqual( element.slider( "values" ), [1, 1], "values" );
+	element.slider( "destroy" );
+});
+
+} );
diff --git a/tests/unit/slider/slider_common.js b/tests/unit/slider/slider_common.js
deleted file mode 100644
index 77004d159..000000000
--- a/tests/unit/slider/slider_common.js
+++ /dev/null
@@ -1,35 +0,0 @@
-define( [
-	"lib/common",
-	"ui/slider"
-], function( common ) {
-
-common.testWidget( "slider", {
-	defaults: {
-		animate: false,
-		cancel: "input, textarea, button, select, option",
-		classes: {
-			"ui-slider": "ui-corner-all",
-			"ui-slider-handle": "ui-corner-all",
-			"ui-slider-range": "ui-corner-all ui-widget-header"
-		},
-		delay: 0,
-		disabled: false,
-		distance: 0,
-		max: 100,
-		min: 0,
-		orientation: "horizontal",
-		range: false,
-		step: 1,
-		value: 0,
-		values: null,
-
-		// callbacks
-		create: null,
-		change: null,
-		slide: null,
-		start: null,
-		stop: null
-	}
-});
-
-} );
diff --git a/tests/unit/slider/slider_core.js b/tests/unit/slider/slider_core.js
deleted file mode 100644
index 797d5525c..000000000
--- a/tests/unit/slider/slider_core.js
+++ /dev/null
@@ -1,309 +0,0 @@
-define( [
-	"jquery",
-	"ui/slider"
-], function( $ ) {
-
-var element, options;
-
-function handle() {
-	return element.find( ".ui-slider-handle" );
-}
-
-// Slider Tests
-module( "slider: core" );
-
-test( "markup structure", function( assert ) {
-	expect( 4 );
-	var element = $( "<div>" ).slider({ range: true }),
-		handle = element.find( "span" ),
-		range = element.find( "div" );
-
-	assert.hasClasses( element, "ui-slider ui-slider-horizontal ui-widget ui-widget-content" );
-	assert.hasClasses( range, "ui-slider-range ui-widget-header" );
-	assert.hasClasses( handle[ 0 ], "ui-slider-handle" );
-	assert.hasClasses( handle[ 1 ], "ui-slider-handle" );
-});
-
-test( "keydown HOME on handle sets value to min", function() {
-	expect( 2 );
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "horizontal",
-		step: 1
-	};
-	element.slider( options );
-
-	element.slider( "value", 0 );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-	equal(element.slider( "value" ), options.min );
-
-	element.slider( "destroy" );
-
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "vertical",
-		step: 1
-	};
-	element.slider( options );
-
-	element.slider( "value", 0 );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-	equal(element.slider( "value" ), options.min) ;
-
-	element.slider( "destroy" );
-});
-
-test( "keydown END on handle sets value to max", function() {
-	expect( 2 );
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "horizontal",
-		step: 1
-	};
-	element.slider( options );
-
-	element.slider( "value", 0 );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-	equal(element.slider( "value" ), options.max) ;
-
-	element.slider( "destroy" );
-
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "vertical",
-		step: 1
-	};
-	element.slider( options );
-
-	element.slider( "value", 0 );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-	equal(element.slider( "value" ), options.max );
-
-	element.slider( "destroy" );
-});
-
-test( "keydown PAGE_UP on handle increases value by 1/5 range, not greater than max", function() {
-	expect( 4 );
-	$.each( [ "horizontal", "vertical" ], function( i, orientation ) {
-		element = $( "<div></div>" );
-		options = {
-			max: 100,
-			min: 0,
-			orientation: orientation,
-			step: 1
-		};
-		element.slider( options );
-
-		element.slider( "value", 70);
-
-		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal(element.slider( "value" ), 90);
-
-		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal(element.slider( "value" ), 100);
-
-		element.slider( "destroy" );
-	});
-});
-
-test( "keydown PAGE_DOWN on handle decreases value by 1/5 range, not less than min", function() {
-	expect( 4 );
-	$.each( [ "horizontal", "vertical" ], function( i, orientation ) {
-		element = $( "<div></div>" );
-		options = {
-			max: 100,
-			min: 0,
-			orientation: orientation,
-			step: 1
-		};
-		element.slider( options );
-
-		element.slider( "value", 30);
-
-		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal(element.slider( "value" ), 10);
-
-		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal(element.slider( "value" ), 0 );
-
-		element.slider( "destroy" );
-	});
-});
-
-test( "keydown UP on handle increases value by step, not greater than max", function() {
-	expect( 4 );
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "horizontal",
-		step: 1
-	};
-	element.slider(options);
-
-	element.slider( "value", options.max - options.step );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal(element.slider( "value" ), options.max );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal(element.slider( "value" ), options.max );
-
-	element.slider( "destroy" );
-
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "vertical",
-		step: 1
-	};
-	element.slider( options );
-
-	element.slider( "value", options.max - options.step );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal(element.slider( "value" ), options.max );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal(element.slider( "value" ), options.max );
-
-	element.slider( "destroy" );
-});
-
-test( "keydown RIGHT on handle increases value by step, not greater than max", function() {
-	expect( 4 );
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "horizontal",
-		step: 1
-	};
-	element.slider(options);
-
-	element.slider( "value", options.max - options.step );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal(element.slider( "value" ), options.max);
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal(element.slider( "value" ), options.max );
-
-	element.slider( "destroy" );
-
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "vertical",
-		step: 1
-	};
-	element.slider( options );
-
-	element.slider( "value", options.max - options.step );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal(element.slider( "value" ), options.max );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal(element.slider( "value" ), options.max );
-
-	element.slider( "destroy" );
-});
-
-test( "keydown DOWN on handle decreases value by step, not less than min", function() {
-	expect( 4 );
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "horizontal",
-		step: 1
-	};
-	element.slider( options );
-
-	element.slider( "value", options.min + options.step );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal(element.slider( "value" ), options.min);
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal(element.slider( "value" ), options.min );
-
-	element.slider( "destroy" );
-
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "vertical",
-		step: 1
-	};
-	element.slider( options );
-
-	element.slider( "value", options.min + options.step );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal(element.slider( "value" ), options.min);
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal(element.slider( "value" ), options.min );
-
-	element.slider( "destroy" );
-});
-
-test( "keydown LEFT on handle decreases value by step, not less than min", function() {
-	expect( 4 );
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "horizontal",
-		step: 1
-	};
-	element.slider(options);
-
-	element.slider( "value", options.min + options.step );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal(element.slider( "value" ), options.min );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal(element.slider( "value" ), options.min );
-
-	element.slider( "destroy" );
-
-	element = $( "<div></div>" );
-	options = {
-		max: 5,
-		min: -5,
-		orientation: "vertical",
-		step: 1
-	};
-	element.slider( options );
-
-	element.slider( "value", options.min + options.step );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal(element.slider( "value" ), options.min );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal(element.slider( "value" ), options.min );
-
-	element.slider( "destroy" );
-});
-
-} );
diff --git a/tests/unit/slider/slider_events.js b/tests/unit/slider/slider_events.js
deleted file mode 100644
index 0d22577f1..000000000
--- a/tests/unit/slider/slider_events.js
+++ /dev/null
@@ -1,208 +0,0 @@
-define( [
-	"jquery",
-	"ui/slider"
-], function( $ ) {
-
-module( "slider: events" );
-
-//Specs from http://wiki.jqueryui.com/Slider#specs
-//"change callback: triggers when the slider has stopped moving and has a new
-// value (even if same as previous value), via mouse(mouseup) or keyboard(keyup)
-// or value method/option"
-test( "mouse based interaction", function() {
-	expect( 4 );
-
-	var element = $( "#slider1" )
-		.slider({
-			start: function( event ) {
-				equal( event.originalEvent.type, "mousedown", "start triggered by mousedown" );
-			},
-			slide: function( event) {
-				equal( event.originalEvent.type, "mousemove", "slider triggered by mousemove" );
-			},
-			stop: function( event ) {
-				equal( event.originalEvent.type, "mouseup", "stop triggered by mouseup" );
-			},
-			change: function( event ) {
-				equal( event.originalEvent.type, "mouseup", "change triggered by mouseup" );
-			}
-		});
-
-	element.find( ".ui-slider-handle" ).eq( 0 )
-		.simulate( "drag", { dx: 10, dy: 10 } );
-
-});
-test( "keyboard based interaction", function() {
-	expect( 3 );
-
-	// Test keyup at end of handle slide (keyboard)
-	var element = $( "#slider1" )
-		.slider({
-			start: function( event ) {
-				equal( event.originalEvent.type, "keydown", "start triggered by keydown" );
-			},
-			slide: function() {
-				ok( false, "Slider never triggered by keys" );
-			},
-			stop: function( event ) {
-				equal( event.originalEvent.type, "keyup", "stop triggered by keyup" );
-			},
-			change: function( event ) {
-				equal( event.originalEvent.type, "keyup", "change triggered by keyup" );
-			}
-		});
-
-	element.find( ".ui-slider-handle" ).eq( 0 )
-		.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } )
-		.simulate( "keypress", { keyCode: $.ui.keyCode.LEFT } )
-		.simulate( "keyup", { keyCode: $.ui.keyCode.LEFT } );
-
-});
-test( "programmatic event triggers", function() {
-	expect( 6 );
-
-	// Test value method
-	var element = $( "<div></div>" )
-		.slider({
-			change: function() {
-				ok( true, "change triggered by value method" );
-			}
-		})
-		.slider( "value", 0 );
-
-	// Test values method
-	element = $( "<div></div>" )
-		.slider({
-			values: [ 10, 20 ],
-			change: function() {
-				ok( true, "change triggered by values method" );
-			}
-		})
-		.slider( "values", [ 80, 90 ] );
-
-	// Test value option
-	element = $( "<div></div>" )
-		.slider({
-			change: function() {
-				ok( true, "change triggered by value option" );
-			}
-		})
-		.slider( "option", "value", 0 );
-
-	// Test values option
-	element = $( "<div></div>" )
-		.slider({
-			values: [ 10, 20 ],
-			change: function() {
-				ok( true, "change triggered by values option" );
-			}
-		})
-		.slider( "option", "values", [ 80, 90 ] );
-
-});
-
-test( "mouse based interaction part two: when handles overlap", function() {
-	expect( 6 );
-
-	var element = $( "#slider1" )
-		.slider({
-			values: [ 0, 0, 0 ],
-			start: function( event, ui ) {
-				equal( handles.index( ui.handle ), 2, "rightmost handle activated when overlapping at minimum (#3736)" );
-			}
-		}),
-		handles = element.find( ".ui-slider-handle" );
-	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
-	element.slider( "destroy" );
-
-	element = $( "#slider1" )
-		.slider({
-			values: [ 10, 10, 10 ],
-			max: 10,
-			start: function( event, ui ) {
-				equal( handles.index( ui.handle ), 0, "leftmost handle activated when overlapping at maximum" );
-			}
-		}),
-		handles = element.find( ".ui-slider-handle" );
-	handles.eq( 0 ).simulate( "drag", { dx: -10 } );
-	element.slider( "destroy" );
-
-	element = $( "#slider1" )
-		.slider({
-			values: [ 19, 20 ]
-		}),
-		handles = element.find( ".ui-slider-handle" );
-	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
-	element.one( "slidestart", function( event, ui ) {
-		equal( handles.index( ui.handle ), 0, "left handle activated if left was moved last" );
-	});
-	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
-	element.slider( "destroy" );
-
-	element = $( "#slider1" )
-		.slider({
-			values: [ 19, 20 ]
-		}),
-		handles = element.find( ".ui-slider-handle" );
-	handles.eq( 1 ).simulate( "drag", { dx: -10 } );
-	element.one( "slidestart", function( event, ui ) {
-		equal( handles.index( ui.handle ), 1, "right handle activated if right was moved last (#3467)" );
-	});
-	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
-
-	element = $( "#slider1" )
-		.slider({
-			range: true,
-			min: 0,
-			max: 100,
-			values: [ 0, 50 ]
-		}),
-		handles = element.find( ".ui-slider-handle" );
-
-	element.slider( "option", { values: [ 100, 100 ] } );
-	handles.eq( 0 ).simulate( "drag", { dx: -10 } );
-	equal( element.slider( "values" )[ 0 ], 99, "setting both values of range slider to the maximum doesn't lock slider" );
-
-	element.slider( "option", { values: [ 0, 0 ] } );
-	handles.eq( 1 ).simulate( "drag", { dx: 10 } );
-	equal( element.slider( "values" )[ 1 ], 1, "setting both values of range slider to the minimum  doesn't lock slider" );
-});
-
-test( "event data", function() {
-	expect( 4 );
-
-	var slideHandleIndex = 3,
-		values = [ 8, 9, 7, 4 ],
-		newValues = [ 8, 9, 7, 5 ],
-		element = $( "#slider1" )
-			.slider({
-				values: values,
-				start: function( event, ui ) {
-					deepEqual( ui, expectedUiHash, "passing ui to start event" );
-				},
-				slide: function( event, ui ) {
-					deepEqual( ui, expectedChangedUiHash, "passing ui to slide event" );
-				},
-				stop: function( event, ui ) {
-					deepEqual( ui, expectedChangedUiHash, "passing ui to stop event" );
-				},
-				change: function( event, ui ) {
-					deepEqual( ui, expectedChangedUiHash, "passing ui to change event" );
-				}
-			}),
-		handles = element.find( ".ui-slider-handle" ),
-		expectedUiHash = {
-			handle: handles.eq( slideHandleIndex )[ 0 ],
-			handleIndex: slideHandleIndex,
-			values: values,
-			value: values[ slideHandleIndex ]
-		},
-		expectedChangedUiHash = $.extend( {}, expectedUiHash, {
-			values: newValues,
-			value: newValues[ slideHandleIndex ]
-		});
-
-	handles.eq( slideHandleIndex ).simulate( "drag", { dx: 10 } );
-});
-
-} );
diff --git a/tests/unit/slider/slider_methods.js b/tests/unit/slider/slider_methods.js
deleted file mode 100644
index bddafefca..000000000
--- a/tests/unit/slider/slider_methods.js
+++ /dev/null
@@ -1,116 +0,0 @@
-define( [
-	"jquery",
-	"ui/slider"
-], function( $ ) {
-
-module( "slider: methods" );
-
-test( "init", function() {
-	expect(5);
-
-	$( "<div></div>" ).appendTo( "body" ).slider().remove();
-	ok( true, ".slider() called on element" );
-
-	$( [] ).slider().remove();
-	ok( true, ".slider() called on empty collection" );
-
-	$( "<div></div>" ).slider().remove();
-	ok( true, ".slider() called on disconnected DOMElement" );
-
-	var element = $( "<div></div>" ).slider();
-	element.slider( "option", "foo" );
-	element.remove();
-	ok( true, "arbitrary option getter after init" );
-
-	$( "<div></div>" ).slider().slider( "option", "foo", "bar" ).remove();
-	ok( true, "arbitrary option setter after init" );
-});
-
-test( "destroy", function( assert ) {
-	expect( 1 );
-	assert.domEqual( "#slider1", function() {
-		$( "#slider1" ).slider().slider( "destroy" );
-	});
-});
-
-test( "enable", function( assert ) {
-	expect( 3 );
-	var element,
-		expected = $( "<div></div>" ).slider(),
-		actual = expected.slider( "enable" );
-	equal(actual, expected, "enable is chainable" );
-
-	element = $( "<div></div>" ).slider({ disabled: true });
-	assert.hasClasses( element, "ui-state-disabled ui-slider-disabled" );
-	element.slider( "enable" );
-	assert.lacksClasses( element, "ui-state-disabled ui-slider-disabled" );
-});
-
-test( "disable", function( assert ) {
-	expect( 4 );
-	var element,
-		expected = $( "<div></div>" ).slider(),
-		actual = expected.slider( "disable" );
-	equal(actual, expected, "disable is chainable" );
-
-	element = $( "<div></div>" ).slider({ disabled: false });
-	assert.lacksClasses( element, "ui-state-disabled ui-slider-disabled" );
-	element.slider( "disable" );
-	assert.hasClasses( element, "ui-state-disabled ui-slider-disabled" );
-	ok( !element.attr( "aria-disabled" ), "slider does not have aria-disabled attr after disable method call" );
-});
-
-test( "value", function() {
-	expect( 19 );
-	$( [ false, "min", "max" ] ).each(function() {
-		var element = $( "<div></div>" ).slider({
-			range: this,
-			value: 5
-		});
-		equal( element.slider( "value" ), 5, "range: " + this + " slider method get" );
-		equal( element.slider( "value", 10), element, "value method is chainable" );
-		equal( element.slider( "value" ), 10, "range: " + this + " slider method set" );
-		element.remove();
-	});
-	var element = $( "<div></div>" ).slider({
-		min: -1, value: 0, max: 1
-	});
-	// min with value option vs value method
-	element.slider( "option", "value", -2 );
-	equal( element.slider( "option", "value" ), -2, "value option does not respect min" );
-	equal( element.slider( "value" ), -1, "value method get respects min" );
-	equal( element.slider( "value", -2 ), element, "value method is chainable" );
-	equal( element.slider( "option", "value" ), -1, "value method set respects min" );
-	// max with value option vs value method
-	element.slider( "option", "value", 2);
-	equal( element.slider( "option", "value" ), 2, "value option does not respect max" );
-	equal( element.slider( "value" ), 1, "value method get respects max" );
-	equal( element.slider( "value", 2 ), element, "value method is chainable" );
-	equal( element.slider( "option", "value" ), 1, "value method set respects max" );
-
-	// set max value with step 0.01
-	element.slider( "option", {
-		min: 2,
-		value: 2,
-		max: 2.4,
-		step: 0.01
-	});
-	element.slider( "option", "value", 2.4 );
-	equal( element.slider( "value" ), 2.4, "value is set to max with 0.01 step" );
-
-	element = $( "<div></div>" ).slider({
-		value: 100,
-		min: 10,
-		max: 500,
-		step: 50
-	});
-
-	element.slider( "option", "value", 510 );
-	equal( element.slider( "value" ), 460, "value is restricted to maximum valid step" );
-});
-
-//test( "values", function() {
-//	ok(false, "missing test - untested code is broken code." );
-//});
-
-} );
diff --git a/tests/unit/slider/slider_options.js b/tests/unit/slider/slider_options.js
deleted file mode 100644
index 923c3c1c9..000000000
--- a/tests/unit/slider/slider_options.js
+++ /dev/null
@@ -1,349 +0,0 @@
-define( [
-	"jquery",
-	"ui/slider"
-], function( $ ) {
-
-var element, options;
-
-function handle() {
-	return element.find( ".ui-slider-handle" );
-}
-
-module( "slider: options" );
-
-test( "disabled", function( assert ){
-	expect( 8 );
-	var count = 0;
-
-	element = $( "#slider1" ).slider();
-	element.bind( "slidestart", function() {
-		count++;
-	});
-
-	// enabled
-	assert.lacksClasses( element, "ui-slider-disabled" );
-	equal( element.slider( "option", "disabled" ), false , "is not disabled" );
-
-	handle().simulate( "drag", { dx: 10 } );
-	equal( count, 1, "slider moved" );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal( count, 2, "slider moved" );
-
-	// disabled
-	element.slider( "option", "disabled", true );
-	assert.hasClasses( element, "ui-slider-disabled" );
-	equal( element.slider( "option", "disabled" ), true, "is disabled" );
-
-	handle().simulate( "drag", { dx: 10 } );
-	equal( count, 2, "slider did not move" );
-
-	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal( count, 2, "slider did not move" );
-});
-
-test( "max", function() {
-	expect( 5 );
-	element = $( "<div></div>" );
-
-	options = {
-		max: 37,
-		min: 6,
-		orientation: "horizontal",
-		step: 1,
-		value: 50
-	};
-
-	element.slider( options );
-	ok( element.slider( "option", "value" ) === options.value, "value option is not contained by max" );
-	ok( element.slider( "value" ) === options.max, "value method is contained by max" );
-
-	options = {
-		max: 9,
-		min: 1,
-		orientation: "horizontal",
-		step: 3,
-		value: 8.75
-	};
-
-	element.slider( options );
-	ok( element.slider( "value" ) === 7, "value method is within max, edge Case" );
-
-	options.step = 2;
-
-	element.slider( options );
-	ok( element.slider( "value" ) === options.max, "value method will max, step is changed" );
-	element.slider( "destroy" );
-
-	options = {
-		max: 60,
-		min: 50,
-		orientation: "horizontal",
-		step: 0.1,
-		value: 60
-	};
-
-	element.slider( options );
-	ok( element.slider( "value" ) === options.max, "value method will max, step is changed and step is float" );
-	element.slider( "destroy" );
-
-});
-
-test( "min", function() {
-	expect( 2 );
-	element = $( "<div></div>" );
-
-	options = {
-		max: 37,
-		min: 6,
-		orientation: "vertical",
-		step: 1,
-		value: 2
-	};
-
-	element.slider( options );
-	ok( element.slider( "option", "value" ) === options.value, "value option is not contained by min" );
-	ok( element.slider( "value" ) === options.min, "value method is contained by min" );
-	element.slider( "destroy" );
-
-});
-
-test( "orientation", function( assert ) {
-	expect( 8 );
-	element = $( "#slider1" );
-
-	options = {
-		max: 2,
-		min: -2,
-		orientation: "vertical",
-		value: 1
-	};
-
-	var percentVal = ( options.value - options.min ) / ( options.max - options.min ) * 100;
-
-	element.slider( options ).slider( "option", "orientation", "horizontal" );
-	assert.hasClasses( element, "ui-slider-horizontal" );
-	assert.lacksClasses( element, "ui-slider-vertical" );
-	equal( element.find( ".ui-slider-handle" )[ 0 ].style.bottom, "", "CSS bottom reset" );
-	equal( handle()[0].style.left, percentVal + "%", "horizontal slider handle is positioned with left: %" );
-
-	element.slider( "destroy" ) ;
-
-	options = {
-		max: 2,
-		min: -2,
-		orientation: "horizontal",
-		value: -1
-	};
-
-	percentVal = ( options.value - options.min ) / ( options.max - options.min ) * 100;
-
-	element.slider( options ).slider( "option", "orientation", "vertical" );
-	assert.hasClasses( element, "ui-slider-vertical" );
-	assert.lacksClasses( element, "ui-slider-horizontal" );
-	equal( element.find( ".ui-slider-handle" )[ 0 ].style.left, "", "CSS left reset" );
-	equal( handle()[0].style.bottom, percentVal + "%", "vertical slider handle is positioned with bottom: %" );
-
-	element.slider( "destroy" );
-
-});
-
-//spec: http://wiki.jqueryui.com/Slider#specs
-// value option/method: the value option is not restricted by min/max/step.
-// What is returned by the value method is restricted by min (>=), max (<=), and step (even multiple)
-test( "step", function() {
-	expect( 9 );
-	element = $( "<div></div>" ).slider({
-		min: 0,
-		value: 0,
-		step: 10,
-		max: 100
-	});
-	equal( element.slider( "value" ), 0 );
-
-	element.slider( "value", 1 );
-	equal( element.slider( "value" ), 0 );
-
-	element.slider( "value", 9 );
-	equal( element.slider( "value" ), 10 );
-
-	element.slider( "value", 11 );
-	equal( element.slider( "value" ), 10 );
-
-	element.slider( "value", 19 );
-	equal( element.slider( "value" ), 20 );
-
-	element = $( "<div></div>" ).slider({
-		min: 0,
-		value: 0,
-		step: 20,
-		max: 100
-	});
-	element.slider( "value", 0 );
-
-	element.slider( "option", "value", 1 );
-	equal( element.slider( "value" ), 0 );
-
-	element.slider( "option", "value", 9 );
-	equal( element.slider( "value" ), 0 );
-
-	element.slider( "option", "value", 11 );
-	equal( element.slider( "value" ), 20 );
-
-	element.slider( "option", "value", 19 );
-	equal( element.slider( "value" ), 20 );
-
-	element.slider( "destroy" );
-});
-
-//test( "value", function() {
-//	ok(false, "missing test - untested code is broken code." );
-//});
-
-test( "values", function() {
-	expect( 2 );
-
-	// testing multiple ranges on the same page, the object reference to the values
-	// property is preserved via multiple range elements, so updating options.values
-	// of 1 slider updates options.values of all the others
-	var ranges = $([
-		document.createElement( "div" ),
-		document.createElement( "div" )
-	]).slider({
-		range: true,
-		values: [ 25, 75 ]
-	});
-
-	notStrictEqual(
-		ranges.eq( 0 ).slider( "instance" ).options.values,
-		ranges.eq( 1 ).slider( "instance" ).options.values,
-		"multiple range sliders should not have a reference to the same options.values array"
-	);
-
-	ranges.eq( 0 ).slider( "values", 0, 10 );
-
-	notEqual(
-		ranges.eq( 0 ).slider( "values", 0 ),
-		ranges.eq( 1 ).slider( "values", 0 ),
-		"the values for multiple sliders should be different"
-	);
-});
-
-test( "range", function( assert ) {
-	expect( 32 );
-	var range;
-
-	// min
-	element = $( "<div></div>" ).slider({
-		range: "min",
-		min: 1,
-		max: 10,
-		step: 1
-	});
-
-	equal( element.find( ".ui-slider-handle" ).length, 1, "range min, one handle" );
-	equal( element.find( ".ui-slider-range-min" ).length, 1, "range min" );
-	element.slider( "destroy" );
-
-	// max
-	element = $( "<div></div>" ).slider({
-		range: "max",
-		min: 1,
-		max: 10,
-		step: 1
-	});
-
-	equal( element.find( ".ui-slider-handle" ).length, 1, "range max, one handle" );
-	equal( element.find( ".ui-slider-range-max" ).length, 1, "range max" );
-	element.slider( "destroy" );
-
-	// true
-	element = $( "<div></div>" ).slider({
-		range: true,
-		min: 1,
-		max: 10,
-		step: 1
-	});
-
-	range = element.find( ".ui-slider-range" );
-	equal( element.find( ".ui-slider-handle" ).length, 2, "range true, two handles" );
-	assert.lacksClasses( range, "ui-slider-range-max ui-slider-range-min" );
-	element.slider( "destroy" );
-
-	// Change range from min to max
-	element = $( "<div></div>" ).slider({
-		range: "min",
-		min: 1,
-		max: 10,
-		step: 1
-	}).slider( "option", "range", "max" );
-
-	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from min to max, one handle" );
-	equal( element.find( ".ui-slider-range-min" ).length, 0, "range switch from min to max" );
-	equal( element.find( ".ui-slider-range-max" ).length, 1, "range switch from min to max" );
-	element.slider( "destroy" );
-
-	// Change range from max to min
-	element = $( "<div></div>" ).slider({
-		range: "max",
-		min: 1,
-		max: 10,
-		step: 1
-	}).slider( "option", "range", "min" );
-
-	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from max to min, one handle" );
-	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from max to min" );
-	equal( element.find( ".ui-slider-range-min" ).length, 1, "range switch from max to min" );
-	element.slider( "destroy" );
-
-	// Change range from max to true
-	element = $( "<div></div>" ).slider({
-		range: "max",
-		min: 1,
-		max: 10,
-		step: 1
-	}).slider( "option", "range", true );
-
-	equal( element.find( ".ui-slider-handle" ).length, 2, "range switch from max to true, two handles" );
-	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from max to true" );
-	equal( element.find( ".ui-slider-range-min" ).length, 0, "range switch from max to true" );
-	equal( element.slider( "option", "value" ), 0 , "option value" );
-	equal( element.slider( "value" ), 1 , "value" );
-	deepEqual( element.slider( "option", "values" ), [1, 1], "option values" );
-	deepEqual( element.slider( "values" ), [1, 1], "values" );
-	element.slider( "destroy" );
-
-	// Change range from true to min
-	element = $( "<div></div>" ).slider({
-		range: true,
-		min: 1,
-		max: 10,
-		step: 1
-	}).slider( "option", "range", "min" );
-
-	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from true to min, one handle" );
-	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from true to min" );
-	equal( element.find( ".ui-slider-range-min" ).length, 1, "range switch from true to min" );
-	equal( element.slider( "option", "value" ), 1, "value" );
-	equal( element.slider( "value" ), 1 , "value" );
-	equal( element.slider( "option", "values" ), null, "values" );
-	deepEqual( element.slider( "values" ), [] , "values" );
-	element.slider( "destroy" );
-
-	// Change range from true to false
-	element = $( "<div></div>" ).slider({
-		range: true,
-		min: 1,
-		max: 10,
-		step: 1
-	}).slider( "option", "range", false );
-	equal( element.find( ".ui-slider-handle" ).length, 2, "range switch from true to false, both handles remain" );
-	equal( element.find( ".ui-slider-range" ).length, 0, "range switch from true to false" );
-	equal( element.slider( "option", "value" ), 0 , "option value" );
-	equal( element.slider( "value" ), 1 , "value" );
-	deepEqual( element.slider( "option", "values" ), [1, 1], "option values" );
-	deepEqual( element.slider( "values" ), [1, 1], "values" );
-	element.slider( "destroy" );
-});
-
-} );
diff --git a/tests/unit/sortable/common.js b/tests/unit/sortable/common.js
new file mode 100644
index 000000000..ab43251ab
--- /dev/null
+++ b/tests/unit/sortable/common.js
@@ -0,0 +1,53 @@
+define( [
+	"lib/common",
+	"ui/sortable"
+], function( common ) {
+
+common.testWidget( "sortable", {
+	defaults: {
+		appendTo: "parent",
+		axis: false,
+		cancel: "input, textarea, button, select, option",
+		classes: {},
+		connectWith: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		delay: 0,
+		disabled: false,
+		distance: 1,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: "> *",
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000,
+
+		// callbacks
+		activate: null,
+		beforeStop: null,
+		change: null,
+		create: null,
+		deactivate: null,
+		out: null,
+		over: null,
+		receive: null,
+		remove: null,
+		sort: null,
+		start: null,
+		stop: null,
+		update: null
+	}
+});
+
+} );
diff --git a/tests/unit/sortable/core.js b/tests/unit/sortable/core.js
new file mode 100644
index 000000000..7e973ec05
--- /dev/null
+++ b/tests/unit/sortable/core.js
@@ -0,0 +1,42 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/sortable"
+], function( $, testHelper ) {
+
+module( "sortable: core" );
+
+test( "#9314: Sortable: Items cannot be dragged directly into bottom position", function() {
+	expect( 1 );
+
+	var el = $( ".connectWith" ).sortable({
+			connectWith: ".connectWith"
+		});
+
+	testHelper.sort( $( "li", el[ 1 ] )[ 0 ], 0, -12, 5, "Dragging the sortable into connected sortable" );
+});
+
+test( "ui-sortable-handle applied to appropriate element", function( assert ) {
+	expect( 8 );
+	var item = "<li><p></p></li>",
+		el = $( "<ul>" + item + item + "</ul>" )
+			.sortable()
+			.appendTo( "#qunit-fixture" );
+
+	assert.hasClasses( el.find( "li:first" ), "ui-sortable-handle" );
+	assert.hasClasses( el.find( "li:last" ), "ui-sortable-handle" );
+
+	el.sortable( "option", "handle", "p" );
+	assert.lacksClasses( el.find( "li" )[ 0 ], "ui-sortable-handle" );
+	assert.lacksClasses( el.find( "li" )[ 1 ], "ui-sortable-handle" );
+	assert.hasClasses( el.find( "p" )[ 0 ], "ui-sortable-handle" );
+	assert.hasClasses( el.find( "p" )[ 1 ], "ui-sortable-handle" );
+
+	el.append( item ).sortable( "refresh" );
+	assert.hasClasses( el.find( "p:last" ), "ui-sortable-handle" );
+
+	el.sortable( "destroy" );
+	equal( el.find( ".ui-sortable-handle" ).length, 0, "class name removed on destroy" );
+});
+
+} );
diff --git a/tests/unit/sortable/events.js b/tests/unit/sortable/events.js
new file mode 100644
index 000000000..174da203d
--- /dev/null
+++ b/tests/unit/sortable/events.js
@@ -0,0 +1,378 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/sortable",
+	"ui/draggable"
+], function( $, testHelper ) {
+
+module("sortable: events");
+
+test("start", function() {
+	expect( 7 );
+
+	var hash;
+	$("#sortable").sortable({
+		start: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 10
+	});
+
+	ok(hash, "start event triggered");
+	ok(hash.helper, "UI hash includes: helper");
+	ok(hash.placeholder, "UI hash includes: placeholder");
+	ok(hash.item, "UI hash includes: item");
+	ok(!hash.sender, "UI hash does not include: sender");
+
+	// todo: see if these events should actually have sane values in them
+	ok("position" in hash, "UI hash includes: position");
+	ok("offset" in hash, "UI hash includes: offset");
+});
+
+test("sort", function() {
+	expect( 7 );
+
+	var hash;
+	$("#sortable").sortable({
+		sort: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 10
+	});
+
+	ok(hash, "sort event triggered");
+	ok(hash.helper, "UI hash includes: helper");
+	ok(hash.placeholder, "UI hash includes: placeholder");
+	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
+	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
+	ok(hash.item, "UI hash includes: item");
+	ok(!hash.sender, "UI hash does not include: sender");
+
+});
+
+test("change", function() {
+	expect( 8 );
+
+	var hash;
+	$("#sortable").sortable({
+		change: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+
+	ok(!hash, "1px drag, change event should not be triggered");
+
+	$("#sortable").sortable({
+		change: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 22
+	});
+
+	ok(hash, "change event triggered");
+	ok(hash.helper, "UI hash includes: helper");
+	ok(hash.placeholder, "UI hash includes: placeholder");
+	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
+	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
+	ok(hash.item, "UI hash includes: item");
+	ok(!hash.sender, "UI hash does not include: sender");
+
+});
+
+test("beforeStop", function() {
+	expect( 7 );
+
+	var hash;
+	$("#sortable").sortable({
+		beforeStop: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 20
+	});
+
+	ok(hash, "beforeStop event triggered");
+	ok(hash.helper, "UI hash includes: helper");
+	ok(hash.placeholder, "UI hash includes: placeholder");
+	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
+	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
+	ok(hash.item, "UI hash includes: item");
+	ok(!hash.sender, "UI hash does not include: sender");
+
+});
+
+test("stop", function() {
+	expect( 7 );
+
+	var hash;
+	$("#sortable").sortable({
+		stop: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 20
+	});
+
+	ok(hash, "stop event triggered");
+	ok(!hash.helper, "UI should not include: helper");
+	ok(hash.placeholder, "UI hash includes: placeholder");
+	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
+	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
+	ok(hash.item, "UI hash includes: item");
+	ok(!hash.sender, "UI hash does not include: sender");
+
+});
+
+test("update", function() {
+	expect( 8 );
+
+	var hash;
+	$("#sortable").sortable({
+		update: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+
+	ok(!hash, "1px drag, update event should not be triggered");
+
+	$("#sortable").sortable({
+		update: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 22
+	});
+
+	ok(hash, "update event triggered");
+	ok(!hash.helper, "UI hash should not include: helper");
+	ok(hash.placeholder, "UI hash includes: placeholder");
+	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
+	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
+	ok(hash.item, "UI hash includes: item");
+	ok(!hash.sender, "UI hash does not include: sender");
+
+});
+
+test("#3019: Stop fires too early", function() {
+	expect(2);
+
+	var helper = null,
+		el = $("#sortable").sortable({
+			stop: function(event, ui) {
+				helper = ui.helper;
+			}
+		});
+
+	testHelper.sort($("li", el)[0], 0, 44, 2, "Dragging the sortable");
+	equal(helper, null, "helper should be false");
+
+});
+
+test("#4752: link event firing on sortable with connect list", function () {
+	expect( 10 );
+
+	var fired = {},
+		hasFired = function (type) { return (type in fired) && (true === fired[type]); };
+
+	$("#sortable").clone().attr("id", "sortable2").insertAfter("#sortable");
+
+	$("#qunit-fixture ul").sortable({
+		connectWith: "#qunit-fixture ul",
+		change: function () {
+			fired.change = true;
+		},
+		receive: function () {
+			fired.receive = true;
+		},
+		remove: function () {
+			fired.remove = true;
+		}
+	});
+
+	$("#qunit-fixture ul").bind("click.ui-sortable-test", function () {
+		fired.click = true;
+	});
+
+	$("#sortable li:eq(0)").simulate("click");
+	ok(!hasFired("change"), "Click only, change event should not have fired");
+	ok(hasFired("click"), "Click event should have fired");
+
+	// Drag an item within the first list
+	fired = {};
+	$("#sortable li:eq(0)").simulate("drag", { dx: 0, dy: 40 });
+	ok(hasFired("change"), "40px drag, change event should have fired");
+	ok(!hasFired("receive"), "Receive event should not have fired");
+	ok(!hasFired("remove"), "Remove event should not have fired");
+	ok(!hasFired("click"), "Click event should not have fired");
+
+	// Drag an item from the first list to the second, connected list
+	fired = {};
+	$("#sortable li:eq(0)").simulate("drag", { dx: 0, dy: 150 });
+	ok(hasFired("change"), "150px drag, change event should have fired");
+	ok(hasFired("receive"), "Receive event should have fired");
+	ok(hasFired("remove"), "Remove event should have fired");
+	ok(!hasFired("click"), "Click event should not have fired");
+});
+
+/*
+test("receive", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("remove", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+*/
+
+test( "over", function() {
+	expect( 8 );
+
+	var hash,
+		overCount = 0;
+
+	$( "#sortable" ).sortable({
+		over: function( e, ui ) {
+			hash = ui;
+			overCount++;
+		}
+	}).find( "li:eq(0)" ).simulate( "drag", {
+		dy: 20
+	});
+
+	ok( hash, "over event triggered" );
+	ok( hash.helper, "UI includes: helper" );
+	ok( hash.placeholder, "UI hash includes: placeholder" );
+	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	ok( hash.item, "UI hash includes: item" );
+	ok( hash.sender, "UI hash includes: sender" );
+	equal( overCount, 1, "over fires only once" );
+});
+
+// http://bugs.jqueryui.com/ticket/9335
+// Sortable: over & out events does not consistently fire
+test( "over, fires with draggable connected to sortable", function() {
+	expect( 3 );
+
+	var hash,
+		overCount = 0,
+		item = $( "<div></div>" ).text( "6" ).insertAfter( "#sortable" );
+
+	item.draggable({
+		connectToSortable: "#sortable"
+	});
+	$( ".connectWith" ).sortable({
+		connectWith: ".connectWith",
+		over: function( event, ui ) {
+			hash = ui;
+			overCount++;
+		}
+	});
+
+	item.simulate( "drag", {
+		dy: -20
+	});
+
+	ok( hash, "over event triggered" );
+	ok( !hash.sender, "UI should not include: sender" );
+	equal( overCount, 1, "over fires only once" );
+});
+
+test( "over, with connected sortable", function() {
+	expect( 3 );
+
+	var hash,
+		overCount = 0;
+
+	$( ".connectWith" ).sortable({
+		connectWith: ".connectWith"
+	});
+	$( "#sortable2" ).on( "sortover", function( event, ui ) {
+		hash = ui;
+		overCount++;
+	});
+	$( "#sortable" ).find( "li:eq(0)" ).simulate( "drag", {
+		dy: 102
+	});
+
+	ok( hash, "over event triggered" );
+	equal( hash.sender[ 0 ], $(" #sortable" )[ 0 ], "UI includes: sender" );
+	equal( overCount, 1, "over fires only once" );
+});
+
+/*
+test("out", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+*/
+
+test( "out, with connected sortable", function() {
+	expect( 2 );
+
+	var hash,
+		outCount = 0;
+
+	$( ".connectWith" ).sortable({
+		connectWith: ".connectWith"
+	});
+	$( "#sortable" ).on( "sortout", function( event, ui ) {
+		hash = ui;
+		outCount++;
+	});
+	$( "#sortable" ).find( "li:last" ).simulate( "drag", {
+		dy: 40
+	});
+
+	ok( hash, "out event triggered" );
+	equal( outCount, 1, "out fires only once" );
+});
+
+test( "repeated out & over between connected sortables", function() {
+	expect( 2 );
+
+	var outCount = 0,
+		overCount = 0;
+
+	$( ".connectWith" ).sortable({
+		connectWith: ".connectWith",
+		over: function() {
+			overCount++;
+		},
+		out: function( event, ui ) {
+			// Ignore events that trigger when an item has dropped
+			// checking for the presence of the helper.
+			if ( !ui.helper ) {
+				outCount++;
+			}
+		}
+	});
+	$( "#sortable" ).find( "li:last" ).simulate( "drag", {
+		dy: 40
+	}).simulate( "drag", {
+		dy: -40
+	});
+
+	equal( outCount, 2, "out fires twice" );
+	equal( overCount, 4, "over fires four times" );
+});
+
+/*
+test("activate", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("deactivate", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+*/
+
+} );
diff --git a/tests/unit/sortable/helper.js b/tests/unit/sortable/helper.js
new file mode 100644
index 000000000..76545022e
--- /dev/null
+++ b/tests/unit/sortable/helper.js
@@ -0,0 +1,16 @@
+define( [
+	"jquery",
+	"lib/helper"
+], function( $, helper ) {
+
+return $.extend( helper, {
+	sort: function( handle, dx, dy, index, msg ) {
+		$( handle ).simulate( "drag", {
+			dx: dx,
+			dy: dy
+		});
+		equal( $( handle ).parent().children().index( handle ), index, msg );
+	}
+} );
+
+} );
diff --git a/tests/unit/sortable/methods.js b/tests/unit/sortable/methods.js
new file mode 100644
index 000000000..d88b8089f
--- /dev/null
+++ b/tests/unit/sortable/methods.js
@@ -0,0 +1,129 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/sortable"
+], function( $, testHelper ) {
+
+module("sortable: methods");
+
+test("init", function() {
+	expect(5);
+
+	$("<div></div>").appendTo("body").sortable().remove();
+	ok(true, ".sortable() called on element");
+
+	$([]).sortable();
+	ok(true, ".sortable() called on empty collection");
+
+	$("<div></div>").sortable();
+	ok(true, ".sortable() called on disconnected DOMElement");
+
+	$("<div></div>").sortable().sortable("option", "foo");
+	ok(true, "arbitrary option getter after init");
+
+	$("<div></div>").sortable().sortable("option", "foo", "bar");
+	ok(true, "arbitrary option setter after init");
+});
+
+test("destroy", function() {
+	expect(4);
+	$("<div></div>").appendTo("body").sortable().sortable("destroy").remove();
+	ok(true, ".sortable('destroy') called on element");
+
+	$([]).sortable().sortable("destroy");
+	ok(true, ".sortable('destroy') called on empty collection");
+
+	$("<div></div>").sortable().sortable("destroy");
+	ok(true, ".sortable('destroy') called on disconnected DOMElement");
+
+	var expected = $("<div></div>").sortable(),
+		actual = expected.sortable("destroy");
+	equal(actual, expected, "destroy is chainable");
+});
+
+test("enable", function() {
+	expect(5);
+
+	var el, actual, expected;
+
+	el = $("#sortable").sortable({ disabled: true });
+
+	testHelper.sort($("li", el)[0], 0, 44, 0, ".sortable({ disabled: true })");
+
+	el.sortable("enable");
+	equal(el.sortable("option", "disabled"), false, "disabled option getter");
+
+	el.sortable("destroy");
+	el.sortable({ disabled: true });
+	el.sortable("option", "disabled", false);
+	equal(el.sortable("option", "disabled"), false, "disabled option setter");
+
+	testHelper.sort($("li", el)[0], 0, 44, 2, ".sortable('option', 'disabled', false)");
+
+	expected = $("<div></div>").sortable(),
+	actual = expected.sortable("enable");
+	equal(actual, expected, "enable is chainable");
+});
+
+test( "disable", function( assert ) {
+	expect( 9 );
+
+	var chainable,
+		element = $( "#sortable" ).sortable({ disabled: false });
+
+	testHelper.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" );
+
+	chainable = element.sortable( "disable" );
+	testHelper.sort( $( "li", element )[ 0 ], 0, 44, 0, "disabled.sortable getter" );
+
+	element.sortable( "destroy" );
+
+	element.sortable({ disabled: false });
+	testHelper.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" );
+	element.sortable( "option", "disabled", true);
+	equal( element.sortable( "option", "disabled" ), true, "disabled option setter" );
+
+	assert.lacksClasses( element.sortable( "widget" ), "ui-state-disabled" );
+	ok( !element.sortable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
+	assert.hasClasses( element.sortable( "widget" ), "ui-sortable-disabled" );
+
+	testHelper.sort($( "li", element )[ 0 ], 0, 44, 0, ".sortable('option', 'disabled', true)" );
+	equal( chainable, element, "disable is chainable" );
+});
+
+test( "refresh() should update the positions of initially empty lists (see #7498)", function() {
+	expect( 1 );
+
+	var changeCount = 0,
+		element = $( "#qunit-fixture" ).html( "<ul></ul>" ).find( "ul" );
+
+	element
+		.css({
+			"float": "left",
+			width: "100px"
+		})
+		.sortable({
+			change: function() {
+				changeCount++;
+			}
+		})
+		.append( "<li>a</li><li>a</li>" )
+		.find( "li" )
+			.css({
+				"float": "left",
+				width: "50px",
+				height: "50px"
+			});
+
+	element.sortable( "refresh" );
+
+	// Switch the order of the two li elements
+	element.find( "li" ).eq( 0 ).simulate( "drag", {
+		dx: 55,
+		moves: 15
+	});
+
+	equal( changeCount, 1 );
+});
+
+} );
diff --git a/tests/unit/sortable/options.js b/tests/unit/sortable/options.js
new file mode 100644
index 000000000..930f339e6
--- /dev/null
+++ b/tests/unit/sortable/options.js
@@ -0,0 +1,496 @@
+define( [
+	"jquery",
+	"ui/sortable"
+], function( $ ) {
+
+module("sortable: options");
+
+/*
+test("{ appendTo: 'parent' }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ appendTo: Selector }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+*/
+
+test( "{ axis: false }, default", function() {
+	expect( 2 );
+
+	var offsetAfter,
+		element = $( "#sortable" ).sortable({
+			axis: false,
+			change: function() {
+				offsetAfter = item.offset();
+				notEqual( offsetAfter.left, offsetBefore.left, "x axis not constrained when axis: false" );
+				notEqual( offsetAfter.top, offsetBefore.top, "y axis not constrained when axis: false" );
+			}
+		}),
+		item = element.find( "li" ).eq( 0 ),
+		offsetBefore = item.offset();
+
+	item.simulate( "drag", {
+		dx: 50,
+		dy: 25,
+		moves: 1
+	});
+});
+
+test( "{ axis: 'x' }", function() {
+	expect( 2 );
+
+	var offsetAfter,
+		element = $( "#sortable" ).sortable({
+			axis: "x",
+			change: function() {
+				offsetAfter = item.offset();
+				notEqual( offsetAfter.left, offsetBefore.left, "x axis not constrained when axis: x" );
+				equal( offsetAfter.top, offsetBefore.top, "y axis constrained when axis: x" );
+			}
+		}),
+		item = element.find( "li" ).eq( 0 ),
+		offsetBefore = item.offset();
+
+	item.simulate( "drag", {
+		dx: 50,
+		dy: 25,
+		moves: 1
+	});
+});
+
+test( "{ axis: 'y' }", function() {
+	expect( 2 );
+
+	var offsetAfter,
+		element = $( "#sortable" ).sortable({
+			axis: "y",
+			change: function() {
+				offsetAfter = item.offset();
+				equal( offsetAfter.left, offsetBefore.left, "x axis constrained when axis: y" );
+				notEqual( offsetAfter.top, offsetBefore.top, "y axis not constrained when axis: y" );
+			}
+		}),
+		item = element.find( "li" ).eq( 0 ),
+		offsetBefore = item.offset();
+
+	item.simulate( "drag", {
+		dx: 50,
+		dy: 25,
+		moves: 1
+	});
+});
+
+asyncTest( "#7415: Incorrect revert animation with axis: 'y'", function() {
+  expect( 2 );
+	var expectedLeft,
+		element = $( "#sortable" ).sortable({
+			axis: "y",
+			revert: true,
+			stop: start,
+			sort: function() {
+				expectedLeft = item.css( "left" );
+			}
+		}),
+		item = element.find( "li" ).eq( 0 );
+
+	item.simulate( "drag", {
+		dy: 300,
+		dx: 50
+	});
+
+	setTimeout(function() {
+		var top = parseFloat( item.css( "top" ) );
+		equal( item.css( "left" ), expectedLeft, "left not animated" );
+		ok( top > 0 && top < 300, "top is animated" );
+	}, 100 );
+});
+
+/*
+test("{ cancel: 'input,textarea,button,select,option' }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ cancel: Selector }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+*/
+
+test( "#8792: issues with floated items in connected lists", function() {
+	expect( 2 );
+
+	var element,
+		changeCount = 0;
+
+	$( "#qunit-fixture" )
+		.html( "<ul class='c'><li>a</li><li>a</li></ul><ul class='c'><li>a</li><li>a</li></ul>" )
+		.find( "ul" ).css({ "float": "left", width: "100px" }).end()
+		.find( "li" ).css({ "float": "left", width: "50px", height: "50px" });
+
+	$( "#qunit-fixture .c" ).sortable({
+		connectWith: "#qunit-fixture .c",
+		change: function() {
+			changeCount++;
+		}
+	});
+
+	element = $( "#qunit-fixture li:eq(0)" );
+
+	// move the first li to the right of the second li in the first ul
+	element.simulate( "drag", {
+		dx: 55,
+		moves: 15
+	});
+
+	equal( changeCount, 1, "change fired only once (no jitters) when dragging a floated sortable in it's own container" );
+
+	// move the first li ( which is now in the second spot )
+	// through the first spot in the second ul to the second spot in the second ul
+	element.simulate( "drag", {
+		dx: 100,
+		moves: 15
+	});
+
+	equal( changeCount, 3, "change fired once for each expected change when dragging a floated sortable to a connected container" );
+});
+
+test( "#8301: single axis with connected list", function() {
+	expect( 1 );
+
+	var element = $( "#sortable" ).sortable({
+		axis: "y",
+		tolerance: "pointer",
+		connectWith: ".connected"
+	});
+
+	$( "<ul class='connected'><li>Item 7</li><li>Item 8</li></ul>" )
+		.sortable({
+			axis: "y",
+			tolerance: "pointer",
+			connectWith: "#sortable",
+			receive: function() {
+				ok( true, "connected list received item" );
+			}
+		})
+		.insertAfter( element );
+
+	element.find( "li" ).eq( 0 ).simulate( "drag", {
+		handle: "corner",
+		dy: 120,
+		moves: 1
+	});
+});
+
+/*
+test("{ connectWith: false }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ connectWith: Selector }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ containment: false }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ containment: Element }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ containment: 'document' }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ containment: 'parent' }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ containment: 'window' }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ containment: Selector }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ cursor: 'auto' }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ cursor: 'move' }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ cursorAt: false }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ cursorAt: true }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ delay: 0 }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ delay: 100 }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ distance: 1 }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ distance: 10 }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ dropOnEmpty: true }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ dropOnEmpty: false }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ forcePlaceholderSize: false }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ forcePlaceholderSize: true }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ forceHelperSize: false }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ forceHelperSize: true }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ grid: false }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ grid: [17, 3] }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ grid: [3, 7] }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ handle: false }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ handle: Element }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ handle: Selector }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ helper: 'original' }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ helper: Function }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ items: '> *' }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ items: Selector }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ opacity: false }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ opacity: .37 }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ opacity: 1 }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ placeholder: false }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+*/
+
+test( "{ placeholder: false } img", function() {
+	expect( 3 );
+
+	var element = $( "#sortable-images" ).sortable({
+		start: function( event, ui ) {
+			ok( ui.placeholder.attr( "src" ).indexOf( "images/jqueryui_32x32.png" ) > 0, "placeholder img has correct src" );
+			equal( ui.placeholder.height(), 32, "placeholder has correct height" );
+			equal( ui.placeholder.width(), 32, "placeholder has correct width" );
+		}
+	});
+
+	element.find( "img" ).eq( 0 ).simulate( "drag", {
+		dy: 1
+	});
+});
+
+test( "{ placeholder: String }", function( assert ) {
+	expect( 1 );
+
+	var element = $( "#sortable" ).sortable({
+		placeholder: "test",
+		start: function( event, ui ) {
+			assert.hasClasses( ui.placeholder, "test" );
+		}
+	});
+
+	element.find( "li" ).eq( 0 ).simulate( "drag", {
+		dy: 1
+	});
+});
+
+test( "{ placholder: String } tr", function( assert ) {
+	expect( 4 );
+
+	var originalWidths,
+		element = $( "#sortable-table tbody" ).sortable({
+			placeholder: "test",
+			start: function( event, ui ) {
+				var currentWidths = otherRow.children().map(function() {
+					return $( this ).width();
+				}).get();
+				assert.hasClasses( ui.placeholder, "test" );
+				deepEqual( currentWidths, originalWidths, "table cells maintian size" );
+				equal( ui.placeholder.children().length, dragRow.children().length,
+					"placeholder has correct number of cells" );
+				equal( ui.placeholder.children().html(), $( "<span>&#160;</span>" ).html(),
+					"placeholder td has content for forced dimensions" );
+			}
+		}),
+		rows = element.children( "tr" ),
+		dragRow = rows.eq( 0 ),
+		otherRow = rows.eq( 1 );
+
+	originalWidths = otherRow.children().map(function() {
+		return $( this ).width();
+	}).get();
+	dragRow.simulate( "drag", {
+		dy: 1
+	});
+});
+
+test( "{ placholder: String } tbody", function() {
+	expect( 6 );
+
+	var originalWidths,
+		element = $( "#sortable-table" ).sortable({
+			placeholder: "test",
+			start: function( event, ui ) {
+				var currentWidths = otherBody.children().map(function() {
+					return $( this ).width();
+				}).get();
+				ok( ui.placeholder.hasClass( "test" ), "placeholder has class" );
+				deepEqual( currentWidths, originalWidths, "table cells maintain size" );
+				equal( ui.placeholder.children().length, 1,
+					"placeholder has one child" );
+				equal( ui.placeholder.children( "tr" ).length, 1,
+					"placeholder's child is tr" );
+				equal( ui.placeholder.find( "> tr" ).children().length,
+					dragBody.find( "> tr:first" ).children().length,
+					"placeholder's tr has correct number of cells" );
+				equal( ui.placeholder.find( "> tr" ).children().html(),
+					$( "<span>&#160;</span>" ).html(),
+					"placeholder td has content for forced dimensions" );
+			}
+		}),
+		bodies = element.children( "tbody" ),
+		dragBody = bodies.eq( 0 ),
+		otherBody = bodies.eq( 1 );
+
+	originalWidths = otherBody.children().map(function() {
+		return $( this ).width();
+	}).get();
+	dragBody.simulate( "drag", {
+		dy: 1
+	});
+});
+
+/*
+test("{ revert: false }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ revert: true }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ scroll: true }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ scroll: false }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ scrollSensitivity: 20 }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ scrollSensitivity: 2 }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ scrollSensitivity: 200 }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ scrollSpeed: 20 }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ scrollSpeed: 2 }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ scrollSpeed: 200 }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ scope: 'default' }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ scope: ??? }, unexpected", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ tolerance: 'intersect' }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ tolerance: 'pointer' }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ zIndex: 1000 }, default", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ zIndex: 1 }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+
+test("{ zIndex: false }", function() {
+	ok(false, "missing test - untested code is broken code.");
+});
+*/
+} );
diff --git a/tests/unit/sortable/sortable_common.js b/tests/unit/sortable/sortable_common.js
deleted file mode 100644
index ab43251ab..000000000
--- a/tests/unit/sortable/sortable_common.js
+++ /dev/null
@@ -1,53 +0,0 @@
-define( [
-	"lib/common",
-	"ui/sortable"
-], function( common ) {
-
-common.testWidget( "sortable", {
-	defaults: {
-		appendTo: "parent",
-		axis: false,
-		cancel: "input, textarea, button, select, option",
-		classes: {},
-		connectWith: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		delay: 0,
-		disabled: false,
-		distance: 1,
-		dropOnEmpty: true,
-		forcePlaceholderSize: false,
-		forceHelperSize: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		items: "> *",
-		opacity: false,
-		placeholder: false,
-		revert: false,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		tolerance: "intersect",
-		zIndex: 1000,
-
-		// callbacks
-		activate: null,
-		beforeStop: null,
-		change: null,
-		create: null,
-		deactivate: null,
-		out: null,
-		over: null,
-		receive: null,
-		remove: null,
-		sort: null,
-		start: null,
-		stop: null,
-		update: null
-	}
-});
-
-} );
diff --git a/tests/unit/sortable/sortable_core.js b/tests/unit/sortable/sortable_core.js
deleted file mode 100644
index 64bdb661e..000000000
--- a/tests/unit/sortable/sortable_core.js
+++ /dev/null
@@ -1,42 +0,0 @@
-define( [
-	"jquery",
-	"./sortable_test_helpers",
-	"ui/sortable"
-], function( $, testHelper ) {
-
-module( "sortable: core" );
-
-test( "#9314: Sortable: Items cannot be dragged directly into bottom position", function() {
-	expect( 1 );
-
-	var el = $( ".connectWith" ).sortable({
-			connectWith: ".connectWith"
-		});
-
-	testHelper.sort( $( "li", el[ 1 ] )[ 0 ], 0, -12, 5, "Dragging the sortable into connected sortable" );
-});
-
-test( "ui-sortable-handle applied to appropriate element", function( assert ) {
-	expect( 8 );
-	var item = "<li><p></p></li>",
-		el = $( "<ul>" + item + item + "</ul>" )
-			.sortable()
-			.appendTo( "#qunit-fixture" );
-
-	assert.hasClasses( el.find( "li:first" ), "ui-sortable-handle" );
-	assert.hasClasses( el.find( "li:last" ), "ui-sortable-handle" );
-
-	el.sortable( "option", "handle", "p" );
-	assert.lacksClasses( el.find( "li" )[ 0 ], "ui-sortable-handle" );
-	assert.lacksClasses( el.find( "li" )[ 1 ], "ui-sortable-handle" );
-	assert.hasClasses( el.find( "p" )[ 0 ], "ui-sortable-handle" );
-	assert.hasClasses( el.find( "p" )[ 1 ], "ui-sortable-handle" );
-
-	el.append( item ).sortable( "refresh" );
-	assert.hasClasses( el.find( "p:last" ), "ui-sortable-handle" );
-
-	el.sortable( "destroy" );
-	equal( el.find( ".ui-sortable-handle" ).length, 0, "class name removed on destroy" );
-});
-
-} );
diff --git a/tests/unit/sortable/sortable_events.js b/tests/unit/sortable/sortable_events.js
deleted file mode 100644
index 453b8b7b6..000000000
--- a/tests/unit/sortable/sortable_events.js
+++ /dev/null
@@ -1,378 +0,0 @@
-define( [
-	"jquery",
-	"./sortable_test_helpers",
-	"ui/sortable",
-	"ui/draggable"
-], function( $, testHelper ) {
-
-module("sortable: events");
-
-test("start", function() {
-	expect( 7 );
-
-	var hash;
-	$("#sortable").sortable({
-		start: function( e, ui ) {
-			hash = ui;
-		}
-	}).find("li:eq(0)").simulate( "drag", {
-		dy: 10
-	});
-
-	ok(hash, "start event triggered");
-	ok(hash.helper, "UI hash includes: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
-
-	// todo: see if these events should actually have sane values in them
-	ok("position" in hash, "UI hash includes: position");
-	ok("offset" in hash, "UI hash includes: offset");
-});
-
-test("sort", function() {
-	expect( 7 );
-
-	var hash;
-	$("#sortable").sortable({
-		sort: function( e, ui ) {
-			hash = ui;
-		}
-	}).find("li:eq(0)").simulate( "drag", {
-		dy: 10
-	});
-
-	ok(hash, "sort event triggered");
-	ok(hash.helper, "UI hash includes: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
-	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
-
-});
-
-test("change", function() {
-	expect( 8 );
-
-	var hash;
-	$("#sortable").sortable({
-		change: function( e, ui ) {
-			hash = ui;
-		}
-	}).find("li:eq(0)").simulate( "drag", {
-		dx: 1,
-		dy: 1
-	});
-
-	ok(!hash, "1px drag, change event should not be triggered");
-
-	$("#sortable").sortable({
-		change: function( e, ui ) {
-			hash = ui;
-		}
-	}).find("li:eq(0)").simulate( "drag", {
-		dy: 22
-	});
-
-	ok(hash, "change event triggered");
-	ok(hash.helper, "UI hash includes: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
-	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
-
-});
-
-test("beforeStop", function() {
-	expect( 7 );
-
-	var hash;
-	$("#sortable").sortable({
-		beforeStop: function( e, ui ) {
-			hash = ui;
-		}
-	}).find("li:eq(0)").simulate( "drag", {
-		dy: 20
-	});
-
-	ok(hash, "beforeStop event triggered");
-	ok(hash.helper, "UI hash includes: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
-	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
-
-});
-
-test("stop", function() {
-	expect( 7 );
-
-	var hash;
-	$("#sortable").sortable({
-		stop: function( e, ui ) {
-			hash = ui;
-		}
-	}).find("li:eq(0)").simulate( "drag", {
-		dy: 20
-	});
-
-	ok(hash, "stop event triggered");
-	ok(!hash.helper, "UI should not include: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
-	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
-
-});
-
-test("update", function() {
-	expect( 8 );
-
-	var hash;
-	$("#sortable").sortable({
-		update: function( e, ui ) {
-			hash = ui;
-		}
-	}).find("li:eq(0)").simulate( "drag", {
-		dx: 1,
-		dy: 1
-	});
-
-	ok(!hash, "1px drag, update event should not be triggered");
-
-	$("#sortable").sortable({
-		update: function( e, ui ) {
-			hash = ui;
-		}
-	}).find("li:eq(0)").simulate( "drag", {
-		dy: 22
-	});
-
-	ok(hash, "update event triggered");
-	ok(!hash.helper, "UI hash should not include: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
-	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
-
-});
-
-test("#3019: Stop fires too early", function() {
-	expect(2);
-
-	var helper = null,
-		el = $("#sortable").sortable({
-			stop: function(event, ui) {
-				helper = ui.helper;
-			}
-		});
-
-	testHelper.sort($("li", el)[0], 0, 44, 2, "Dragging the sortable");
-	equal(helper, null, "helper should be false");
-
-});
-
-test("#4752: link event firing on sortable with connect list", function () {
-	expect( 10 );
-
-	var fired = {},
-		hasFired = function (type) { return (type in fired) && (true === fired[type]); };
-
-	$("#sortable").clone().attr("id", "sortable2").insertAfter("#sortable");
-
-	$("#qunit-fixture ul").sortable({
-		connectWith: "#qunit-fixture ul",
-		change: function () {
-			fired.change = true;
-		},
-		receive: function () {
-			fired.receive = true;
-		},
-		remove: function () {
-			fired.remove = true;
-		}
-	});
-
-	$("#qunit-fixture ul").bind("click.ui-sortable-test", function () {
-		fired.click = true;
-	});
-
-	$("#sortable li:eq(0)").simulate("click");
-	ok(!hasFired("change"), "Click only, change event should not have fired");
-	ok(hasFired("click"), "Click event should have fired");
-
-	// Drag an item within the first list
-	fired = {};
-	$("#sortable li:eq(0)").simulate("drag", { dx: 0, dy: 40 });
-	ok(hasFired("change"), "40px drag, change event should have fired");
-	ok(!hasFired("receive"), "Receive event should not have fired");
-	ok(!hasFired("remove"), "Remove event should not have fired");
-	ok(!hasFired("click"), "Click event should not have fired");
-
-	// Drag an item from the first list to the second, connected list
-	fired = {};
-	$("#sortable li:eq(0)").simulate("drag", { dx: 0, dy: 150 });
-	ok(hasFired("change"), "150px drag, change event should have fired");
-	ok(hasFired("receive"), "Receive event should have fired");
-	ok(hasFired("remove"), "Remove event should have fired");
-	ok(!hasFired("click"), "Click event should not have fired");
-});
-
-/*
-test("receive", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("remove", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-*/
-
-test( "over", function() {
-	expect( 8 );
-
-	var hash,
-		overCount = 0;
-
-	$( "#sortable" ).sortable({
-		over: function( e, ui ) {
-			hash = ui;
-			overCount++;
-		}
-	}).find( "li:eq(0)" ).simulate( "drag", {
-		dy: 20
-	});
-
-	ok( hash, "over event triggered" );
-	ok( hash.helper, "UI includes: helper" );
-	ok( hash.placeholder, "UI hash includes: placeholder" );
-	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
-	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
-	ok( hash.item, "UI hash includes: item" );
-	ok( hash.sender, "UI hash includes: sender" );
-	equal( overCount, 1, "over fires only once" );
-});
-
-// http://bugs.jqueryui.com/ticket/9335
-// Sortable: over & out events does not consistently fire
-test( "over, fires with draggable connected to sortable", function() {
-	expect( 3 );
-
-	var hash,
-		overCount = 0,
-		item = $( "<div></div>" ).text( "6" ).insertAfter( "#sortable" );
-
-	item.draggable({
-		connectToSortable: "#sortable"
-	});
-	$( ".connectWith" ).sortable({
-		connectWith: ".connectWith",
-		over: function( event, ui ) {
-			hash = ui;
-			overCount++;
-		}
-	});
-
-	item.simulate( "drag", {
-		dy: -20
-	});
-
-	ok( hash, "over event triggered" );
-	ok( !hash.sender, "UI should not include: sender" );
-	equal( overCount, 1, "over fires only once" );
-});
-
-test( "over, with connected sortable", function() {
-	expect( 3 );
-
-	var hash,
-		overCount = 0;
-
-	$( ".connectWith" ).sortable({
-		connectWith: ".connectWith"
-	});
-	$( "#sortable2" ).on( "sortover", function( event, ui ) {
-		hash = ui;
-		overCount++;
-	});
-	$( "#sortable" ).find( "li:eq(0)" ).simulate( "drag", {
-		dy: 102
-	});
-
-	ok( hash, "over event triggered" );
-	equal( hash.sender[ 0 ], $(" #sortable" )[ 0 ], "UI includes: sender" );
-	equal( overCount, 1, "over fires only once" );
-});
-
-/*
-test("out", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-*/
-
-test( "out, with connected sortable", function() {
-	expect( 2 );
-
-	var hash,
-		outCount = 0;
-
-	$( ".connectWith" ).sortable({
-		connectWith: ".connectWith"
-	});
-	$( "#sortable" ).on( "sortout", function( event, ui ) {
-		hash = ui;
-		outCount++;
-	});
-	$( "#sortable" ).find( "li:last" ).simulate( "drag", {
-		dy: 40
-	});
-
-	ok( hash, "out event triggered" );
-	equal( outCount, 1, "out fires only once" );
-});
-
-test( "repeated out & over between connected sortables", function() {
-	expect( 2 );
-
-	var outCount = 0,
-		overCount = 0;
-
-	$( ".connectWith" ).sortable({
-		connectWith: ".connectWith",
-		over: function() {
-			overCount++;
-		},
-		out: function( event, ui ) {
-			// Ignore events that trigger when an item has dropped
-			// checking for the presence of the helper.
-			if ( !ui.helper ) {
-				outCount++;
-			}
-		}
-	});
-	$( "#sortable" ).find( "li:last" ).simulate( "drag", {
-		dy: 40
-	}).simulate( "drag", {
-		dy: -40
-	});
-
-	equal( outCount, 2, "out fires twice" );
-	equal( overCount, 4, "over fires four times" );
-});
-
-/*
-test("activate", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("deactivate", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-*/
-
-} );
diff --git a/tests/unit/sortable/sortable_methods.js b/tests/unit/sortable/sortable_methods.js
deleted file mode 100644
index d3bb23d6e..000000000
--- a/tests/unit/sortable/sortable_methods.js
+++ /dev/null
@@ -1,129 +0,0 @@
-define( [
-	"jquery",
-	"./sortable_test_helpers",
-	"ui/sortable"
-], function( $, testHelper ) {
-
-module("sortable: methods");
-
-test("init", function() {
-	expect(5);
-
-	$("<div></div>").appendTo("body").sortable().remove();
-	ok(true, ".sortable() called on element");
-
-	$([]).sortable();
-	ok(true, ".sortable() called on empty collection");
-
-	$("<div></div>").sortable();
-	ok(true, ".sortable() called on disconnected DOMElement");
-
-	$("<div></div>").sortable().sortable("option", "foo");
-	ok(true, "arbitrary option getter after init");
-
-	$("<div></div>").sortable().sortable("option", "foo", "bar");
-	ok(true, "arbitrary option setter after init");
-});
-
-test("destroy", function() {
-	expect(4);
-	$("<div></div>").appendTo("body").sortable().sortable("destroy").remove();
-	ok(true, ".sortable('destroy') called on element");
-
-	$([]).sortable().sortable("destroy");
-	ok(true, ".sortable('destroy') called on empty collection");
-
-	$("<div></div>").sortable().sortable("destroy");
-	ok(true, ".sortable('destroy') called on disconnected DOMElement");
-
-	var expected = $("<div></div>").sortable(),
-		actual = expected.sortable("destroy");
-	equal(actual, expected, "destroy is chainable");
-});
-
-test("enable", function() {
-	expect(5);
-
-	var el, actual, expected;
-
-	el = $("#sortable").sortable({ disabled: true });
-
-	testHelper.sort($("li", el)[0], 0, 44, 0, ".sortable({ disabled: true })");
-
-	el.sortable("enable");
-	equal(el.sortable("option", "disabled"), false, "disabled option getter");
-
-	el.sortable("destroy");
-	el.sortable({ disabled: true });
-	el.sortable("option", "disabled", false);
-	equal(el.sortable("option", "disabled"), false, "disabled option setter");
-
-	testHelper.sort($("li", el)[0], 0, 44, 2, ".sortable('option', 'disabled', false)");
-
-	expected = $("<div></div>").sortable(),
-	actual = expected.sortable("enable");
-	equal(actual, expected, "enable is chainable");
-});
-
-test( "disable", function( assert ) {
-	expect( 9 );
-
-	var chainable,
-		element = $( "#sortable" ).sortable({ disabled: false });
-
-	testHelper.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" );
-
-	chainable = element.sortable( "disable" );
-	testHelper.sort( $( "li", element )[ 0 ], 0, 44, 0, "disabled.sortable getter" );
-
-	element.sortable( "destroy" );
-
-	element.sortable({ disabled: false });
-	testHelper.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" );
-	element.sortable( "option", "disabled", true);
-	equal( element.sortable( "option", "disabled" ), true, "disabled option setter" );
-
-	assert.lacksClasses( element.sortable( "widget" ), "ui-state-disabled" );
-	ok( !element.sortable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
-	assert.hasClasses( element.sortable( "widget" ), "ui-sortable-disabled" );
-
-	testHelper.sort($( "li", element )[ 0 ], 0, 44, 0, ".sortable('option', 'disabled', true)" );
-	equal( chainable, element, "disable is chainable" );
-});
-
-test( "refresh() should update the positions of initially empty lists (see #7498)", function() {
-	expect( 1 );
-
-	var changeCount = 0,
-		element = $( "#qunit-fixture" ).html( "<ul></ul>" ).find( "ul" );
-
-	element
-		.css({
-			"float": "left",
-			width: "100px"
-		})
-		.sortable({
-			change: function() {
-				changeCount++;
-			}
-		})
-		.append( "<li>a</li><li>a</li>" )
-		.find( "li" )
-			.css({
-				"float": "left",
-				width: "50px",
-				height: "50px"
-			});
-
-	element.sortable( "refresh" );
-
-	// Switch the order of the two li elements
-	element.find( "li" ).eq( 0 ).simulate( "drag", {
-		dx: 55,
-		moves: 15
-	});
-
-	equal( changeCount, 1 );
-});
-
-} );
diff --git a/tests/unit/sortable/sortable_options.js b/tests/unit/sortable/sortable_options.js
deleted file mode 100644
index 930f339e6..000000000
--- a/tests/unit/sortable/sortable_options.js
+++ /dev/null
@@ -1,496 +0,0 @@
-define( [
-	"jquery",
-	"ui/sortable"
-], function( $ ) {
-
-module("sortable: options");
-
-/*
-test("{ appendTo: 'parent' }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ appendTo: Selector }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-*/
-
-test( "{ axis: false }, default", function() {
-	expect( 2 );
-
-	var offsetAfter,
-		element = $( "#sortable" ).sortable({
-			axis: false,
-			change: function() {
-				offsetAfter = item.offset();
-				notEqual( offsetAfter.left, offsetBefore.left, "x axis not constrained when axis: false" );
-				notEqual( offsetAfter.top, offsetBefore.top, "y axis not constrained when axis: false" );
-			}
-		}),
-		item = element.find( "li" ).eq( 0 ),
-		offsetBefore = item.offset();
-
-	item.simulate( "drag", {
-		dx: 50,
-		dy: 25,
-		moves: 1
-	});
-});
-
-test( "{ axis: 'x' }", function() {
-	expect( 2 );
-
-	var offsetAfter,
-		element = $( "#sortable" ).sortable({
-			axis: "x",
-			change: function() {
-				offsetAfter = item.offset();
-				notEqual( offsetAfter.left, offsetBefore.left, "x axis not constrained when axis: x" );
-				equal( offsetAfter.top, offsetBefore.top, "y axis constrained when axis: x" );
-			}
-		}),
-		item = element.find( "li" ).eq( 0 ),
-		offsetBefore = item.offset();
-
-	item.simulate( "drag", {
-		dx: 50,
-		dy: 25,
-		moves: 1
-	});
-});
-
-test( "{ axis: 'y' }", function() {
-	expect( 2 );
-
-	var offsetAfter,
-		element = $( "#sortable" ).sortable({
-			axis: "y",
-			change: function() {
-				offsetAfter = item.offset();
-				equal( offsetAfter.left, offsetBefore.left, "x axis constrained when axis: y" );
-				notEqual( offsetAfter.top, offsetBefore.top, "y axis not constrained when axis: y" );
-			}
-		}),
-		item = element.find( "li" ).eq( 0 ),
-		offsetBefore = item.offset();
-
-	item.simulate( "drag", {
-		dx: 50,
-		dy: 25,
-		moves: 1
-	});
-});
-
-asyncTest( "#7415: Incorrect revert animation with axis: 'y'", function() {
-  expect( 2 );
-	var expectedLeft,
-		element = $( "#sortable" ).sortable({
-			axis: "y",
-			revert: true,
-			stop: start,
-			sort: function() {
-				expectedLeft = item.css( "left" );
-			}
-		}),
-		item = element.find( "li" ).eq( 0 );
-
-	item.simulate( "drag", {
-		dy: 300,
-		dx: 50
-	});
-
-	setTimeout(function() {
-		var top = parseFloat( item.css( "top" ) );
-		equal( item.css( "left" ), expectedLeft, "left not animated" );
-		ok( top > 0 && top < 300, "top is animated" );
-	}, 100 );
-});
-
-/*
-test("{ cancel: 'input,textarea,button,select,option' }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ cancel: Selector }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-*/
-
-test( "#8792: issues with floated items in connected lists", function() {
-	expect( 2 );
-
-	var element,
-		changeCount = 0;
-
-	$( "#qunit-fixture" )
-		.html( "<ul class='c'><li>a</li><li>a</li></ul><ul class='c'><li>a</li><li>a</li></ul>" )
-		.find( "ul" ).css({ "float": "left", width: "100px" }).end()
-		.find( "li" ).css({ "float": "left", width: "50px", height: "50px" });
-
-	$( "#qunit-fixture .c" ).sortable({
-		connectWith: "#qunit-fixture .c",
-		change: function() {
-			changeCount++;
-		}
-	});
-
-	element = $( "#qunit-fixture li:eq(0)" );
-
-	// move the first li to the right of the second li in the first ul
-	element.simulate( "drag", {
-		dx: 55,
-		moves: 15
-	});
-
-	equal( changeCount, 1, "change fired only once (no jitters) when dragging a floated sortable in it's own container" );
-
-	// move the first li ( which is now in the second spot )
-	// through the first spot in the second ul to the second spot in the second ul
-	element.simulate( "drag", {
-		dx: 100,
-		moves: 15
-	});
-
-	equal( changeCount, 3, "change fired once for each expected change when dragging a floated sortable to a connected container" );
-});
-
-test( "#8301: single axis with connected list", function() {
-	expect( 1 );
-
-	var element = $( "#sortable" ).sortable({
-		axis: "y",
-		tolerance: "pointer",
-		connectWith: ".connected"
-	});
-
-	$( "<ul class='connected'><li>Item 7</li><li>Item 8</li></ul>" )
-		.sortable({
-			axis: "y",
-			tolerance: "pointer",
-			connectWith: "#sortable",
-			receive: function() {
-				ok( true, "connected list received item" );
-			}
-		})
-		.insertAfter( element );
-
-	element.find( "li" ).eq( 0 ).simulate( "drag", {
-		handle: "corner",
-		dy: 120,
-		moves: 1
-	});
-});
-
-/*
-test("{ connectWith: false }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ connectWith: Selector }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ containment: false }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ containment: Element }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ containment: 'document' }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ containment: 'parent' }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ containment: 'window' }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ containment: Selector }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ cursor: 'auto' }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ cursor: 'move' }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ cursorAt: false }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ cursorAt: true }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ delay: 0 }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ delay: 100 }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ distance: 1 }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ distance: 10 }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ dropOnEmpty: true }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ dropOnEmpty: false }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ forcePlaceholderSize: false }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ forcePlaceholderSize: true }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ forceHelperSize: false }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ forceHelperSize: true }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ grid: false }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ grid: [17, 3] }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ grid: [3, 7] }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ handle: false }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ handle: Element }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ handle: Selector }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ helper: 'original' }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ helper: Function }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ items: '> *' }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ items: Selector }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ opacity: false }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ opacity: .37 }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ opacity: 1 }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ placeholder: false }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-*/
-
-test( "{ placeholder: false } img", function() {
-	expect( 3 );
-
-	var element = $( "#sortable-images" ).sortable({
-		start: function( event, ui ) {
-			ok( ui.placeholder.attr( "src" ).indexOf( "images/jqueryui_32x32.png" ) > 0, "placeholder img has correct src" );
-			equal( ui.placeholder.height(), 32, "placeholder has correct height" );
-			equal( ui.placeholder.width(), 32, "placeholder has correct width" );
-		}
-	});
-
-	element.find( "img" ).eq( 0 ).simulate( "drag", {
-		dy: 1
-	});
-});
-
-test( "{ placeholder: String }", function( assert ) {
-	expect( 1 );
-
-	var element = $( "#sortable" ).sortable({
-		placeholder: "test",
-		start: function( event, ui ) {
-			assert.hasClasses( ui.placeholder, "test" );
-		}
-	});
-
-	element.find( "li" ).eq( 0 ).simulate( "drag", {
-		dy: 1
-	});
-});
-
-test( "{ placholder: String } tr", function( assert ) {
-	expect( 4 );
-
-	var originalWidths,
-		element = $( "#sortable-table tbody" ).sortable({
-			placeholder: "test",
-			start: function( event, ui ) {
-				var currentWidths = otherRow.children().map(function() {
-					return $( this ).width();
-				}).get();
-				assert.hasClasses( ui.placeholder, "test" );
-				deepEqual( currentWidths, originalWidths, "table cells maintian size" );
-				equal( ui.placeholder.children().length, dragRow.children().length,
-					"placeholder has correct number of cells" );
-				equal( ui.placeholder.children().html(), $( "<span>&#160;</span>" ).html(),
-					"placeholder td has content for forced dimensions" );
-			}
-		}),
-		rows = element.children( "tr" ),
-		dragRow = rows.eq( 0 ),
-		otherRow = rows.eq( 1 );
-
-	originalWidths = otherRow.children().map(function() {
-		return $( this ).width();
-	}).get();
-	dragRow.simulate( "drag", {
-		dy: 1
-	});
-});
-
-test( "{ placholder: String } tbody", function() {
-	expect( 6 );
-
-	var originalWidths,
-		element = $( "#sortable-table" ).sortable({
-			placeholder: "test",
-			start: function( event, ui ) {
-				var currentWidths = otherBody.children().map(function() {
-					return $( this ).width();
-				}).get();
-				ok( ui.placeholder.hasClass( "test" ), "placeholder has class" );
-				deepEqual( currentWidths, originalWidths, "table cells maintain size" );
-				equal( ui.placeholder.children().length, 1,
-					"placeholder has one child" );
-				equal( ui.placeholder.children( "tr" ).length, 1,
-					"placeholder's child is tr" );
-				equal( ui.placeholder.find( "> tr" ).children().length,
-					dragBody.find( "> tr:first" ).children().length,
-					"placeholder's tr has correct number of cells" );
-				equal( ui.placeholder.find( "> tr" ).children().html(),
-					$( "<span>&#160;</span>" ).html(),
-					"placeholder td has content for forced dimensions" );
-			}
-		}),
-		bodies = element.children( "tbody" ),
-		dragBody = bodies.eq( 0 ),
-		otherBody = bodies.eq( 1 );
-
-	originalWidths = otherBody.children().map(function() {
-		return $( this ).width();
-	}).get();
-	dragBody.simulate( "drag", {
-		dy: 1
-	});
-});
-
-/*
-test("{ revert: false }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ revert: true }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ scroll: true }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ scroll: false }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ scrollSensitivity: 20 }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ scrollSensitivity: 2 }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ scrollSensitivity: 200 }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ scrollSpeed: 20 }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ scrollSpeed: 2 }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ scrollSpeed: 200 }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ scope: 'default' }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ scope: ??? }, unexpected", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ tolerance: 'intersect' }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ tolerance: 'pointer' }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ zIndex: 1000 }, default", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ zIndex: 1 }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("{ zIndex: false }", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-*/
-} );
diff --git a/tests/unit/sortable/sortable_test_helpers.js b/tests/unit/sortable/sortable_test_helpers.js
deleted file mode 100644
index 76545022e..000000000
--- a/tests/unit/sortable/sortable_test_helpers.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper"
-], function( $, helper ) {
-
-return $.extend( helper, {
-	sort: function( handle, dx, dy, index, msg ) {
-		$( handle ).simulate( "drag", {
-			dx: dx,
-			dy: dy
-		});
-		equal( $( handle ).parent().children().index( handle ), index, msg );
-	}
-} );
-
-} );
diff --git a/tests/unit/spinner/common.js b/tests/unit/spinner/common.js
new file mode 100644
index 000000000..2c40df76a
--- /dev/null
+++ b/tests/unit/spinner/common.js
@@ -0,0 +1,35 @@
+define( [
+	"lib/common",
+	"ui/spinner"
+], function( common ) {
+
+common.testWidget( "spinner", {
+	defaults: {
+		classes: {
+			"ui-spinner": "ui-corner-all",
+			"ui-spinner-up": "ui-corner-tr",
+			"ui-spinner-down": "ui-corner-br"
+		},
+		culture: null,
+		disabled: false,
+		icons: {
+			down: "ui-icon-triangle-1-s",
+			up: "ui-icon-triangle-1-n"
+		},
+		incremental: true,
+		max: null,
+		min: null,
+		numberFormat: null,
+		page: 10,
+		step: 1,
+
+		// callbacks
+		change: null,
+		create: null,
+		spin: null,
+		start: null,
+		stop: null
+	}
+});
+
+} );
diff --git a/tests/unit/spinner/core.js b/tests/unit/spinner/core.js
new file mode 100644
index 000000000..aabfd7aa5
--- /dev/null
+++ b/tests/unit/spinner/core.js
@@ -0,0 +1,257 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/spinner"
+], function( $, testHelper ) {
+
+var simulateKeyDownUp = testHelper.simulateKeyDownUp;
+
+module( "spinner: core" );
+
+test( "markup structure", function( assert ) {
+	expect( 6 );
+	var element = $( "#spin" ).spinner(),
+		spinner = element.spinner( "widget" ),
+		up = spinner.find( ".ui-spinner-up" ),
+		down = spinner.find( ".ui-spinner-down" );
+
+	assert.hasClasses( element, "ui-spinner-input" );
+	assert.hasClasses( spinner, "ui-spinner ui-widget ui-widget-content" );
+	assert.hasClasses( up, "ui-spinner-button ui-spinner-up ui-widget" );
+	equal( up.length, 1, "Spinner contains exactly one up button" );
+	assert.hasClasses( down, "ui-spinner-button ui-spinner-down ui-widget" );
+	equal( down.length, 1, "Spinner contains exactly one down button" );
+});
+
+test( "keydown UP on input, increases value not greater than max", function() {
+	expect( 5 );
+	var element = $( "#spin" ).val( 70 ).spinner({
+		max: 100,
+		step: 10
+	});
+
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	equal( element.val(), 80 );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	equal( element.val(), 90 );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	equal( element.val(), 100 );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	equal( element.val(), 100 );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	equal( element.val(), 100 );
+});
+
+test( "keydown DOWN on input, decreases value not less than min", function() {
+	expect( 5 );
+	var element = $( "#spin" ).val( 50 ).spinner({
+		min: 20,
+		step: 10
+	});
+
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	equal( element.val(), 40 );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	equal( element.val(), 30 );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	equal( element.val(), 20 );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	equal( element.val(), 20 );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	equal( element.val(), 20 );
+});
+
+test( "keydown PAGE_UP on input, increases value not greater than max", function() {
+	expect( 5 );
+	var element = $( "#spin" ).val( 70 ).spinner({
+		max: 100,
+		page: 10
+	});
+
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	equal( element.val(), 80 );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	equal( element.val(), 90 );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	equal( element.val(), 100 );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	equal( element.val(), 100 );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	equal( element.val(), 100 );
+});
+
+test( "keydown PAGE_DOWN on input, decreases value not less than min", function() {
+	expect( 5 );
+	var element = $( "#spin" ).val( 50 ).spinner({
+		min: 20,
+		page: 10
+	});
+
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	equal( element.val(), 40 );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	equal( element.val(), 30 );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	equal( element.val(), 20 );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	equal( element.val(), 20 );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	equal( element.val(), 20 );
+});
+
+asyncTest( "blur input while spinning with UP", function() {
+	expect( 3 );
+	var value,
+		element = $( "#spin" ).val( 10 ).spinner();
+
+	function step1() {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		equal( element.val(), 11 );
+		setTimeout( step2, 750 );
+	}
+
+	function step2() {
+		value = element.val();
+		ok( value > 11, "repeating while key is down" );
+
+		element.bind( "blur", function() {
+			value = element.val();
+			setTimeout( step3, 750 );
+		})[ 0 ].blur();
+	}
+
+	function step3() {
+		equal( element.val(), value, "stopped repeating on blur" );
+		start();
+	}
+
+	element[ 0 ].focus();
+	setTimeout( step1 );
+});
+
+test( "mouse click on up button, increases value not greater than max", function() {
+	expect( 3 );
+	var element = $( "#spin" ).val( 18 ).spinner({
+			max: 20
+		}),
+		button = element.spinner( "widget" ).find( ".ui-spinner-up" );
+
+	button.trigger( "mousedown" ).trigger( "mouseup" );
+	equal( element.val(), 19 );
+	button.trigger( "mousedown" ).trigger( "mouseup" );
+	equal( element.val(), 20 );
+	button.trigger( "mousedown" ).trigger( "mouseup" );
+	equal( element.val(), 20 );
+});
+
+test( "mouse click on up button, increases value not greater than max", function() {
+	expect( 3 );
+	var element = $( "#spin" ).val( 2 ).spinner({
+		min: 0
+	}),
+	button = element.spinner( "widget" ).find( ".ui-spinner-down" );
+
+	button.trigger( "mousedown" ).trigger( "mouseup" );
+	equal( element.val(), 1 );
+	button.trigger( "mousedown" ).trigger( "mouseup" );
+	equal( element.val(), 0 );
+	button.trigger( "mousedown" ).trigger( "mouseup" );
+	equal( element.val(), 0 );
+});
+
+test( "mousewheel on input", function() {
+	expect( 4 );
+
+	var element = $( "#spin" ).val( 0 ).spinner({
+		step: 2
+	});
+
+	element.trigger( "mousewheel" );
+	equal( element.val(), 0, "mousewheel event without delta does not change value" );
+
+	element.trigger( "mousewheel", 1 );
+	equal( element.val(), 2 );
+
+	element.trigger( "mousewheel", -0.2 );
+	equal( element.val(), 0 );
+
+	element.trigger( "mousewheel", -15 );
+	equal(element.val(), -2 );
+});
+
+test( "reading HTML5 attributes", function() {
+	expect( 6 );
+	var markup = "<input type='number' min='-100' max='100' value='5' step='2'>",
+		element = $( markup ).spinner();
+	equal( element.spinner( "option", "min" ), -100, "min from markup" );
+	equal( element.spinner( "option", "max" ), 100, "max from markup" );
+	equal( element.spinner( "option", "step" ), 2, "step from markup" );
+
+	element = $( markup ).spinner({
+		min: -200,
+		max: 200,
+		step: 5
+	});
+	equal( element.spinner( "option", "min" ), -200, "min from options" );
+	equal( element.spinner( "option", "max" ), 200, "max from options" );
+	equal( element.spinner( "option", "step" ), 5, "stop from options" );
+});
+
+test( "ARIA attributes", function() {
+	expect( 9 );
+	var element = $( "#spin" ).val( 2 ).spinner({ min: -5, max: 5 });
+
+	equal( element.attr( "role" ), "spinbutton", "role" );
+	equal( element.attr( "aria-valuemin" ), "-5", "aria-valuemin" );
+	equal( element.attr( "aria-valuemax" ), "5", "aria-valuemax" );
+	equal( element.attr( "aria-valuenow" ), "2", "aria-valuenow" );
+
+	element.spinner( "stepUp" );
+
+	equal( element.attr( "aria-valuenow" ), "3", "stepUp 1 step changes aria-valuenow" );
+
+	element.spinner( "option", { min: -10, max: 10 } );
+
+	equal( element.attr( "aria-valuemin" ), "-10", "min option changed aria-valuemin changes" );
+	equal( element.attr( "aria-valuemax" ), "10", "max option changed aria-valuemax changes" );
+
+	element.spinner( "option", "min", null );
+	equal( element.attr( "aria-valuemin" ), undefined, "aria-valuemin not set when no min" );
+
+	element.spinner( "option", "max", null );
+	equal( element.attr( "aria-valuemax" ), undefined, "aria-valuemax not set when no max" );
+});
+
+test( "focus text field when pressing button", function() {
+	expect( 2 );
+	var element = $( "#spin" ).spinner();
+	$( "body" ).focus();
+	ok( element[ 0 ] !== document.activeElement, "not focused before" );
+	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown();
+	ok( element[ 0 ] === document.activeElement, "focused after" );
+});
+
+test( "don't clear invalid value on blur", function() {
+	expect( 1 );
+	var element = $( "#spin" ).spinner();
+	element.focus().val( "a" ).blur();
+	equal( element.val(), "a" );
+});
+
+test( "precision", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 0.05 ).spinner({
+		step: 0.0001
+	});
+	element.spinner( "stepUp" );
+	equal( element.val(), "0.0501", "precision from step" );
+
+	element.val( 1.05 ).spinner( "option", {
+		step: 1,
+		min: -9.95
+	});
+	element.spinner( "stepDown" );
+	equal( element.val(), "0.05", "precision from min" );
+});
+
+} );
diff --git a/tests/unit/spinner/events.js b/tests/unit/spinner/events.js
new file mode 100644
index 000000000..a837f47c9
--- /dev/null
+++ b/tests/unit/spinner/events.js
@@ -0,0 +1,263 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/spinner"
+], function( $, testHelper ) {
+
+var simulateKeyDownUp = testHelper.simulateKeyDownUp;
+
+module( "spinner: events" );
+
+test( "start", function() {
+	expect( 10 );
+	var element = $( "#spin" ).spinner();
+
+	function shouldStart( expectation, msg ) {
+		element.spinner( "option", "start", function() {
+			ok( expectation, msg );
+		});
+	}
+
+	shouldStart( true, "key UP" );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	shouldStart( true, "key DOWN" );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+
+	shouldStart( true, "key PAGE_UP" );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	shouldStart( true, "key PAGE_DOWN" );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+
+	shouldStart( true, "button up" );
+	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
+	shouldStart( true, "button down" );
+	element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
+
+	shouldStart( true, "stepUp" );
+	element.spinner( "stepUp" );
+	shouldStart( true, "stepDown" );
+	element.spinner( "stepDown" );
+
+	shouldStart( true, "pageUp" );
+	element.spinner( "pageUp" );
+	shouldStart( true, "pageDown" );
+	element.spinner( "pageDown" );
+
+	shouldStart( false, "value" );
+	element.spinner( "value", 999 );
+});
+
+test( "spin", function() {
+	expect( 10 );
+	var element = $( "#spin" ).spinner();
+
+	function shouldSpin( expectation, msg ) {
+		element.spinner( "option", "spin", function() {
+			ok( expectation, msg );
+		});
+	}
+
+	shouldSpin( true, "key UP" );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	shouldSpin( true, "key DOWN" );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+
+	shouldSpin( true, "key PAGE_UP" );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	shouldSpin( true, "key PAGE_DOWN" );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+
+	shouldSpin( true, "button up" );
+	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
+	shouldSpin( true, "button down" );
+	element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
+
+	shouldSpin( true, "stepUp" );
+	element.spinner( "stepUp" );
+	shouldSpin( true, "stepDown" );
+	element.spinner( "stepDown" );
+
+	shouldSpin( true, "pageUp" );
+	element.spinner( "pageUp" );
+	shouldSpin( true, "pageDown" );
+	element.spinner( "pageDown" );
+
+	shouldSpin( false, "value" );
+	element.spinner( "value", 999 );
+});
+
+test( "stop", function() {
+	expect( 10 );
+	var element = $( "#spin" ).spinner();
+
+	function shouldStop( expectation, msg ) {
+		element.spinner( "option", "stop", function() {
+			ok( expectation, msg );
+		});
+	}
+
+	shouldStop( true, "key UP" );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	shouldStop( true, "key DOWN" );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+
+	shouldStop( true, "key PAGE_UP" );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	shouldStop( true, "key PAGE_DOWN" );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+
+	shouldStop( true, "button up" );
+	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
+	shouldStop( true, "button down" );
+	element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
+
+	shouldStop( true, "stepUp" );
+	element.spinner( "stepUp" );
+	shouldStop( true, "stepDown" );
+	element.spinner( "stepDown" );
+
+	shouldStop( true, "pageUp" );
+	element.spinner( "pageUp" );
+	shouldStop( true, "pageDown" );
+	element.spinner( "pageDown" );
+
+	shouldStop( false, "value" );
+	element.spinner( "value", 999 );
+});
+
+asyncTest( "change", function() {
+	expect( 12 );
+	var element = $( "#spin" ).spinner();
+
+	function shouldChange( expectation, msg ) {
+		element.spinner( "option", "change", function() {
+			ok( expectation, msg );
+		});
+	}
+
+	function focusWrap( fn, next ) {
+		element[0].focus();
+		setTimeout( function() {
+			fn();
+			setTimeout(function() {
+				element[0].blur();
+				setTimeout( next );
+			});
+		});
+	}
+
+	function step1() {
+		focusWrap(function() {
+			shouldChange( false, "key UP, before blur" );
+			simulateKeyDownUp( element, $.ui.keyCode.UP );
+			shouldChange( true, "blur after key UP" );
+		}, step2 );
+	}
+
+	function step2() {
+		focusWrap(function() {
+			shouldChange( false, "key DOWN, before blur" );
+			simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+			shouldChange( true, "blur after key DOWN" );
+		}, step3 );
+	}
+
+	function step3() {
+		focusWrap(function() {
+			shouldChange( false, "key PAGE_UP, before blur" );
+			simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+			shouldChange( true, "blur after key PAGE_UP" );
+		}, step4 );
+	}
+
+	function step4() {
+		focusWrap(function() {
+			shouldChange( false, "key PAGE_DOWN, before blur" );
+			simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+			shouldChange( true, "blur after key PAGE_DOWN" );
+		}, step5 );
+	}
+
+	function step5() {
+		focusWrap(function() {
+			shouldChange( false, "many keys, before blur" );
+			simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+			simulateKeyDownUp( element, $.ui.keyCode.UP );
+			simulateKeyDownUp( element, $.ui.keyCode.UP );
+			simulateKeyDownUp( element, $.ui.keyCode.UP );
+			simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+			shouldChange( true, "blur after many keys" );
+		}, step6 );
+	}
+
+	function step6() {
+		focusWrap(function() {
+			shouldChange( false, "many keys, same final value, before blur" );
+			simulateKeyDownUp( element, $.ui.keyCode.UP );
+			simulateKeyDownUp( element, $.ui.keyCode.UP );
+			simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+			simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+			shouldChange( false, "blur after many keys, same final value" );
+
+			shouldChange( false, "button up, before blur" );
+			element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
+			shouldChange( true, "blur after button up" );
+		}, step7 );
+	}
+
+	function step7() {
+		focusWrap(function() {
+			shouldChange( false, "button down, before blur" );
+			element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
+			shouldChange( true, "blur after button down" );
+		}, step8 );
+	}
+
+	function step8() {
+		focusWrap(function() {
+			shouldChange( false, "many buttons, same final value, before blur" );
+			element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
+			element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
+			element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
+			element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
+			shouldChange( false, "blur after many buttons, same final value" );
+		}, step9 );
+	}
+
+	function step9() {
+		shouldChange( true, "stepUp" );
+		element.spinner( "stepUp" );
+
+		shouldChange( true, "stepDown" );
+		element.spinner( "stepDown" );
+
+		shouldChange( true, "pageUp" );
+		element.spinner( "pageUp" );
+
+		shouldChange( true, "pageDown" );
+		element.spinner( "pageDown" );
+
+		shouldChange( true, "value" );
+		element.spinner( "value", 999 );
+
+		shouldChange( false, "value, same value" );
+		element.spinner( "value", 999 );
+
+		shouldChange( false, "max, value not changed" );
+		element.spinner( "option", "max", 900 );
+
+		shouldChange( false, "max, value not changed" );
+		element.spinner( "option", "max", 1000 );
+
+		shouldChange( false, "min, value not changed" );
+		element.spinner( "option", "min", 950 );
+
+		shouldChange( false, "min, value not changed" );
+		element.spinner( "option", "min", 200 );
+		start();
+	}
+
+	setTimeout( step1 );
+});
+
+} );
diff --git a/tests/unit/spinner/helper.js b/tests/unit/spinner/helper.js
new file mode 100644
index 000000000..ab99dcd8e
--- /dev/null
+++ b/tests/unit/spinner/helper.js
@@ -0,0 +1,14 @@
+define( [
+	"jquery",
+	"lib/helper"
+], function( $, helper ) {
+
+return $.extend( helper, {
+	simulateKeyDownUp: function( element, keyCode, shift ) {
+		element
+			.simulate( "keydown", { keyCode: keyCode, shiftKey: shift || false } )
+			.simulate( "keyup", { keyCode: keyCode, shiftKey: shift || false } );
+	}
+} );
+
+} );
diff --git a/tests/unit/spinner/methods.js b/tests/unit/spinner/methods.js
new file mode 100644
index 000000000..d6bf325f2
--- /dev/null
+++ b/tests/unit/spinner/methods.js
@@ -0,0 +1,211 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/spinner"
+], function( $, testHelper ) {
+
+var simulateKeyDownUp = testHelper.simulateKeyDownUp;
+
+module( "spinner: methods" );
+
+test( "destroy", function( assert ) {
+	expect( 1 );
+	assert.domEqual( "#spin", function() {
+		$( "#spin" ).spinner().spinner( "destroy" );
+	});
+});
+
+test( "disable", function( assert ) {
+	expect( 15 );
+	var element = $( "#spin" ).val( 2 ).spinner(),
+		wrapper = $( "#spin" ).spinner( "widget" );
+
+	assert.lacksClasses( wrapper, "ui-spinner-disabled" );
+	ok( !element.is( ":disabled" ), "before: input does not have disabled attribute" );
+
+	element.spinner( "disable" );
+	assert.hasClasses( wrapper, "ui-state-disabled ui-spinner-disabled" );
+	ok( !wrapper.attr( "aria-disabled" ), "after: wrapper does not have aria-disabled attr" );
+	ok( element.is( ":disabled"), "after: input has disabled attribute" );
+
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	equal( 2, element.val(), "keyboard - value does not change on key UP" );
+
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	equal( 2, element.val(), "keyboard - value does not change on key DOWN" );
+
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	equal( 2, element.val(), "keyboard - value does not change on key PGUP" );
+
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	equal( 2, element.val(), "keyboard - value does not change on key PGDN" );
+
+	wrapper.find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
+	equal( 2, element.val(), "mouse - value does not change on clicking up button" );
+
+	wrapper.find( ".ui-spinner-down" ).trigger( "mousedown" ).trigger( "mouseup" );
+	equal( 2, element.val(), "mouse - value does not change on clicking down button" );
+
+	element.spinner( "stepUp", 6 );
+	equal( 8, element.val(), "script - stepUp 6 steps changes value");
+
+	element.spinner( "stepDown" );
+	equal( 7, element.val(), "script - stepDown 1 step changes value" );
+
+	element.spinner( "pageUp" );
+	equal( 17, element.val(), "script - pageUp 1 page changes value" );
+
+	element.spinner( "pageDown" );
+	equal( 7, element.val(), "script - pageDown 1 page changes value" );
+});
+
+test( "enable", function( assert ) {
+	expect( 5 );
+	var element = $( "#spin" ).val( 1 ).spinner({ disabled: true }),
+		wrapper = element.spinner( "widget" );
+
+	assert.hasClasses( wrapper, "ui-spinner-disabled" );
+	ok( element.is( ":disabled" ), "before: input has disabled attribute" );
+
+	element.spinner( "enable" );
+
+	assert.lacksClasses( wrapper, "ui-spinner-disabled" );
+	ok( !element.is( ":disabled" ), "after: input does not have disabled attribute" );
+
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	equal( 2, element.val(), "keyboard - value changes on key UP" );
+});
+
+test( "isValid", function() {
+	expect( 8 );
+	var element = $( "#spin" ).spinner({
+			min: 0,
+			max: 10,
+			step: 2
+		}),
+		spinner = element.spinner( "instance" );
+	ok( !spinner.isValid(), "initial state is invalid" );
+
+	element.val( "this is not a number" );
+	ok( !spinner.isValid(), "text string is not valid" );
+
+	element.val( "0" );
+	ok( spinner.isValid(), "min value is valid" );
+
+	element.val( "10" );
+	ok( spinner.isValid(), "max value is valid" );
+
+	element.val( "4" );
+	ok( spinner.isValid(), "inbetween step is valid" );
+
+	element.val( "-1" );
+	ok( !spinner.isValid(), "below min is invalid" );
+
+	element.val( "11" );
+	ok( !spinner.isValid(), "above max is invalid" );
+
+	element.val( "1" );
+	ok( !spinner.isValid(), "step mismatch is invalid" );
+});
+
+test( "pageDown", function() {
+	expect( 4 );
+	var element = $( "#spin" ).val( -12 ).spinner({
+		page: 20,
+		min: -100
+	});
+
+	element.spinner( "pageDown" );
+	equal( element.val(), -32, "pageDown 1 page" );
+
+	element.spinner( "pageDown", 3 );
+	equal( element.val(), -92, "pageDown 3 pages" );
+
+	element.spinner( "pageDown" );
+	equal( element.val(), -100, "value close to min and pageDown 1 page" );
+
+	element.spinner( "pageDown", 10 );
+	equal( element.val(), -100, "value at min and pageDown 10 pages" );
+});
+
+test( "pageUp", function() {
+	expect( 4 );
+	var element = $( "#spin" ).val( 12 ).spinner({
+		page: 20,
+		max: 100
+	});
+
+	element.spinner( "pageUp" );
+	equal( element.val(), 32, "pageUp 1 page" );
+
+	element.spinner( "pageUp", 3 );
+	equal( element.val(), 92, "pageUp 3 pages" );
+
+	element.spinner( "pageUp" );
+	equal( element.val(), 100, "value close to max and pageUp 1 page" );
+
+	element.spinner( "pageUp", 10 );
+	equal( element.val(), 100, "value at max and pageUp 10 pages" );
+});
+
+test( "stepDown", function() {
+	expect( 4 );
+	var element = $( "#spin" ).val( 0 ).spinner({
+		step: 2,
+		min: -15
+	});
+
+	element.spinner( "stepDown" );
+	equal( element.val(), "-1", "stepDown 1 step" );
+
+	element.spinner( "stepDown", 5 );
+	equal( element.val(), "-11", "stepDown 5 steps" );
+
+	element.spinner( "stepDown", 4 );
+	equal( element.val(), "-15", "close to min and stepDown 4 steps" );
+
+	element.spinner( "stepDown" );
+	equal( element.val(), "-15", "at min and stepDown 1 step" );
+});
+
+test( "stepUp", function() {
+	expect( 4 );
+	var element = $( "#spin" ).val( 0 ).spinner({
+		step: 2,
+		max: 16
+	});
+
+	element.spinner( "stepUp" );
+	equal( element.val(), 2, "stepUp 1 step" );
+
+	element.spinner( "stepUp", 5 );
+	equal( element.val(), 12, "stepUp 5 steps" );
+
+	element.spinner( "stepUp", 4 );
+	equal( element.val(), 16, "close to max and stepUp 4 steps" );
+
+	element.spinner( "stepUp" );
+	equal( element.val(), 16, "at max and stepUp 1 step" );
+});
+
+test( "value", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 0 ).spinner({
+		step: 3
+	});
+
+	element.spinner( "value", 10 );
+	equal( element.val(), 9, "change value via value method" );
+
+	equal( element.spinner( "value" ), 9, "get value via value method" );
+});
+
+test( "widget", function() {
+	expect( 2 );
+	var element = $( "#spin" ).spinner(),
+		widgetElement = element.spinner( "widget" );
+	equal( widgetElement.length, 1, "one element" );
+	strictEqual( widgetElement[ 0 ], element.parent()[ 0 ], "parent element" );
+});
+
+} );
diff --git a/tests/unit/spinner/options.js b/tests/unit/spinner/options.js
new file mode 100644
index 000000000..f8d9ad396
--- /dev/null
+++ b/tests/unit/spinner/options.js
@@ -0,0 +1,271 @@
+define( [
+	"jquery",
+	"ui/spinner",
+	"globalize",
+	"globalize/ja-JP"
+], function( $ ) {
+
+module( "spinner: options" );
+
+// culture is tested after numberFormat, since it depends on numberFormat
+
+test( "icons: default ", function( assert ) {
+	expect( 4 );
+	var element = $( "#spin" ).val( 0 ).spinner();
+	assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:first" ),
+		"ui-icon ui-icon-triangle-1-n" );
+	assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:last" ),
+		"ui-icon ui-icon-triangle-1-s" );
+
+	element.spinner( "option", "icons", {
+		up: "ui-icon-caret-1-n",
+		down: "ui-icon-caret-1-s"
+	});
+	assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:first" ),
+		"ui-icon ui-icon-caret-1-n" );
+	assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:last" ),
+		"ui-icon ui-icon-caret-1-s" );
+});
+
+test( "icons: custom ", function( assert ) {
+	expect( 2 );
+	var element = $( "#spin" ).val( 0 ).spinner({
+		icons: {
+			down: "custom-down",
+			up: "custom-up"
+		}
+	}).spinner( "widget" );
+	assert.hasClasses( element.find( ".ui-icon:first" ), "ui-icon custom-up" );
+	assert.hasClasses( element.find( ".ui-icon:last" ), "ui-icon custom-down" );
+});
+
+test( "incremental, false", function() {
+	expect( 100 );
+
+	var i,
+		prev = 0,
+		element = $( "#spin" ).val( prev ).spinner({
+			incremental: false,
+			spin: function( event, ui ) {
+				equal( ui.value - prev, 1 );
+				prev = ui.value;
+			}
+		});
+
+	for ( i = 0; i < 100; i++ ) {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+	}
+	element.simulate( "keyup", { keyCode: $.ui.keyCode.UP } );
+});
+
+test( "incremental, true", function() {
+	expect( 100 );
+
+	function fill( num, val ) {
+		return $.map( new Array( num ), function() {
+			return val;
+		});
+	}
+
+	var i,
+		prev = 0,
+		expected = [].concat( fill( 18, 1 ), fill( 37, 2 ), fill( 14, 3 ),
+			fill( 9, 4 ), fill( 6, 5 ), fill( 5, 6 ), fill ( 5, 7 ),
+			fill( 4, 8 ), fill( 2, 9 ) ),
+		element = $( "#spin" ).val( prev ).spinner({
+			incremental: true,
+			spin: function( event, ui ) {
+				equal( ui.value - prev, expected[ i ] );
+				prev = ui.value;
+			}
+		});
+
+	for ( i = 0; i < 100; i++ ) {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+	}
+	element.simulate( "keyup", { keyCode: $.ui.keyCode.UP } );
+});
+
+test( "incremental, function", function() {
+	expect( 100 );
+
+	var i,
+		prev = 0,
+		element = $( "#spin" ).val( prev ).spinner({
+			incremental: function( i ) {
+				return i;
+			},
+			spin: function( event, ui ) {
+				equal( ui.value - prev, i + 1 );
+				prev = ui.value;
+			}
+		});
+
+	for ( i = 0; i < 100; i++ ) {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+	}
+	element.simulate( "keyup", { keyCode: $.ui.keyCode.UP } );
+});
+
+test( "numberFormat, number", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "n" });
+	equal( element.val(), "0.00", "formatted on init" );
+	element.spinner( "stepUp" );
+	equal( element.val(), "1.00", "formatted after step" );
+});
+
+test( "numberFormat, number, simple", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "n0" });
+	equal( element.val(), "0", "formatted on init" );
+	element.spinner( "stepUp" );
+	equal( element.val(), "1", "formatted after step" );
+});
+
+test( "numberFormat, currency", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "C" });
+	equal( element.val(), "$0.00", "formatted on init" );
+	element.spinner( "stepUp" );
+	equal( element.val(), "$1.00", "formatted after step" );
+});
+
+test( "numberFormat, change", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 5 ).spinner({ numberFormat: "n1" });
+	equal( element.val(), "5.0", "formatted on init" );
+	element.spinner( "option", "numberFormat", "c" );
+	equal( element.val(), "$5.00", "formatted after change" );
+});
+
+test( "culture, null", function() {
+	expect( 2 );
+	Globalize.culture( "ja-JP" );
+	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "C" });
+	equal( element.val(), "¥0", "formatted on init" );
+	element.spinner( "stepUp" );
+	equal( element.val(), "¥1", "formatted after step" );
+
+	// reset culture
+	Globalize.culture( "default" );
+});
+
+test( "currency, ja-JP", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 0 ).spinner({
+		numberFormat: "C",
+		culture: "ja-JP"
+	});
+	equal( element.val(), "¥0", "formatted on init" );
+	element.spinner( "stepUp" );
+	equal( element.val(), "¥1", "formatted after step" );
+});
+
+test( "currency, change", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 5 ).spinner({
+		numberFormat: "C",
+		culture: "ja-JP"
+	});
+	equal( element.val(), "¥5", "formatted on init" );
+	element.spinner( "option", "culture", "en" );
+	equal( element.val(), "$5.00", "formatted after change" );
+});
+
+test( "max", function() {
+	expect( 3 );
+	var element = $( "#spin" ).val( 1000 ).spinner({ max: 100 });
+	equal( element.val(), 1000, "value not constrained on init" );
+
+	element.spinner( "value", 1000 );
+	equal( element.val(), 100, "max constrained in value method" );
+
+	element.val( 1000 ).blur();
+	equal( element.val(), 1000, "max not constrained if manual entry" );
+});
+
+test( "max, string", function() {
+	expect( 3 );
+	var element = $( "#spin" )
+		.val( 1000 )
+		.spinner({
+			max: "$100.00",
+			numberFormat: "C",
+			culture: "en"
+		});
+	equal( element.val(), "$1,000.00", "value not constrained on init" );
+	equal( element.spinner( "option", "max" ), 100, "option converted to number" );
+
+	element.spinner( "value", 1000 );
+	equal( element.val(), "$100.00", "max constrained in value method" );
+});
+
+test( "min", function() {
+	expect( 3 );
+	var element = $( "#spin" ).val( -1000 ).spinner({ min: -100 });
+	equal( element.val(), -1000, "value not constrained on init" );
+
+	element.spinner( "value", -1000 );
+	equal( element.val(), -100, "min constrained in value method" );
+
+	element.val( -1000 ).blur();
+	equal( element.val(), -1000, "min not constrained if manual entry" );
+});
+
+test( "min, string", function() {
+	expect( 3 );
+	var element = $( "#spin" )
+		.val( -1000 )
+		.spinner({
+			min: "-$100.00",
+			numberFormat: "C",
+			culture: "en"
+		});
+	equal( element.val(), "($1,000.00)", "value not constrained on init" );
+	equal( element.spinner( "option", "min" ), -100, "option converted to number" );
+
+	element.spinner( "value", -1000 );
+	equal( element.val(), "($100.00)", "min constrained in value method" );
+});
+
+test( "step, 2", function() {
+	expect( 3 );
+	var element = $( "#spin" ).val( 0 ).spinner({ step: 2 });
+
+	element.spinner( "stepUp" );
+	equal( element.val(), "2", "stepUp" );
+
+	element.spinner( "value", "10.5" );
+	equal( element.val(), "10", "value reset to 10" );
+
+	element.val( "4.5" );
+	element.spinner( "stepUp" );
+	equal( element.val(), "6", "stepUp" );
+});
+
+test( "step, 0.7", function() {
+	expect( 1 );
+	var element = $("#spin").val( 0 ).spinner({
+		step: 0.7
+	});
+
+	element.spinner( "stepUp" );
+	equal( element.val(), "0.7", "stepUp" );
+});
+
+test( "step, string", function() {
+	expect( 2 );
+	var element = $("#spin").val( 0 ).spinner({
+		step: "$0.70",
+		numberFormat: "C",
+		culture: "en"
+	});
+
+	equal( element.spinner( "option", "step" ), 0.7, "option converted to number" );
+
+	element.spinner( "stepUp" );
+	equal( element.val(), "$0.70", "stepUp" );
+});
+
+} );
diff --git a/tests/unit/spinner/spinner_common.js b/tests/unit/spinner/spinner_common.js
deleted file mode 100644
index 2c40df76a..000000000
--- a/tests/unit/spinner/spinner_common.js
+++ /dev/null
@@ -1,35 +0,0 @@
-define( [
-	"lib/common",
-	"ui/spinner"
-], function( common ) {
-
-common.testWidget( "spinner", {
-	defaults: {
-		classes: {
-			"ui-spinner": "ui-corner-all",
-			"ui-spinner-up": "ui-corner-tr",
-			"ui-spinner-down": "ui-corner-br"
-		},
-		culture: null,
-		disabled: false,
-		icons: {
-			down: "ui-icon-triangle-1-s",
-			up: "ui-icon-triangle-1-n"
-		},
-		incremental: true,
-		max: null,
-		min: null,
-		numberFormat: null,
-		page: 10,
-		step: 1,
-
-		// callbacks
-		change: null,
-		create: null,
-		spin: null,
-		start: null,
-		stop: null
-	}
-});
-
-} );
diff --git a/tests/unit/spinner/spinner_core.js b/tests/unit/spinner/spinner_core.js
deleted file mode 100644
index d0388a575..000000000
--- a/tests/unit/spinner/spinner_core.js
+++ /dev/null
@@ -1,257 +0,0 @@
-define( [
-	"jquery",
-	"./spinner_test_helpers",
-	"ui/spinner"
-], function( $, testHelper ) {
-
-var simulateKeyDownUp = testHelper.simulateKeyDownUp;
-
-module( "spinner: core" );
-
-test( "markup structure", function( assert ) {
-	expect( 6 );
-	var element = $( "#spin" ).spinner(),
-		spinner = element.spinner( "widget" ),
-		up = spinner.find( ".ui-spinner-up" ),
-		down = spinner.find( ".ui-spinner-down" );
-
-	assert.hasClasses( element, "ui-spinner-input" );
-	assert.hasClasses( spinner, "ui-spinner ui-widget ui-widget-content" );
-	assert.hasClasses( up, "ui-spinner-button ui-spinner-up ui-widget" );
-	equal( up.length, 1, "Spinner contains exactly one up button" );
-	assert.hasClasses( down, "ui-spinner-button ui-spinner-down ui-widget" );
-	equal( down.length, 1, "Spinner contains exactly one down button" );
-});
-
-test( "keydown UP on input, increases value not greater than max", function() {
-	expect( 5 );
-	var element = $( "#spin" ).val( 70 ).spinner({
-		max: 100,
-		step: 10
-	});
-
-	simulateKeyDownUp( element, $.ui.keyCode.UP );
-	equal( element.val(), 80 );
-	simulateKeyDownUp( element, $.ui.keyCode.UP );
-	equal( element.val(), 90 );
-	simulateKeyDownUp( element, $.ui.keyCode.UP );
-	equal( element.val(), 100 );
-	simulateKeyDownUp( element, $.ui.keyCode.UP );
-	equal( element.val(), 100 );
-	simulateKeyDownUp( element, $.ui.keyCode.UP );
-	equal( element.val(), 100 );
-});
-
-test( "keydown DOWN on input, decreases value not less than min", function() {
-	expect( 5 );
-	var element = $( "#spin" ).val( 50 ).spinner({
-		min: 20,
-		step: 10
-	});
-
-	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-	equal( element.val(), 40 );
-	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-	equal( element.val(), 30 );
-	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-	equal( element.val(), 20 );
-	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-	equal( element.val(), 20 );
-	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-	equal( element.val(), 20 );
-});
-
-test( "keydown PAGE_UP on input, increases value not greater than max", function() {
-	expect( 5 );
-	var element = $( "#spin" ).val( 70 ).spinner({
-		max: 100,
-		page: 10
-	});
-
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
-	equal( element.val(), 80 );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
-	equal( element.val(), 90 );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
-	equal( element.val(), 100 );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
-	equal( element.val(), 100 );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
-	equal( element.val(), 100 );
-});
-
-test( "keydown PAGE_DOWN on input, decreases value not less than min", function() {
-	expect( 5 );
-	var element = $( "#spin" ).val( 50 ).spinner({
-		min: 20,
-		page: 10
-	});
-
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-	equal( element.val(), 40 );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-	equal( element.val(), 30 );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-	equal( element.val(), 20 );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-	equal( element.val(), 20 );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-	equal( element.val(), 20 );
-});
-
-asyncTest( "blur input while spinning with UP", function() {
-	expect( 3 );
-	var value,
-		element = $( "#spin" ).val( 10 ).spinner();
-
-	function step1() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		equal( element.val(), 11 );
-		setTimeout( step2, 750 );
-	}
-
-	function step2() {
-		value = element.val();
-		ok( value > 11, "repeating while key is down" );
-
-		element.bind( "blur", function() {
-			value = element.val();
-			setTimeout( step3, 750 );
-		})[ 0 ].blur();
-	}
-
-	function step3() {
-		equal( element.val(), value, "stopped repeating on blur" );
-		start();
-	}
-
-	element[ 0 ].focus();
-	setTimeout( step1 );
-});
-
-test( "mouse click on up button, increases value not greater than max", function() {
-	expect( 3 );
-	var element = $( "#spin" ).val( 18 ).spinner({
-			max: 20
-		}),
-		button = element.spinner( "widget" ).find( ".ui-spinner-up" );
-
-	button.trigger( "mousedown" ).trigger( "mouseup" );
-	equal( element.val(), 19 );
-	button.trigger( "mousedown" ).trigger( "mouseup" );
-	equal( element.val(), 20 );
-	button.trigger( "mousedown" ).trigger( "mouseup" );
-	equal( element.val(), 20 );
-});
-
-test( "mouse click on up button, increases value not greater than max", function() {
-	expect( 3 );
-	var element = $( "#spin" ).val( 2 ).spinner({
-		min: 0
-	}),
-	button = element.spinner( "widget" ).find( ".ui-spinner-down" );
-
-	button.trigger( "mousedown" ).trigger( "mouseup" );
-	equal( element.val(), 1 );
-	button.trigger( "mousedown" ).trigger( "mouseup" );
-	equal( element.val(), 0 );
-	button.trigger( "mousedown" ).trigger( "mouseup" );
-	equal( element.val(), 0 );
-});
-
-test( "mousewheel on input", function() {
-	expect( 4 );
-
-	var element = $( "#spin" ).val( 0 ).spinner({
-		step: 2
-	});
-
-	element.trigger( "mousewheel" );
-	equal( element.val(), 0, "mousewheel event without delta does not change value" );
-
-	element.trigger( "mousewheel", 1 );
-	equal( element.val(), 2 );
-
-	element.trigger( "mousewheel", -0.2 );
-	equal( element.val(), 0 );
-
-	element.trigger( "mousewheel", -15 );
-	equal(element.val(), -2 );
-});
-
-test( "reading HTML5 attributes", function() {
-	expect( 6 );
-	var markup = "<input type='number' min='-100' max='100' value='5' step='2'>",
-		element = $( markup ).spinner();
-	equal( element.spinner( "option", "min" ), -100, "min from markup" );
-	equal( element.spinner( "option", "max" ), 100, "max from markup" );
-	equal( element.spinner( "option", "step" ), 2, "step from markup" );
-
-	element = $( markup ).spinner({
-		min: -200,
-		max: 200,
-		step: 5
-	});
-	equal( element.spinner( "option", "min" ), -200, "min from options" );
-	equal( element.spinner( "option", "max" ), 200, "max from options" );
-	equal( element.spinner( "option", "step" ), 5, "stop from options" );
-});
-
-test( "ARIA attributes", function() {
-	expect( 9 );
-	var element = $( "#spin" ).val( 2 ).spinner({ min: -5, max: 5 });
-
-	equal( element.attr( "role" ), "spinbutton", "role" );
-	equal( element.attr( "aria-valuemin" ), "-5", "aria-valuemin" );
-	equal( element.attr( "aria-valuemax" ), "5", "aria-valuemax" );
-	equal( element.attr( "aria-valuenow" ), "2", "aria-valuenow" );
-
-	element.spinner( "stepUp" );
-
-	equal( element.attr( "aria-valuenow" ), "3", "stepUp 1 step changes aria-valuenow" );
-
-	element.spinner( "option", { min: -10, max: 10 } );
-
-	equal( element.attr( "aria-valuemin" ), "-10", "min option changed aria-valuemin changes" );
-	equal( element.attr( "aria-valuemax" ), "10", "max option changed aria-valuemax changes" );
-
-	element.spinner( "option", "min", null );
-	equal( element.attr( "aria-valuemin" ), undefined, "aria-valuemin not set when no min" );
-
-	element.spinner( "option", "max", null );
-	equal( element.attr( "aria-valuemax" ), undefined, "aria-valuemax not set when no max" );
-});
-
-test( "focus text field when pressing button", function() {
-	expect( 2 );
-	var element = $( "#spin" ).spinner();
-	$( "body" ).focus();
-	ok( element[ 0 ] !== document.activeElement, "not focused before" );
-	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown();
-	ok( element[ 0 ] === document.activeElement, "focused after" );
-});
-
-test( "don't clear invalid value on blur", function() {
-	expect( 1 );
-	var element = $( "#spin" ).spinner();
-	element.focus().val( "a" ).blur();
-	equal( element.val(), "a" );
-});
-
-test( "precision", function() {
-	expect( 2 );
-	var element = $( "#spin" ).val( 0.05 ).spinner({
-		step: 0.0001
-	});
-	element.spinner( "stepUp" );
-	equal( element.val(), "0.0501", "precision from step" );
-
-	element.val( 1.05 ).spinner( "option", {
-		step: 1,
-		min: -9.95
-	});
-	element.spinner( "stepDown" );
-	equal( element.val(), "0.05", "precision from min" );
-});
-
-} );
diff --git a/tests/unit/spinner/spinner_events.js b/tests/unit/spinner/spinner_events.js
deleted file mode 100644
index a37d61346..000000000
--- a/tests/unit/spinner/spinner_events.js
+++ /dev/null
@@ -1,263 +0,0 @@
-define( [
-	"jquery",
-	"./spinner_test_helpers",
-	"ui/spinner"
-], function( $, testHelper ) {
-
-var simulateKeyDownUp = testHelper.simulateKeyDownUp;
-
-module( "spinner: events" );
-
-test( "start", function() {
-	expect( 10 );
-	var element = $( "#spin" ).spinner();
-
-	function shouldStart( expectation, msg ) {
-		element.spinner( "option", "start", function() {
-			ok( expectation, msg );
-		});
-	}
-
-	shouldStart( true, "key UP" );
-	simulateKeyDownUp( element, $.ui.keyCode.UP );
-	shouldStart( true, "key DOWN" );
-	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-
-	shouldStart( true, "key PAGE_UP" );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
-	shouldStart( true, "key PAGE_DOWN" );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-
-	shouldStart( true, "button up" );
-	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
-	shouldStart( true, "button down" );
-	element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
-
-	shouldStart( true, "stepUp" );
-	element.spinner( "stepUp" );
-	shouldStart( true, "stepDown" );
-	element.spinner( "stepDown" );
-
-	shouldStart( true, "pageUp" );
-	element.spinner( "pageUp" );
-	shouldStart( true, "pageDown" );
-	element.spinner( "pageDown" );
-
-	shouldStart( false, "value" );
-	element.spinner( "value", 999 );
-});
-
-test( "spin", function() {
-	expect( 10 );
-	var element = $( "#spin" ).spinner();
-
-	function shouldSpin( expectation, msg ) {
-		element.spinner( "option", "spin", function() {
-			ok( expectation, msg );
-		});
-	}
-
-	shouldSpin( true, "key UP" );
-	simulateKeyDownUp( element, $.ui.keyCode.UP );
-	shouldSpin( true, "key DOWN" );
-	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-
-	shouldSpin( true, "key PAGE_UP" );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
-	shouldSpin( true, "key PAGE_DOWN" );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-
-	shouldSpin( true, "button up" );
-	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
-	shouldSpin( true, "button down" );
-	element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
-
-	shouldSpin( true, "stepUp" );
-	element.spinner( "stepUp" );
-	shouldSpin( true, "stepDown" );
-	element.spinner( "stepDown" );
-
-	shouldSpin( true, "pageUp" );
-	element.spinner( "pageUp" );
-	shouldSpin( true, "pageDown" );
-	element.spinner( "pageDown" );
-
-	shouldSpin( false, "value" );
-	element.spinner( "value", 999 );
-});
-
-test( "stop", function() {
-	expect( 10 );
-	var element = $( "#spin" ).spinner();
-
-	function shouldStop( expectation, msg ) {
-		element.spinner( "option", "stop", function() {
-			ok( expectation, msg );
-		});
-	}
-
-	shouldStop( true, "key UP" );
-	simulateKeyDownUp( element, $.ui.keyCode.UP );
-	shouldStop( true, "key DOWN" );
-	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-
-	shouldStop( true, "key PAGE_UP" );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
-	shouldStop( true, "key PAGE_DOWN" );
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-
-	shouldStop( true, "button up" );
-	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
-	shouldStop( true, "button down" );
-	element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
-
-	shouldStop( true, "stepUp" );
-	element.spinner( "stepUp" );
-	shouldStop( true, "stepDown" );
-	element.spinner( "stepDown" );
-
-	shouldStop( true, "pageUp" );
-	element.spinner( "pageUp" );
-	shouldStop( true, "pageDown" );
-	element.spinner( "pageDown" );
-
-	shouldStop( false, "value" );
-	element.spinner( "value", 999 );
-});
-
-asyncTest( "change", function() {
-	expect( 12 );
-	var element = $( "#spin" ).spinner();
-
-	function shouldChange( expectation, msg ) {
-		element.spinner( "option", "change", function() {
-			ok( expectation, msg );
-		});
-	}
-
-	function focusWrap( fn, next ) {
-		element[0].focus();
-		setTimeout( function() {
-			fn();
-			setTimeout(function() {
-				element[0].blur();
-				setTimeout( next );
-			});
-		});
-	}
-
-	function step1() {
-		focusWrap(function() {
-			shouldChange( false, "key UP, before blur" );
-			simulateKeyDownUp( element, $.ui.keyCode.UP );
-			shouldChange( true, "blur after key UP" );
-		}, step2 );
-	}
-
-	function step2() {
-		focusWrap(function() {
-			shouldChange( false, "key DOWN, before blur" );
-			simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-			shouldChange( true, "blur after key DOWN" );
-		}, step3 );
-	}
-
-	function step3() {
-		focusWrap(function() {
-			shouldChange( false, "key PAGE_UP, before blur" );
-			simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
-			shouldChange( true, "blur after key PAGE_UP" );
-		}, step4 );
-	}
-
-	function step4() {
-		focusWrap(function() {
-			shouldChange( false, "key PAGE_DOWN, before blur" );
-			simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-			shouldChange( true, "blur after key PAGE_DOWN" );
-		}, step5 );
-	}
-
-	function step5() {
-		focusWrap(function() {
-			shouldChange( false, "many keys, before blur" );
-			simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-			simulateKeyDownUp( element, $.ui.keyCode.UP );
-			simulateKeyDownUp( element, $.ui.keyCode.UP );
-			simulateKeyDownUp( element, $.ui.keyCode.UP );
-			simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-			shouldChange( true, "blur after many keys" );
-		}, step6 );
-	}
-
-	function step6() {
-		focusWrap(function() {
-			shouldChange( false, "many keys, same final value, before blur" );
-			simulateKeyDownUp( element, $.ui.keyCode.UP );
-			simulateKeyDownUp( element, $.ui.keyCode.UP );
-			simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-			simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-			shouldChange( false, "blur after many keys, same final value" );
-
-			shouldChange( false, "button up, before blur" );
-			element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
-			shouldChange( true, "blur after button up" );
-		}, step7 );
-	}
-
-	function step7() {
-		focusWrap(function() {
-			shouldChange( false, "button down, before blur" );
-			element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
-			shouldChange( true, "blur after button down" );
-		}, step8 );
-	}
-
-	function step8() {
-		focusWrap(function() {
-			shouldChange( false, "many buttons, same final value, before blur" );
-			element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
-			element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
-			element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
-			element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
-			shouldChange( false, "blur after many buttons, same final value" );
-		}, step9 );
-	}
-
-	function step9() {
-		shouldChange( true, "stepUp" );
-		element.spinner( "stepUp" );
-
-		shouldChange( true, "stepDown" );
-		element.spinner( "stepDown" );
-
-		shouldChange( true, "pageUp" );
-		element.spinner( "pageUp" );
-
-		shouldChange( true, "pageDown" );
-		element.spinner( "pageDown" );
-
-		shouldChange( true, "value" );
-		element.spinner( "value", 999 );
-
-		shouldChange( false, "value, same value" );
-		element.spinner( "value", 999 );
-
-		shouldChange( false, "max, value not changed" );
-		element.spinner( "option", "max", 900 );
-
-		shouldChange( false, "max, value not changed" );
-		element.spinner( "option", "max", 1000 );
-
-		shouldChange( false, "min, value not changed" );
-		element.spinner( "option", "min", 950 );
-
-		shouldChange( false, "min, value not changed" );
-		element.spinner( "option", "min", 200 );
-		start();
-	}
-
-	setTimeout( step1 );
-});
-
-} );
diff --git a/tests/unit/spinner/spinner_methods.js b/tests/unit/spinner/spinner_methods.js
deleted file mode 100644
index 75ae5c9e8..000000000
--- a/tests/unit/spinner/spinner_methods.js
+++ /dev/null
@@ -1,211 +0,0 @@
-define( [
-	"jquery",
-	"./spinner_test_helpers",
-	"ui/spinner"
-], function( $, testHelper ) {
-
-var simulateKeyDownUp = testHelper.simulateKeyDownUp;
-
-module( "spinner: methods" );
-
-test( "destroy", function( assert ) {
-	expect( 1 );
-	assert.domEqual( "#spin", function() {
-		$( "#spin" ).spinner().spinner( "destroy" );
-	});
-});
-
-test( "disable", function( assert ) {
-	expect( 15 );
-	var element = $( "#spin" ).val( 2 ).spinner(),
-		wrapper = $( "#spin" ).spinner( "widget" );
-
-	assert.lacksClasses( wrapper, "ui-spinner-disabled" );
-	ok( !element.is( ":disabled" ), "before: input does not have disabled attribute" );
-
-	element.spinner( "disable" );
-	assert.hasClasses( wrapper, "ui-state-disabled ui-spinner-disabled" );
-	ok( !wrapper.attr( "aria-disabled" ), "after: wrapper does not have aria-disabled attr" );
-	ok( element.is( ":disabled"), "after: input has disabled attribute" );
-
-	simulateKeyDownUp( element, $.ui.keyCode.UP );
-	equal( 2, element.val(), "keyboard - value does not change on key UP" );
-
-	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-	equal( 2, element.val(), "keyboard - value does not change on key DOWN" );
-
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
-	equal( 2, element.val(), "keyboard - value does not change on key PGUP" );
-
-	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-	equal( 2, element.val(), "keyboard - value does not change on key PGDN" );
-
-	wrapper.find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
-	equal( 2, element.val(), "mouse - value does not change on clicking up button" );
-
-	wrapper.find( ".ui-spinner-down" ).trigger( "mousedown" ).trigger( "mouseup" );
-	equal( 2, element.val(), "mouse - value does not change on clicking down button" );
-
-	element.spinner( "stepUp", 6 );
-	equal( 8, element.val(), "script - stepUp 6 steps changes value");
-
-	element.spinner( "stepDown" );
-	equal( 7, element.val(), "script - stepDown 1 step changes value" );
-
-	element.spinner( "pageUp" );
-	equal( 17, element.val(), "script - pageUp 1 page changes value" );
-
-	element.spinner( "pageDown" );
-	equal( 7, element.val(), "script - pageDown 1 page changes value" );
-});
-
-test( "enable", function( assert ) {
-	expect( 5 );
-	var element = $( "#spin" ).val( 1 ).spinner({ disabled: true }),
-		wrapper = element.spinner( "widget" );
-
-	assert.hasClasses( wrapper, "ui-spinner-disabled" );
-	ok( element.is( ":disabled" ), "before: input has disabled attribute" );
-
-	element.spinner( "enable" );
-
-	assert.lacksClasses( wrapper, "ui-spinner-disabled" );
-	ok( !element.is( ":disabled" ), "after: input does not have disabled attribute" );
-
-	simulateKeyDownUp( element, $.ui.keyCode.UP );
-	equal( 2, element.val(), "keyboard - value changes on key UP" );
-});
-
-test( "isValid", function() {
-	expect( 8 );
-	var element = $( "#spin" ).spinner({
-			min: 0,
-			max: 10,
-			step: 2
-		}),
-		spinner = element.spinner( "instance" );
-	ok( !spinner.isValid(), "initial state is invalid" );
-
-	element.val( "this is not a number" );
-	ok( !spinner.isValid(), "text string is not valid" );
-
-	element.val( "0" );
-	ok( spinner.isValid(), "min value is valid" );
-
-	element.val( "10" );
-	ok( spinner.isValid(), "max value is valid" );
-
-	element.val( "4" );
-	ok( spinner.isValid(), "inbetween step is valid" );
-
-	element.val( "-1" );
-	ok( !spinner.isValid(), "below min is invalid" );
-
-	element.val( "11" );
-	ok( !spinner.isValid(), "above max is invalid" );
-
-	element.val( "1" );
-	ok( !spinner.isValid(), "step mismatch is invalid" );
-});
-
-test( "pageDown", function() {
-	expect( 4 );
-	var element = $( "#spin" ).val( -12 ).spinner({
-		page: 20,
-		min: -100
-	});
-
-	element.spinner( "pageDown" );
-	equal( element.val(), -32, "pageDown 1 page" );
-
-	element.spinner( "pageDown", 3 );
-	equal( element.val(), -92, "pageDown 3 pages" );
-
-	element.spinner( "pageDown" );
-	equal( element.val(), -100, "value close to min and pageDown 1 page" );
-
-	element.spinner( "pageDown", 10 );
-	equal( element.val(), -100, "value at min and pageDown 10 pages" );
-});
-
-test( "pageUp", function() {
-	expect( 4 );
-	var element = $( "#spin" ).val( 12 ).spinner({
-		page: 20,
-		max: 100
-	});
-
-	element.spinner( "pageUp" );
-	equal( element.val(), 32, "pageUp 1 page" );
-
-	element.spinner( "pageUp", 3 );
-	equal( element.val(), 92, "pageUp 3 pages" );
-
-	element.spinner( "pageUp" );
-	equal( element.val(), 100, "value close to max and pageUp 1 page" );
-
-	element.spinner( "pageUp", 10 );
-	equal( element.val(), 100, "value at max and pageUp 10 pages" );
-});
-
-test( "stepDown", function() {
-	expect( 4 );
-	var element = $( "#spin" ).val( 0 ).spinner({
-		step: 2,
-		min: -15
-	});
-
-	element.spinner( "stepDown" );
-	equal( element.val(), "-1", "stepDown 1 step" );
-
-	element.spinner( "stepDown", 5 );
-	equal( element.val(), "-11", "stepDown 5 steps" );
-
-	element.spinner( "stepDown", 4 );
-	equal( element.val(), "-15", "close to min and stepDown 4 steps" );
-
-	element.spinner( "stepDown" );
-	equal( element.val(), "-15", "at min and stepDown 1 step" );
-});
-
-test( "stepUp", function() {
-	expect( 4 );
-	var element = $( "#spin" ).val( 0 ).spinner({
-		step: 2,
-		max: 16
-	});
-
-	element.spinner( "stepUp" );
-	equal( element.val(), 2, "stepUp 1 step" );
-
-	element.spinner( "stepUp", 5 );
-	equal( element.val(), 12, "stepUp 5 steps" );
-
-	element.spinner( "stepUp", 4 );
-	equal( element.val(), 16, "close to max and stepUp 4 steps" );
-
-	element.spinner( "stepUp" );
-	equal( element.val(), 16, "at max and stepUp 1 step" );
-});
-
-test( "value", function() {
-	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({
-		step: 3
-	});
-
-	element.spinner( "value", 10 );
-	equal( element.val(), 9, "change value via value method" );
-
-	equal( element.spinner( "value" ), 9, "get value via value method" );
-});
-
-test( "widget", function() {
-	expect( 2 );
-	var element = $( "#spin" ).spinner(),
-		widgetElement = element.spinner( "widget" );
-	equal( widgetElement.length, 1, "one element" );
-	strictEqual( widgetElement[ 0 ], element.parent()[ 0 ], "parent element" );
-});
-
-} );
diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js
deleted file mode 100644
index f8d9ad396..000000000
--- a/tests/unit/spinner/spinner_options.js
+++ /dev/null
@@ -1,271 +0,0 @@
-define( [
-	"jquery",
-	"ui/spinner",
-	"globalize",
-	"globalize/ja-JP"
-], function( $ ) {
-
-module( "spinner: options" );
-
-// culture is tested after numberFormat, since it depends on numberFormat
-
-test( "icons: default ", function( assert ) {
-	expect( 4 );
-	var element = $( "#spin" ).val( 0 ).spinner();
-	assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:first" ),
-		"ui-icon ui-icon-triangle-1-n" );
-	assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:last" ),
-		"ui-icon ui-icon-triangle-1-s" );
-
-	element.spinner( "option", "icons", {
-		up: "ui-icon-caret-1-n",
-		down: "ui-icon-caret-1-s"
-	});
-	assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:first" ),
-		"ui-icon ui-icon-caret-1-n" );
-	assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:last" ),
-		"ui-icon ui-icon-caret-1-s" );
-});
-
-test( "icons: custom ", function( assert ) {
-	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({
-		icons: {
-			down: "custom-down",
-			up: "custom-up"
-		}
-	}).spinner( "widget" );
-	assert.hasClasses( element.find( ".ui-icon:first" ), "ui-icon custom-up" );
-	assert.hasClasses( element.find( ".ui-icon:last" ), "ui-icon custom-down" );
-});
-
-test( "incremental, false", function() {
-	expect( 100 );
-
-	var i,
-		prev = 0,
-		element = $( "#spin" ).val( prev ).spinner({
-			incremental: false,
-			spin: function( event, ui ) {
-				equal( ui.value - prev, 1 );
-				prev = ui.value;
-			}
-		});
-
-	for ( i = 0; i < 100; i++ ) {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	}
-	element.simulate( "keyup", { keyCode: $.ui.keyCode.UP } );
-});
-
-test( "incremental, true", function() {
-	expect( 100 );
-
-	function fill( num, val ) {
-		return $.map( new Array( num ), function() {
-			return val;
-		});
-	}
-
-	var i,
-		prev = 0,
-		expected = [].concat( fill( 18, 1 ), fill( 37, 2 ), fill( 14, 3 ),
-			fill( 9, 4 ), fill( 6, 5 ), fill( 5, 6 ), fill ( 5, 7 ),
-			fill( 4, 8 ), fill( 2, 9 ) ),
-		element = $( "#spin" ).val( prev ).spinner({
-			incremental: true,
-			spin: function( event, ui ) {
-				equal( ui.value - prev, expected[ i ] );
-				prev = ui.value;
-			}
-		});
-
-	for ( i = 0; i < 100; i++ ) {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	}
-	element.simulate( "keyup", { keyCode: $.ui.keyCode.UP } );
-});
-
-test( "incremental, function", function() {
-	expect( 100 );
-
-	var i,
-		prev = 0,
-		element = $( "#spin" ).val( prev ).spinner({
-			incremental: function( i ) {
-				return i;
-			},
-			spin: function( event, ui ) {
-				equal( ui.value - prev, i + 1 );
-				prev = ui.value;
-			}
-		});
-
-	for ( i = 0; i < 100; i++ ) {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	}
-	element.simulate( "keyup", { keyCode: $.ui.keyCode.UP } );
-});
-
-test( "numberFormat, number", function() {
-	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "n" });
-	equal( element.val(), "0.00", "formatted on init" );
-	element.spinner( "stepUp" );
-	equal( element.val(), "1.00", "formatted after step" );
-});
-
-test( "numberFormat, number, simple", function() {
-	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "n0" });
-	equal( element.val(), "0", "formatted on init" );
-	element.spinner( "stepUp" );
-	equal( element.val(), "1", "formatted after step" );
-});
-
-test( "numberFormat, currency", function() {
-	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "C" });
-	equal( element.val(), "$0.00", "formatted on init" );
-	element.spinner( "stepUp" );
-	equal( element.val(), "$1.00", "formatted after step" );
-});
-
-test( "numberFormat, change", function() {
-	expect( 2 );
-	var element = $( "#spin" ).val( 5 ).spinner({ numberFormat: "n1" });
-	equal( element.val(), "5.0", "formatted on init" );
-	element.spinner( "option", "numberFormat", "c" );
-	equal( element.val(), "$5.00", "formatted after change" );
-});
-
-test( "culture, null", function() {
-	expect( 2 );
-	Globalize.culture( "ja-JP" );
-	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "C" });
-	equal( element.val(), "¥0", "formatted on init" );
-	element.spinner( "stepUp" );
-	equal( element.val(), "¥1", "formatted after step" );
-
-	// reset culture
-	Globalize.culture( "default" );
-});
-
-test( "currency, ja-JP", function() {
-	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({
-		numberFormat: "C",
-		culture: "ja-JP"
-	});
-	equal( element.val(), "¥0", "formatted on init" );
-	element.spinner( "stepUp" );
-	equal( element.val(), "¥1", "formatted after step" );
-});
-
-test( "currency, change", function() {
-	expect( 2 );
-	var element = $( "#spin" ).val( 5 ).spinner({
-		numberFormat: "C",
-		culture: "ja-JP"
-	});
-	equal( element.val(), "¥5", "formatted on init" );
-	element.spinner( "option", "culture", "en" );
-	equal( element.val(), "$5.00", "formatted after change" );
-});
-
-test( "max", function() {
-	expect( 3 );
-	var element = $( "#spin" ).val( 1000 ).spinner({ max: 100 });
-	equal( element.val(), 1000, "value not constrained on init" );
-
-	element.spinner( "value", 1000 );
-	equal( element.val(), 100, "max constrained in value method" );
-
-	element.val( 1000 ).blur();
-	equal( element.val(), 1000, "max not constrained if manual entry" );
-});
-
-test( "max, string", function() {
-	expect( 3 );
-	var element = $( "#spin" )
-		.val( 1000 )
-		.spinner({
-			max: "$100.00",
-			numberFormat: "C",
-			culture: "en"
-		});
-	equal( element.val(), "$1,000.00", "value not constrained on init" );
-	equal( element.spinner( "option", "max" ), 100, "option converted to number" );
-
-	element.spinner( "value", 1000 );
-	equal( element.val(), "$100.00", "max constrained in value method" );
-});
-
-test( "min", function() {
-	expect( 3 );
-	var element = $( "#spin" ).val( -1000 ).spinner({ min: -100 });
-	equal( element.val(), -1000, "value not constrained on init" );
-
-	element.spinner( "value", -1000 );
-	equal( element.val(), -100, "min constrained in value method" );
-
-	element.val( -1000 ).blur();
-	equal( element.val(), -1000, "min not constrained if manual entry" );
-});
-
-test( "min, string", function() {
-	expect( 3 );
-	var element = $( "#spin" )
-		.val( -1000 )
-		.spinner({
-			min: "-$100.00",
-			numberFormat: "C",
-			culture: "en"
-		});
-	equal( element.val(), "($1,000.00)", "value not constrained on init" );
-	equal( element.spinner( "option", "min" ), -100, "option converted to number" );
-
-	element.spinner( "value", -1000 );
-	equal( element.val(), "($100.00)", "min constrained in value method" );
-});
-
-test( "step, 2", function() {
-	expect( 3 );
-	var element = $( "#spin" ).val( 0 ).spinner({ step: 2 });
-
-	element.spinner( "stepUp" );
-	equal( element.val(), "2", "stepUp" );
-
-	element.spinner( "value", "10.5" );
-	equal( element.val(), "10", "value reset to 10" );
-
-	element.val( "4.5" );
-	element.spinner( "stepUp" );
-	equal( element.val(), "6", "stepUp" );
-});
-
-test( "step, 0.7", function() {
-	expect( 1 );
-	var element = $("#spin").val( 0 ).spinner({
-		step: 0.7
-	});
-
-	element.spinner( "stepUp" );
-	equal( element.val(), "0.7", "stepUp" );
-});
-
-test( "step, string", function() {
-	expect( 2 );
-	var element = $("#spin").val( 0 ).spinner({
-		step: "$0.70",
-		numberFormat: "C",
-		culture: "en"
-	});
-
-	equal( element.spinner( "option", "step" ), 0.7, "option converted to number" );
-
-	element.spinner( "stepUp" );
-	equal( element.val(), "$0.70", "stepUp" );
-});
-
-} );
diff --git a/tests/unit/spinner/spinner_test_helpers.js b/tests/unit/spinner/spinner_test_helpers.js
deleted file mode 100644
index ab99dcd8e..000000000
--- a/tests/unit/spinner/spinner_test_helpers.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper"
-], function( $, helper ) {
-
-return $.extend( helper, {
-	simulateKeyDownUp: function( element, keyCode, shift ) {
-		element
-			.simulate( "keydown", { keyCode: keyCode, shiftKey: shift || false } )
-			.simulate( "keyup", { keyCode: keyCode, shiftKey: shift || false } );
-	}
-} );
-
-} );
diff --git a/tests/unit/tabs/common.js b/tests/unit/tabs/common.js
new file mode 100644
index 000000000..d3aa5cd48
--- /dev/null
+++ b/tests/unit/tabs/common.js
@@ -0,0 +1,31 @@
+define( [
+	"lib/common",
+	"ui/tabs"
+], function( common ) {
+
+common.testWidget( "tabs", {
+	defaults: {
+		active: null,
+		classes: {
+			"ui-tabs": "ui-corner-all",
+			"ui-tabs-nav": "ui-corner-all",
+			"ui-tab": "ui-corner-top",
+			"ui-tabs-panel": "ui-corner-bottom"
+		},
+		collapsible: false,
+		disabled: false,
+		event: "click",
+		heightStyle: "content",
+		hide: null,
+		show: null,
+
+		// callbacks
+		activate: null,
+		beforeActivate: null,
+		beforeLoad: null,
+		create: null,
+		load: null
+	}
+});
+
+} );
diff --git a/tests/unit/tabs/core.js b/tests/unit/tabs/core.js
new file mode 100644
index 000000000..82dc61a1f
--- /dev/null
+++ b/tests/unit/tabs/core.js
@@ -0,0 +1,667 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/tabs"
+], function( $, testHelper ) {
+
+var state = testHelper.state;
+
+module( "tabs: core" );
+
+test( "markup structure", function( assert ) {
+	expect( 17 );
+	var element = $( "#tabs1" ).tabs(),
+		tabList = element.find( "ul, ol" ),
+		tabs = tabList.find( "li" ),
+		active = tabs.eq( 0 ),
+		anchors = tabs.find( "a" ),
+		panels = element.find( ".ui-tabs-panel" );
+
+	assert.hasClasses( element, "ui-tabs ui-widget ui-widget-content" );
+	assert.lacksClasses( element, "ui-tabs-collapsible" );
+	assert.hasClasses( tabList, "ui-tabs-nav ui-widget-header" );
+	equal( tabList.length, 1, "The widget contains exactly one tab list" );
+	assert.hasClasses( tabs[ 0 ], "ui-tab" );
+	assert.hasClasses( tabs[ 1 ], "ui-tab" );
+	assert.hasClasses( tabs[ 2 ], "ui-tab" );
+	equal( tabs.length, 3, "There are exactly three tabs" );
+	assert.hasClasses( anchors[ 0 ], "ui-tabs-anchor" );
+	assert.hasClasses( anchors[ 1 ], "ui-tabs-anchor" );
+	assert.hasClasses( anchors[ 2 ], "ui-tabs-anchor" );
+	equal( anchors.length, 3, "There are exactly 3 anchors" );
+	assert.hasClasses( active, "ui-tabs-active" );
+	assert.hasClasses( panels[ 0 ], "ui-tabs-panel ui-widget-content" );
+	assert.hasClasses( panels[ 1 ], "ui-tabs-panel ui-widget-content" );
+	assert.hasClasses( panels[ 2 ], "ui-tabs-panel ui-widget-content" );
+	equal( panels.length, 3, "There are exactly 3 tab panels" );
+});
+
+$.each({
+	"deep ul": "#tabs3",
+	"multiple lists, ul first": "#tabs4",
+	"multiple lists, ol first": "#tabs5",
+	"empty list": "#tabs6"
+}, function( type, selector ) {
+	test( "markup structure: " + type, function( assert ) {
+		expect( 2 );
+		var element = $( selector ).tabs();
+		assert.hasClasses( element, "ui-tabs" );
+		assert.hasClasses( $( selector + "-list" ), "ui-tabs-nav" );
+	});
+});
+
+// #5893 - Sublist in the tab list are considered as tab
+test( "nested list", function() {
+	expect( 1 );
+
+	var element = $( "#tabs6" ).tabs();
+	equal( element.tabs( "instance" ).anchors.length, 2, "should contain 2 tab" );
+});
+
+test( "disconnected from DOM", function() {
+	expect( 2 );
+
+	var element = $( "#tabs1" ).remove().tabs();
+	equal( element.find( ".ui-tabs-nav" ).length, 1, "should initialize nav" );
+	equal( element.find( ".ui-tabs-panel" ).length, 3, "should initialize panels" );
+});
+
+test( "non-tab list items", function() {
+	expect( 2 );
+
+	var element = $( "#tabs9" ).tabs();
+	equal( element.tabs( "option", "active" ), 0, "defaults to first tab" );
+	equal( element.find( ".ui-tabs-nav li.ui-state-active" ).index(), 1,
+		"first actual tab is active" );
+});
+
+test( "aria-controls", function() {
+	expect( 7 );
+	var element = $( "#tabs1" ).tabs(),
+		tabs = element.find( ".ui-tabs-nav li" );
+	tabs.each(function() {
+		var tab = $( this ),
+			anchor = tab.find( ".ui-tabs-anchor" );
+		equal( anchor.prop( "hash" ).substring( 1 ), tab.attr( "aria-controls" ) );
+	});
+
+	element = $( "#tabs2" ).tabs();
+	tabs = element.find( ".ui-tabs-nav li" );
+	equal( tabs.eq( 0 ).attr( "aria-controls" ), "colon:test" );
+	equal( tabs.eq( 1 ).attr( "aria-controls" ), "inline-style" );
+	ok( /^ui-id-\d+$/.test( tabs.eq( 2 ).attr( "aria-controls" ) ), "generated id" );
+	equal( tabs.eq( 3 ).attr( "aria-controls" ), "custom-id" );
+});
+
+test( "accessibility", function() {
+	expect( 49 );
+	var element = $( "#tabs1" ).tabs({
+			active: 1,
+			disabled: [ 2 ]
+		}),
+		tabs = element.find( ".ui-tabs-nav li" ),
+		anchors = tabs.find( ".ui-tabs-anchor" ),
+		panels = element.find( ".ui-tabs-panel" );
+
+	equal( element.find( ".ui-tabs-nav" ).attr( "role" ), "tablist", "tablist role" );
+	tabs.each(function( index ) {
+		var tab = tabs.eq( index ),
+			anchor = anchors.eq( index ),
+			anchorId = anchor.attr( "id" ),
+			panel = panels.eq( index );
+		equal( tab.attr( "role" ), "tab", "tab " + index + " role" );
+		equal( tab.attr( "aria-labelledby" ), anchorId, "tab " + index + " aria-labelledby" );
+		equal( anchor.attr( "role" ), "presentation", "anchor " + index + " role" );
+		equal( anchor.attr( "tabindex" ), -1, "anchor " + index + " tabindex" );
+		equal( panel.attr( "role" ), "tabpanel", "panel " + index + " role" );
+		equal( panel.attr( "aria-labelledby" ), anchorId, "panel " + index + " aria-labelledby" );
+	});
+
+	equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
+	equal( tabs.eq( 1 ).attr( "tabindex" ), 0, "active tab has tabindex=0" );
+	equal( tabs.eq( 1 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
+	equal( tabs.eq( 1 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded=true" );
+	equal( panels.eq( 1 ).attr( "aria-hidden" ), "false", "active panel has aria-hidden=false" );
+	equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( tabs.eq( 0 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
+	equal( tabs.eq( 0 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
+	equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
+	equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
+	equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( tabs.eq( 2 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
+	equal( tabs.eq( 2 ).attr( "aria-disabled" ), "true", "disabled tab has aria-disabled=true" );
+	equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
+	equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
+
+	element.tabs( "option", "active", 0 );
+	equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
+	equal( tabs.eq( 0 ).attr( "tabindex" ), 0, "active tab has tabindex=0" );
+	equal( tabs.eq( 0 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
+	equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded=true" );
+	equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "active panel has aria-hidden=false" );
+	equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( tabs.eq( 1 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
+	equal( tabs.eq( 1 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
+	equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
+	equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
+	equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( tabs.eq( 2 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
+	equal( tabs.eq( 2 ).attr( "aria-disabled" ), "true", "disabled tab has aria-disabled=true" );
+	equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
+	equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
+});
+
+asyncTest( "accessibility - ajax", function( assert ) {
+	expect( 6 );
+	var element = $( "#tabs2" ).tabs(),
+		tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
+		panel = $( "#custom-id" );
+
+	equal( panel.attr( "aria-live" ), "polite", "remote panel has aria-live" );
+	equal( panel.attr( "aria-busy" ), null, "does not have aria-busy on init" );
+	element.tabs( "option", "active", 3 );
+	assert.hasClasses( tab, "ui-tabs-loading" );
+	equal( panel.attr( "aria-busy" ), "true", "panel has aria-busy during load" );
+	element.one( "tabsload", function() {
+		setTimeout(function() {
+			equal( panel.attr( "aria-busy" ), null, "panel does not have aria-busy after load" );
+			assert.lacksClasses( tab, "ui-tabs-loading" );
+			start();
+		}, 1 );
+	});
+});
+
+asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER", function( assert ) {
+	expect( 92 );
+	var element = $( "#tabs1" ).tabs({
+			collapsible: true
+		}),
+		tabs = element.find( ".ui-tabs-nav li" ),
+		panels = element.find( ".ui-tabs-panel" ),
+		keyCode = $.ui.keyCode;
+
+	element.tabs( "instance" ).delay = 1;
+
+	equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
+	tabs.eq( 0 ).simulate( "focus" );
+
+	// down, right, down (wrap), up (wrap)
+	function step1() {
+		assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "first tab has focus" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
+		assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "DOWN moves focus to next tab" );
+		assert.lacksClasses( tabs.eq( 0 ), "ui-state-focus", "first tab is no longer focused" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
+		equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.RIGHT } );
+		assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "RIGHT moves focus to next tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
+		assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "DOWN wraps focus to first tab" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.UP } );
+		assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "UP wraps focus to last tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		setTimeout( step2, 25 );
+	}
+
+	// left, home, space
+	function step2() {
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.LEFT } );
+		assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "LEFT moves focus to previous tab" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
+		equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is still visible" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+
+		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.HOME } );
+		assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "HOME moves focus to first tab" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is still hidden" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is still visible" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+
+		// SPACE activates, cancels delay
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
+		setTimeout( step3 );
+	}
+
+	// end, enter
+	function step3() {
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tabs has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.END } );
+		assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "END moves focus to last tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tabs has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		// ENTER activates, cancels delay
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.ENTER } );
+		setTimeout( step4 );
+	}
+
+	// enter (collapse)
+	function step4() {
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+
+		// ENTER collapses if active
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.ENTER } );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		setTimeout( start );
+	}
+
+	setTimeout( step1 );
+});
+
+// Navigation with CTRL and COMMAND (both behave the same)
+$.each({
+	ctrl: "CTRL",
+	meta: "COMMAND"
+}, function( modifier, label ) {
+	asyncTest( "keyboard support - " + label + " navigation", function( assert ) {
+		expect( 115 );
+		var element = $( "#tabs1" ).tabs(),
+			tabs = element.find( ".ui-tabs-nav li" ),
+			panels = element.find( ".ui-tabs-panel" ),
+			keyCode = $.ui.keyCode;
+
+		element.tabs( "instance" ).delay = 1;
+
+		equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
+		tabs.eq( 0 ).simulate( "focus" );
+
+		// down
+		function step1() {
+			var eventProperties = { keyCode: keyCode.DOWN };
+			eventProperties[ modifier + "Key" ] = true;
+
+			assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "first tab has focus" );
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+
+			tabs.eq( 0 ).simulate( "keydown", eventProperties );
+			assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "DOWN moves focus to next tab" );
+			assert.lacksClasses( tabs.eq( 0 ), ".ui-state-focus", "first tab is no longer focused" );
+			equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
+			equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
+			equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+			setTimeout( step2, 25 );
+		}
+
+		// right
+		function step2() {
+			var eventProperties = { keyCode: keyCode.RIGHT };
+			eventProperties[ modifier + "Key" ] = true;
+
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+			ok( panels.eq( 1 ).is( ":hidden" ), "second panel is hidden" );
+			equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
+			equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+
+			tabs.eq( 1 ).simulate( "keydown", eventProperties );
+			assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "RIGHT moves focus to next tab" );
+			equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+			setTimeout( step3, 25 );
+		}
+
+		// down (wrap)
+		function step3() {
+			var eventProperties = { keyCode: keyCode.DOWN };
+			eventProperties[ modifier + "Key" ] = true;
+
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+			tabs.eq( 2 ).simulate( "keydown", eventProperties );
+			assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "DOWN wraps focus to first tab" );
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+			setTimeout( step4, 25 );
+		}
+
+		// up (wrap)
+		function step4() {
+			var eventProperties = { keyCode: keyCode.UP };
+			eventProperties[ modifier + "Key" ] = true;
+
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+			tabs.eq( 0 ).simulate( "keydown", eventProperties );
+			assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "UP wraps focus to last tab" );
+			equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+			setTimeout( step5, 25 );
+		}
+
+		// left
+		function step5() {
+			var eventProperties = { keyCode: keyCode.LEFT };
+			eventProperties[ modifier + "Key" ] = true;
+
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+			tabs.eq( 2 ).simulate( "keydown", eventProperties );
+			assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "LEFT moves focus to previous tab" );
+			equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
+			equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
+			equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+			setTimeout( step6, 25 );
+		}
+
+		// home
+		function step6() {
+			var eventProperties = { keyCode: keyCode.HOME };
+			eventProperties[ modifier + "Key" ] = true;
+
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+			ok( panels.eq( 1 ).is( ":hidden" ), "second panel is hidden" );
+			equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
+			equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+
+			tabs.eq( 1 ).simulate( "keydown", eventProperties );
+			assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "HOME moves focus to first tab" );
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
+			ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
+			equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
+			equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+			setTimeout( step7, 25 );
+		}
+
+		// end
+		function step7() {
+			var eventProperties = { keyCode: keyCode.END };
+			eventProperties[ modifier + "Key" ] = true;
+
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+			tabs.eq( 0 ).simulate( "keydown", eventProperties );
+			assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "END moves focus to last tab" );
+			equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+			setTimeout( step8, 25 );
+		}
+
+		// space
+		function step8() {
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+			tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
+			equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+			equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
+			ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
+			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
+			equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+			ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
+			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
+			equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+
+			setTimeout( start );
+		}
+
+		setTimeout( step1 );
+	});
+});
+
+asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function( assert ) {
+	expect( 50 );
+	var element = $( "#tabs1" ).tabs(),
+		tabs = element.find( ".ui-tabs-nav li" ),
+		panels = element.find( ".ui-tabs-panel" ),
+		keyCode = $.ui.keyCode;
+
+	equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
+	panels.attr( "tabindex", -1 );
+	panels.eq( 0 ).simulate( "focus" );
+
+	function step1() {
+		strictEqual( document.activeElement, panels[ 0 ], "first panel is activeElement" );
+
+		panels.eq( 0 ).simulate( "keydown", { keyCode: keyCode.PAGE_DOWN, altKey: true } );
+		strictEqual( document.activeElement, tabs[ 1 ], "second tab is activeElement" );
+		assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "ALT+PAGE_DOWN moves focus to next tab" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
+		ok( panels.eq( 1 ).is( ":visible" ), "second panel is visible" );
+		equal( tabs.eq( 1 ).attr( "aria-expanded" ), "true", "second tab has aria-expanded=true" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "false", "second panel has aria-hidden=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+
+		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.PAGE_DOWN, altKey: true } );
+		strictEqual( document.activeElement, tabs[ 2 ], "third tab is activeElement" );
+		assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "ALT+PAGE_DOWN moves focus to next tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is hidden" );
+		equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.PAGE_DOWN, altKey: true } );
+		strictEqual( document.activeElement, tabs[ 0 ], "first tab is activeElement" );
+		assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "ALT+PAGE_DOWN wraps focus to first tab" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		panels.eq( 0 ).simulate( "focus" );
+		setTimeout( step2 );
+	}
+
+	function step2() {
+		strictEqual( document.activeElement, panels[ 0 ], "first panel is activeElement" );
+
+		panels.eq( 0 ).simulate( "keydown", { keyCode: keyCode.PAGE_UP, altKey: true } );
+		strictEqual( document.activeElement, tabs[ 2 ], "third tab is activeElement" );
+		assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "ALT+PAGE_UP wraps focus to last tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
+		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.PAGE_UP, altKey: true } );
+		strictEqual( document.activeElement, tabs[ 1 ], "second tab is activeElement" );
+		assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "ALT+PAGE_UP moves focus to previous tab" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
+		ok( panels.eq( 1 ).is( ":visible" ), "second panel is visible" );
+		equal( tabs.eq( 1 ).attr( "aria-expanded" ), "true", "second tab has aria-expanded=true" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "false", "second panel has aria-hidden=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		panels.eq( 1 ).simulate( "focus" );
+		setTimeout( step3 );
+	}
+
+	function step3() {
+		strictEqual( document.activeElement, panels[ 1 ], "second panel is activeElement" );
+
+		panels.eq( 1 ).simulate( "keydown", { keyCode: keyCode.UP, ctrlKey: true } );
+		strictEqual( document.activeElement, tabs[ 1 ], "second tab is activeElement" );
+
+		setTimeout( start );
+	}
+
+	setTimeout( step1 );
+});
+
+test( "#3627 - Ajax tab with url containing a fragment identifier fails to load", function() {
+	expect( 1 );
+
+	$( "#tabs2" ).tabs({
+		active: 2,
+		beforeLoad: function( event, ui ) {
+			event.preventDefault();
+			ok( /test.html$/.test( ui.ajaxSettings.url ), "should ignore fragment identifier" );
+		}
+	});
+});
+
+test( "#4033 - IE expands hash to full url and misinterprets tab as ajax", function() {
+	expect( 2 );
+
+	var element = $("<div><ul><li><a href='#tab'>Tab</a></li></ul><div id='tab'></div></div>");
+	element.appendTo("#qunit-fixture");
+	element.tabs({
+		beforeLoad: function() {
+			event.preventDefault();
+			ok( false, "should not be an ajax tab" );
+		}
+	});
+
+	equal( element.find(".ui-tabs-nav li").attr("aria-controls"), "tab", "aria-contorls attribute is correct" );
+	state( element, 1 );
+});
+
+} );
diff --git a/tests/unit/tabs/events.js b/tests/unit/tabs/events.js
new file mode 100644
index 000000000..ec2f61214
--- /dev/null
+++ b/tests/unit/tabs/events.js
@@ -0,0 +1,322 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/tabs"
+], function( $, testHelper ) {
+
+var state = testHelper.state;
+
+module( "tabs: events" );
+
+test( "create", function() {
+	expect( 10 );
+
+	var element = $( "#tabs1" ),
+		tabs = element.find( "ul li" ),
+		panels = element.children( "div" );
+
+	element.tabs({
+		create: function( event, ui ) {
+			equal( ui.tab.length, 1, "tab length" );
+			strictEqual( ui.tab[ 0 ], tabs[ 0 ], "tab" );
+			equal( ui.panel.length, 1, "panel length" );
+			strictEqual( ui.panel[ 0 ], panels[ 0 ], "panel" );
+		}
+	});
+	element.tabs( "destroy" );
+
+	element.tabs({
+		active: 2,
+		create: function( event, ui ) {
+			equal( ui.tab.length, 1, "tab length" );
+			strictEqual( ui.tab[ 0 ], tabs[ 2 ], "tab" );
+			equal( ui.panel.length, 1, "panel length" );
+			strictEqual( ui.panel[ 0 ], panels[ 2 ], "panel" );
+		}
+	});
+	element.tabs( "destroy" );
+
+	element.tabs({
+		active: false,
+		collapsible: true,
+		create: function( event, ui ) {
+			equal( ui.tab.length, 0, "tab length" );
+			equal( ui.panel.length, 0, "panel length" );
+		}
+	});
+	element.tabs( "destroy" );
+});
+
+test( "beforeActivate", function() {
+	expect( 38 );
+
+	var element = $( "#tabs1" ).tabs({
+			active: false,
+			collapsible: true
+		}),
+		tabs = element.find( ".ui-tabs-nav li" ),
+		anchors = tabs.find( ".ui-tabs-anchor" ),
+		panels = element.find( ".ui-tabs-panel" );
+
+	// from collapsed
+	element.one( "tabsbeforeactivate", function( event, ui ) {
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		equal( ui.oldTab.length, 0, "oldTab length" );
+		equal( ui.oldPanel.length, 0, "oldPanel length" );
+		equal( ui.newTab.length, 1, "newTab length" );
+		strictEqual( ui.newTab[ 0 ], tabs[ 0 ], "newTab" );
+		equal( ui.newPanel.length, 1, "newPanel length" );
+		strictEqual( ui.newPanel[ 0 ], panels[ 0 ], "newPanel" );
+		state( element, 0, 0, 0 );
+	});
+	element.tabs( "option", "active", 0 );
+	state( element, 1, 0, 0 );
+
+	// switching tabs
+	element.one( "tabsbeforeactivate", function( event, ui ) {
+		equal( event.originalEvent.type, "click", "originalEvent" );
+		equal( ui.oldTab.length, 1, "oldTab length" );
+		strictEqual( ui.oldTab[ 0 ], tabs[ 0 ], "oldTab" );
+		equal( ui.oldPanel.length, 1, "oldPanel length" );
+		strictEqual( ui.oldPanel[ 0 ], panels[ 0 ], "oldPanel" );
+		equal( ui.newTab.length, 1, "newTab length" );
+		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
+		equal( ui.newPanel.length, 1, "newPanel length" );
+		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
+		state( element, 1, 0, 0 );
+	});
+	anchors.eq( 1 ).click();
+	state( element, 0, 1, 0 );
+
+	// collapsing
+	element.one( "tabsbeforeactivate", function( event, ui ) {
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		equal( ui.oldTab.length, 1, "oldTab length" );
+		strictEqual( ui.oldTab[ 0 ], tabs[ 1 ], "oldTab" );
+		equal( ui.oldPanel.length, 1, "oldPanel length" );
+		strictEqual( ui.oldPanel[ 0 ], panels[ 1 ], "oldPanel" );
+		equal( ui.newTab.length, 0, "newTab length" );
+		equal( ui.newPanel.length, 0, "newPanel length" );
+		state( element, 0, 1, 0 );
+	});
+	element.tabs( "option", "active", false );
+	state( element, 0, 0, 0 );
+
+	// prevent activation
+	element.one( "tabsbeforeactivate", function( event, ui ) {
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		equal( ui.oldTab.length, 0, "oldTab length" );
+		equal( ui.oldPanel.length, 0, "oldTab" );
+		equal( ui.newTab.length, 1, "newTab length" );
+		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
+		equal( ui.newPanel.length, 1, "newPanel length" );
+		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
+		event.preventDefault();
+		state( element, 0, 0, 0 );
+	});
+	element.tabs( "option", "active", 1 );
+	state( element, 0, 0, 0 );
+});
+
+test( "activate", function() {
+	expect( 30 );
+
+	var element = $( "#tabs1" ).tabs({
+			active: false,
+			collapsible: true
+		}),
+		tabs = element.find( ".ui-tabs-nav li" ),
+		anchors = element.find( ".ui-tabs-anchor" ),
+		panels = element.find( ".ui-tabs-panel" );
+
+	// from collapsed
+	element.one( "tabsactivate", function( event, ui ) {
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		equal( ui.oldTab.length, 0, "oldTab length" );
+		equal( ui.oldPanel.length, 0, "oldPanel length" );
+		equal( ui.newTab.length, 1, "newTab length" );
+		strictEqual( ui.newTab[ 0 ], tabs[ 0 ], "newTab" );
+		equal( ui.newPanel.length, 1, "newPanel length" );
+		strictEqual( ui.newPanel[ 0 ], panels[ 0 ], "newPanel" );
+		state( element, 1, 0, 0 );
+	});
+	element.tabs( "option", "active", 0 );
+	state( element, 1, 0, 0 );
+
+	// switching tabs
+	element.one( "tabsactivate", function( event, ui ) {
+		equal( event.originalEvent.type, "click", "originalEvent" );
+		equal( ui.oldTab.length, 1, "oldTab length" );
+		strictEqual( ui.oldTab[ 0 ], tabs[ 0 ], "oldTab" );
+		equal( ui.oldPanel.length, 1, "oldPanel length" );
+		strictEqual( ui.oldPanel[ 0 ], panels[ 0 ], "oldPanel" );
+		equal( ui.newTab.length, 1, "newTab length" );
+		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
+		equal( ui.newPanel.length, 1, "newPanel length" );
+		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
+		state( element, 0, 1, 0 );
+	});
+	anchors.eq( 1 ).click();
+	state( element, 0, 1, 0 );
+
+	// collapsing
+	element.one( "tabsactivate", function( event, ui ) {
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		equal( ui.oldTab.length, 1, "oldTab length" );
+		strictEqual( ui.oldTab[ 0 ], tabs[ 1 ], "oldTab" );
+		equal( ui.oldPanel.length, 1, "oldPanel length" );
+		strictEqual( ui.oldPanel[ 0 ], panels[ 1 ], "oldPanel" );
+		equal( ui.newTab.length, 0, "newTab length" );
+		equal( ui.newPanel.length, 0, "newPanel length" );
+		state( element, 0, 0, 0 );
+	});
+	element.tabs( "option", "active", false );
+	state( element, 0, 0, 0 );
+
+	// prevent activation
+	element.one( "tabsbeforeactivate", function( event ) {
+		ok( true, "tabsbeforeactivate" );
+		event.preventDefault();
+	});
+	element.one( "tabsactivate", function() {
+		ok( false, "tabsactivate" );
+	});
+	element.tabs( "option", "active", 1 );
+});
+
+test( "beforeLoad", function() {
+	expect( 32 );
+
+	var tab, panelId, panel,
+		element = $( "#tabs2" );
+
+	// init
+	element.one( "tabsbeforeload", function( event, ui ) {
+		tab = element.find( ".ui-tabs-nav li" ).eq( 2 );
+		panelId = tab.attr( "aria-controls" );
+		panel = $( "#" + panelId );
+
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		ok( "abort" in ui.jqXHR, "jqXHR" );
+		ok( ui.ajaxSettings.url, "data/test.html", "ajaxSettings.url" );
+		equal( ui.tab.length, 1, "tab length" );
+		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+		equal( ui.panel.length, 1, "panel length" );
+		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+		equal( ui.panel.html(), "", "panel html" );
+		event.preventDefault();
+		state( element, 0, 0, 1, 0, 0 );
+	});
+	element.tabs({ active: 2 });
+	state( element, 0, 0, 1, 0, 0 );
+	equal( panel.html(), "", "panel html after" );
+	element.tabs( "destroy" );
+
+	// .option()
+	element.one( "tabsbeforeload", function( event, ui ) {
+		tab = element.find( ".ui-tabs-nav li" ).eq( 2 );
+		panelId = tab.attr( "aria-controls" );
+		panel = $( "#" + panelId );
+
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		ok( "abort" in ui.jqXHR, "jqXHR" );
+		ok( ui.ajaxSettings.url, "data/test.html", "ajaxSettings.url" );
+		equal( ui.tab.length, 1, "tab length" );
+		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+		equal( ui.panel.length, 1, "panel length" );
+		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+		equal( ui.panel.html(), "", "panel html" );
+		event.preventDefault();
+		state( element, 1, 0, 0, 0, 0 );
+	});
+	element.tabs();
+	element.tabs( "option", "active", 2 );
+	state( element, 0, 0, 1, 0, 0 );
+	equal( panel.html(), "", "panel html after" );
+
+	// click, change panel content
+	element.one( "tabsbeforeload", function( event, ui ) {
+		tab = element.find( ".ui-tabs-nav li" ).eq( 3 );
+		panelId = tab.attr( "aria-controls" );
+		panel = $( "#" + panelId );
+
+		equal( event.originalEvent.type, "click", "originalEvent" );
+		ok( "abort" in ui.jqXHR, "jqXHR" );
+		ok( ui.ajaxSettings.url, "data/test.html", "ajaxSettings.url" );
+		equal( ui.tab.length, 1, "tab length" );
+		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+		equal( ui.panel.length, 1, "panel length" );
+		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+		ui.panel.html( "<p>testing</p>" );
+		event.preventDefault();
+		state( element, 0, 0, 1, 0, 0 );
+	});
+	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 3 ).click();
+	state( element, 0, 0, 0, 1, 0 );
+	// .toLowerCase() is needed to convert <P> to <p> in old IEs
+	equal( panel.html().toLowerCase(), "<p>testing</p>", "panel html after" );
+});
+
+asyncTest( "load", function() {
+	expect( 21 );
+
+	var tab, panelId, panel,
+		element = $( "#tabs2" );
+
+	// init
+	element.one( "tabsload", function( event, ui ) {
+		tab = element.find( ".ui-tabs-nav li" ).eq( 2 );
+		panelId = tab.attr( "aria-controls" );
+		panel = $( "#" + panelId );
+
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		equal( ui.tab.length, 1, "tab length" );
+		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+		equal( ui.panel.length, 1, "panel length" );
+		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+		equal( ui.panel.find( "p" ).length, 1, "panel html" );
+		state( element, 0, 0, 1, 0, 0 );
+		tabsload1();
+	});
+	element.tabs({ active: 2 });
+
+	function tabsload1() {
+		// .option()
+		element.one( "tabsload", function( event, ui ) {
+			tab = element.find( ".ui-tabs-nav li" ).eq( 3 );
+			panelId = tab.attr( "aria-controls" );
+			panel = $( "#" + panelId );
+
+			ok( !( "originalEvent" in event ), "originalEvent" );
+			equal( ui.tab.length, 1, "tab length" );
+			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+			equal( ui.panel.length, 1, "panel length" );
+			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+			equal( ui.panel.find( "p" ).length, 1, "panel html" );
+			state( element, 0, 0, 0, 1, 0 );
+			tabsload2();
+		});
+		element.tabs( "option", "active", 3 );
+	}
+
+	function tabsload2() {
+		// click, change panel content
+		element.one( "tabsload", function( event, ui ) {
+			tab = element.find( ".ui-tabs-nav li" ).eq( 4 );
+			panelId = tab.attr( "aria-controls" );
+			panel = $( "#" + panelId );
+
+			equal( event.originalEvent.type, "click", "originalEvent" );
+			equal( ui.tab.length, 1, "tab length" );
+			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+			equal( ui.panel.length, 1, "panel length" );
+			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+			equal( ui.panel.find( "p" ).length, 1, "panel html" );
+			state( element, 0, 0, 0, 0, 1 );
+			start();
+		});
+		element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).click();
+	}
+});
+
+} );
diff --git a/tests/unit/tabs/helper.js b/tests/unit/tabs/helper.js
new file mode 100644
index 000000000..5c9625f8c
--- /dev/null
+++ b/tests/unit/tabs/helper.js
@@ -0,0 +1,74 @@
+define( [
+	"jquery",
+	"lib/helper",
+	"ui/tabs"
+], function( $, helper ) {
+
+return $.extend( helper, {
+	disabled: function( tabs, state ) {
+		var expected, actual,
+			internalState = tabs.tabs( "option", "disabled" );
+
+		if ( internalState === false ) {
+			internalState = [];
+		}
+		if ( internalState === true ) {
+			internalState = $.map( new Array( tabs.find( ".ui-tabs-nav li" ).length ), function( _, index ) {
+				return index;
+			});
+		}
+
+		expected = $.map( new Array( tabs.find ( ".ui-tabs-nav li" ).length ), function( _, index ) {
+			if ( typeof state === "boolean" ) {
+				return state ? 1 : 0;
+			} else {
+				return $.inArray( index, state ) !== -1 ? 1 : 0;
+			}
+		});
+
+		actual = tabs.find( ".ui-tabs-nav li" ).map(function( index ) {
+			var tab = $( this ),
+				tabIsDisabled = tab.hasClass( "ui-state-disabled" );
+
+			if ( tabIsDisabled && $.inArray( index, internalState ) !== -1 ) {
+				return 1;
+			}
+			if ( !tabIsDisabled && $.inArray( index, internalState ) === -1 ) {
+				return 0;
+			}
+			// mixed state - invalid
+			return -1;
+		}).get();
+
+		deepEqual( tabs.tabs( "option", "disabled" ), state );
+		deepEqual( actual, expected );
+	},
+
+	equalHeight: function( tabs, height ) {
+		tabs.find( ".ui-tabs-panel" ).each(function() {
+			equal( $( this ).outerHeight(), height );
+		});
+	},
+
+	state: function( tabs ) {
+		var expected = $.makeArray( arguments ).slice( 1 ),
+			actual = tabs.find( ".ui-tabs-nav li" ).map(function() {
+				var tab = $( this ),
+					panel = $( $.ui.tabs.prototype._sanitizeSelector(
+						"#" + tab.attr( "aria-controls" ) ) ),
+					tabIsActive = tab.hasClass( "ui-state-active" ),
+					panelIsActive = panel.css( "display" ) !== "none";
+
+				if ( tabIsActive && panelIsActive ) {
+					return 1;
+				}
+				if ( !tabIsActive && !panelIsActive ) {
+					return 0;
+				}
+				return -1; // mixed state - invalid
+			}).get();
+		deepEqual( actual, expected );
+	}
+} );
+
+} );
diff --git a/tests/unit/tabs/methods.js b/tests/unit/tabs/methods.js
new file mode 100644
index 000000000..5975e5889
--- /dev/null
+++ b/tests/unit/tabs/methods.js
@@ -0,0 +1,290 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/tabs"
+], function( $, testHelper ) {
+
+var disabled = testHelper.disabled,
+	state = testHelper.state;
+
+module( "tabs: methods" );
+
+test( "destroy", function( assert ) {
+	expect( 2 );
+	assert.domEqual( "#tabs1", function() {
+		$( "#tabs1" ).tabs().tabs( "destroy" );
+	});
+	assert.domEqual( "#tabs2", function() {
+		$( "#tabs2" ).tabs().tabs( "destroy" );
+	});
+});
+
+asyncTest( "destroy - ajax", function( assert ) {
+	expect( 1 );
+	assert.domEqual( "#tabs2", function( done ) {
+		var element = $( "#tabs2" ).tabs({
+			load: function() {
+				setTimeout(function() {
+					element.tabs( "destroy" );
+					done();
+					start();
+				});
+			}
+		});
+		element.tabs( "option", "active", 2 );
+	});
+});
+
+test( "enable", function() {
+	expect( 8 );
+
+	var element = $( "#tabs1" ).tabs({ disabled: true });
+	disabled( element, true );
+	element.tabs( "enable" );
+	disabled( element, false );
+	element.tabs( "destroy" );
+
+	element.tabs({ disabled: [ 0, 1 ] });
+	disabled( element, [ 0, 1 ] );
+	element.tabs( "enable" );
+	disabled( element, false );
+});
+
+test( "enable( index )", function() {
+	expect( 10 );
+
+	var element = $( "#tabs1" ).tabs({ disabled: true });
+	disabled( element, true );
+	// fully disabled -> partially disabled
+	element.tabs( "enable", 1 );
+	disabled( element, [ 0, 2 ] );
+	// partially disabled -> partially disabled
+	element.tabs( "enable", 2 );
+	disabled( element, [ 0 ] );
+	// already enabled tab, no change
+	element.tabs( "enable", 2 );
+	disabled( element, [ 0 ] );
+	// partially disabled -> fully enabled
+	element.tabs( "enable", 0 );
+	disabled( element, false );
+});
+
+test( "disable", function() {
+	expect( 8 );
+
+	var element = $( "#tabs1" ).tabs({ disabled: false });
+	disabled( element, false );
+	element.tabs( "disable" );
+	disabled( element, true );
+	element.tabs( "destroy" );
+
+	element.tabs({ disabled: [ 0, 1 ] });
+	disabled( element, [ 0, 1 ] );
+	element.tabs( "disable" );
+	disabled( element, true );
+});
+
+test( "disable( index )", function() {
+	expect( 10 );
+
+	var element = $( "#tabs1" ).tabs({ disabled: false });
+	disabled( element, false );
+	// fully enabled -> partially disabled
+	element.tabs( "disable", 1 );
+	disabled( element, [ 1 ] );
+	// partially disabled -> partially disabled
+	element.tabs( "disable", 2 );
+	disabled( element, [ 1, 2 ] );
+	// already disabled tab, no change
+	element.tabs( "disable", 2 );
+	disabled( element, [ 1, 2 ] );
+	// partially disabled -> fully disabled
+	element.tabs( "disable", 0 );
+	disabled( element, true );
+});
+
+test( "refresh", function() {
+	expect( 27 );
+
+	var element = $( "#tabs1" ).tabs();
+	state( element, 1, 0, 0 );
+	disabled( element, false );
+
+	// disable tab via markup
+	element.find( ".ui-tabs-nav li" ).eq( 1 ).addClass( "ui-state-disabled" );
+	element.tabs( "refresh" );
+	state( element, 1, 0, 0 );
+	disabled( element, [ 1 ] );
+
+	// add remote tab
+	element.find( ".ui-tabs-nav" ).append( "<li id='newTab'><a href='data/test.html'>new</a></li>" );
+	element.tabs( "refresh" );
+	state( element, 1, 0, 0, 0 );
+	disabled( element, [ 1 ] );
+	equal( element.find( "#" + $( "#newTab" ).attr( "aria-controls" ) ).length, 1,
+		"panel added for remote tab" );
+
+	// remove all tabs
+	element.find( ".ui-tabs-nav li, .ui-tabs-panel" ).remove();
+	element.tabs( "refresh" );
+	state( element );
+	equal( element.tabs( "option", "active" ), false, "no active tab" );
+
+	// add tabs
+	element.find( ".ui-tabs-nav" )
+		.append( "<li class='ui-state-disabled'><a href='#newTab2'>new 2</a></li>" )
+		.append( "<li><a href='#newTab3'>new 3</a></li>" )
+		.append( "<li><a href='#newTab4'>new 4</a></li>" )
+		.append( "<li><a href='#newTab5'>new 5</a></li>" );
+	element
+		.append( "<div id='newTab2'>new 2</div>" )
+		.append( "<div id='newTab3'>new 3</div>" )
+		.append( "<div id='newTab4'>new 4</div>" )
+		.append( "<div id='newTab5'>new 5</div>" );
+	element.tabs( "refresh" );
+	state( element, 0, 0, 0, 0 );
+	disabled( element, [ 0 ] );
+
+	// activate third tab
+	element.tabs( "option", "active", 2 );
+	state( element, 0, 0, 1, 0 );
+	disabled( element, [ 0 ] );
+
+	// remove fourth tab, third tab should stay active
+	element.find( ".ui-tabs-nav li" ).eq( 3 ).remove();
+	element.find( ".ui-tabs-panel" ).eq( 3 ).remove();
+	element.tabs( "refresh" );
+	state( element, 0, 0, 1 );
+	disabled( element, [ 0 ] );
+
+	// remove third (active) tab, second tab should become active
+	element.find( ".ui-tabs-nav li" ).eq( 2 ).remove();
+	element.find( ".ui-tabs-panel" ).eq( 2 ).remove();
+	element.tabs( "refresh" );
+	state( element, 0, 1 );
+	disabled( element, [ 0 ] );
+
+	// remove first tab, previously active tab (now first) should stay active
+	element.find( ".ui-tabs-nav li" ).eq( 0 ).remove();
+	element.find( ".ui-tabs-panel" ).eq( 0 ).remove();
+	element.tabs( "refresh" );
+	state( element, 1 );
+	disabled( element, false );
+});
+
+test( "refresh - looping", function() {
+	expect( 6 );
+
+	var element = $( "#tabs1" ).tabs({
+		disabled: [ 0 ],
+		active: 1
+	});
+	state( element, 0, 1, 0 );
+	disabled( element, [ 0 ] );
+
+	// remove active, jump to previous
+	// previous is disabled, just back one more
+	// reached first tab, move to end
+	// activate last tab
+	element.find( ".ui-tabs-nav li" ).eq( 2 ).remove();
+	element.tabs( "refresh" );
+	state( element, 0, 1 );
+	disabled( element, [ 0 ] );
+});
+
+asyncTest( "load", function() {
+	expect( 30 );
+
+	var element = $( "#tabs2" ).tabs();
+
+	// load content of inactive tab
+	// useful for preloading content with custom caching
+	element.one( "tabsbeforeload", function( event, ui ) {
+		var tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
+			panelId = tab.attr( "aria-controls" ),
+			panel = $( "#" + panelId );
+
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		equal( ui.tab.length, 1, "tab length" );
+		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+		equal( ui.panel.length, 1, "panel length" );
+		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+		state( element, 1, 0, 0, 0, 0 );
+	});
+	element.one( "tabsload", function( event, ui ) {
+		// TODO: remove wrapping in 2.0
+		var uiTab = $( ui.tab ),
+			uiPanel = $( ui.panel ),
+			tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
+			panelId = tab.attr( "aria-controls" ),
+			panel = $( "#" + panelId );
+
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		equal( uiTab.length, 1, "tab length" );
+		strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
+		equal( uiPanel.length, 1, "panel length" );
+		strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
+		equal( uiPanel.find( "p" ).length, 1, "panel html" );
+		state( element, 1, 0, 0, 0, 0 );
+		setTimeout( tabsload1 );
+	});
+	element.tabs( "load", 3 );
+	state( element, 1, 0, 0, 0, 0 );
+
+	function tabsload1() {
+		// no need to test details of event (tested in events tests)
+		element.one( "tabsbeforeload", function() {
+			ok( true, "tabsbeforeload invoked" );
+		});
+		element.one( "tabsload", function() {
+			ok( true, "tabsload invoked" );
+			setTimeout( tabsload2 );
+		});
+		element.tabs( "option", "active", 3 );
+		state( element, 0, 0, 0, 1, 0 );
+	}
+
+	function tabsload2() {
+		// reload content of active tab
+		element.one( "tabsbeforeload", function( event, ui ) {
+			var tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
+				panelId = tab.attr( "aria-controls" ),
+				panel = $( "#" + panelId );
+
+			ok( !( "originalEvent" in event ), "originalEvent" );
+			equal( ui.tab.length, 1, "tab length" );
+			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+			equal( ui.panel.length, 1, "panel length" );
+			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+			state( element, 0, 0, 0, 1, 0 );
+		});
+		element.one( "tabsload", function( event, ui ) {
+			// TODO: remove wrapping in 2.0
+			var uiTab = $( ui.tab ),
+				uiPanel = $( ui.panel ),
+				tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
+				panelId = tab.attr( "aria-controls" ),
+				panel = $( "#" + panelId );
+
+			ok( !( "originalEvent" in event ), "originalEvent" );
+			equal( uiTab.length, 1, "tab length" );
+			strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
+			equal( uiPanel.length, 1, "panel length" );
+			strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
+			state( element, 0, 0, 0, 1, 0 );
+			start();
+		});
+		element.tabs( "load", 3 );
+		state( element, 0, 0, 0, 1, 0 );
+	}
+});
+
+test( "widget", function() {
+	expect( 2 );
+	var element = $( "#tabs1" ).tabs(),
+		widgetElement = element.tabs( "widget" );
+	equal( widgetElement.length, 1, "one element" );
+	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
+});
+
+} );
diff --git a/tests/unit/tabs/options.js b/tests/unit/tabs/options.js
new file mode 100644
index 000000000..e1a663a71
--- /dev/null
+++ b/tests/unit/tabs/options.js
@@ -0,0 +1,374 @@
+define( [
+	"jquery",
+	"./helper",
+	"ui/tabs"
+], function( $, testHelper ) {
+
+var disabled = testHelper.disabled,
+	equalHeight = testHelper.equalHeight,
+	state = testHelper.state;
+
+module( "tabs: options" );
+
+test( "{ active: default }", function() {
+	expect( 6 );
+
+	var element = $( "#tabs1" ).tabs();
+	equal( element.tabs( "option", "active" ), 0, "should be 0 by default" );
+	state( element, 1, 0, 0 );
+	element.tabs( "destroy" );
+
+	location.hash = "#fragment-3";
+	element = $( "#tabs1" ).tabs();
+	equal( element.tabs( "option", "active" ), 2, "should be 2 based on URL" );
+	state( element, 0, 0, 1 );
+	element.tabs( "destroy" );
+
+	location.hash = "#custom-id";
+	element = $( "#tabs2" ).tabs();
+	equal( element.tabs( "option", "active" ), 3, "should be 3 based on URL" );
+	state( element, 0, 0, 0, 1, 0 );
+	element.tabs( "destroy" );
+	location.hash = "#";
+});
+
+test( "{ active: false }", function() {
+	expect( 7 );
+
+	var element = $( "#tabs1" ).tabs({
+		active: false,
+		collapsible: true
+	});
+	state( element, 0, 0, 0 );
+	equal( element.find( ".ui-tabs-nav .ui-state-active" ).length, 0, "no tabs selected" );
+	strictEqual( element.tabs( "option", "active" ), false );
+
+	element.tabs( "option", "collapsible", false );
+	state( element, 1, 0, 0 );
+	equal( element.tabs( "option", "active" ), 0 );
+
+	element.tabs( "destroy" );
+	element.tabs({
+		active: false
+	});
+	state( element, 1, 0, 0 );
+	strictEqual( element.tabs( "option", "active" ), 0 );
+});
+
+test( "{ active: Number }", function() {
+	expect( 8 );
+
+	var element = $( "#tabs1" ).tabs({
+		active: 2
+	});
+	equal( element.tabs( "option", "active" ), 2 );
+	state( element, 0, 0, 1 );
+
+	element.tabs( "option", "active", 0 );
+	equal( element.tabs( "option", "active" ), 0 );
+	state( element, 1, 0, 0 );
+
+	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).click();
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.tabs( "option", "active", 10 );
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+});
+
+test( "{ active: -Number }", function() {
+	expect( 8 );
+
+	var element = $( "#tabs1" ).tabs({
+		active: -1
+	});
+	equal( element.tabs( "option", "active" ), 2 );
+	state( element, 0, 0, 1 );
+
+	element.tabs( "option", "active", -2 );
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.tabs( "option", "active", -10 );
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.tabs( "option", "active", -3 );
+	equal( element.tabs( "option", "active" ), 0 );
+	state( element, 1, 0, 0 );
+});
+
+test( "active - mismatched tab/panel order", function() {
+	expect( 3 );
+
+	location.hash = "#tabs7-2";
+	var element = $( "#tabs7" ).tabs();
+	equal( element.tabs( "option", "active" ), 1, "should be 1 based on URL" );
+	state( element, 0, 1 );
+	element.tabs( "option", "active", 0 );
+	state( element, 1, 0 );
+	location.hash = "#";
+});
+
+test( "collapsible", function( assert ) {
+	expect( 13 );
+
+	var element = $( "#tabs1" ).tabs({
+		active: 1,
+		collapsible: true
+	});
+	assert.hasClasses( element, "ui-tabs-collapsible" );
+	element.tabs( "option", "active", false );
+	equal( element.tabs( "option", "active" ), false );
+	state( element, 0, 0, 0 );
+
+	element.tabs( "option", "active", 1 );
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.find( ".ui-state-active .ui-tabs-anchor" ).click();
+	equal( element.tabs( "option", "active" ), false );
+	state( element, 0, 0, 0 );
+
+	element.tabs( "option", "collapsible", false );
+	assert.lacksClasses( element, "ui-tabs-collapsible" );
+
+	element.tabs( "option", "collapsible", true );
+
+	assert.hasClasses( element, "ui-tabs-collapsible" );
+
+	element.tabs({
+		active: 1,
+		collapsible: false
+	});
+	element.tabs( "option", "active", false );
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.find( ".ui-state-active .ui-tabs-anchor" ).eq( 1 ).click();
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+});
+
+test( "disabled", function( assert ) {
+	expect( 23 );
+
+	// fully enabled by default
+	var event,
+		element = $( "#tabs1" ).tabs();
+	disabled( element, false );
+
+	assert.lacksClasses( element.tabs( "widget" ), "ui-state-disabled" );
+	assert.lacksClasses( element.tabs( "widget" ), "ui-tabs-disabled" );
+	ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );
+
+	// disable single tab
+	element.tabs( "option", "disabled", [ 1 ] );
+	disabled( element, [ 1 ] );
+
+	assert.lacksClasses( element.tabs( "widget" ), "ui-state-disabled" );
+	assert.lacksClasses( element.tabs( "widget" ), "ui-tabs-disabled" );
+	ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );
+
+	// disabled active tab
+	element.tabs( "option", "disabled", [ 0, 1 ] );
+	disabled( element, [ 0, 1 ] );
+
+	assert.lacksClasses( element.tabs( "widget" ), "ui-state-disabled" );
+	assert.lacksClasses( element.tabs( "widget" ), "ui-tabs-disabled" );
+	ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );
+
+	// disable all tabs
+	element.tabs( "option", "disabled", [ 0, 1, 2 ] );
+	disabled( element, true );
+
+	assert.lacksClasses( element.tabs( "widget" ), "ui-state-disabled" );
+	assert.lacksClasses( element.tabs( "widget" ), "ui-tabs-disabled" );
+	ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );
+
+	event = $.Event( "click" );
+	element.find( ".ui-tabs-anchor" ).eq( 0 ).trigger( event );
+	ok( event.isDefaultPrevented(), "click is prevented for disabled tab" );
+
+	// enable all tabs
+	element.tabs( "option", "disabled", [] );
+	disabled( element, false );
+});
+
+test( "{ event: null }", function() {
+	expect( 5 );
+
+	var element = $( "#tabs1" ).tabs({
+		event: null
+	});
+	state( element, 1, 0, 0 );
+
+	element.tabs( "option", "active", 1 );
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	// ensure default click handler isn't bound
+	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 2 ).click();
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+});
+
+test( "{ event: custom }", function() {
+	expect( 11 );
+
+	var element = $( "#tabs1" ).tabs({
+		event: "custom1 custom2"
+	});
+	state( element, 1, 0, 0 );
+
+	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).trigger( "custom1" );
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	// ensure default click handler isn't bound
+	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 2 ).trigger( "click" );
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+
+	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 2 ).trigger( "custom2" );
+	equal( element.tabs( "option", "active" ), 2 );
+	state( element, 0, 0, 1 );
+
+	element.tabs( "option", "event", "custom3" );
+
+	// ensure old event handlers are unbound
+	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).trigger( "custom1" );
+	equal( element.tabs( "option", "active" ), 2 );
+	state( element, 0, 0, 1 );
+
+	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).trigger( "custom3" );
+	equal( element.tabs( "option", "active" ), 1 );
+	state( element, 0, 1, 0 );
+});
+
+test( "{ heightStyle: 'auto' }", function() {
+	expect( 2 );
+	var element = $( "#tabs8" ).tabs({ heightStyle: "auto" });
+	equalHeight( element, 45 );
+});
+
+test( "{ heightStyle: 'content' }", function() {
+	expect( 2 );
+	var element = $( "#tabs8" ).tabs({ heightStyle: "content" }),
+		sizes = element.find( ".ui-tabs-panel" ).map(function() {
+			return $( this ).height();
+		}).get();
+	equal( sizes[ 0 ], 45 );
+	equal( sizes[ 1 ], 15 );
+});
+
+test( "{ heightStyle: 'fill' }", function() {
+	expect( 4 );
+	$( "#tabs8Wrapper" ).height( 500 );
+	var element = $( "#tabs8" ).tabs({ heightStyle: "fill" });
+	equalHeight( element, 485 );
+	element.tabs( "destroy" );
+
+	element = $( "#tabs8" ).css({
+		"border": "1px solid black",
+		"padding": "1px 0"
+	});
+	element.tabs({ heightStyle: "fill" });
+	equalHeight( element, 481 );
+});
+
+test( "{ heightStyle: 'fill' } with sibling", function() {
+	expect( 2 );
+	$( "#tabs8Wrapper" ).height( 500 );
+	$( "<p>Lorem Ipsum</p>" )
+		.css({
+			height: 50,
+			marginTop: 20,
+			marginBottom: 30
+		})
+		.prependTo( "#tabs8Wrapper" );
+	var element = $( "#tabs8" ).tabs({ heightStyle: "fill" });
+	equalHeight( element, 385 );
+});
+
+test( "{ heightStyle: 'fill' } with multiple siblings", function() {
+	expect( 2 );
+	$( "#tabs8Wrapper" ).height( 500 );
+	$( "<p>Lorem Ipsum</p>" )
+		.css({
+			height: 50,
+			marginTop: 20,
+			marginBottom: 30
+		})
+		.prependTo( "#tabs8Wrapper" );
+	$( "<p>Lorem Ipsum</p>" )
+		.css({
+			height: 50,
+			marginTop: 20,
+			marginBottom: 30,
+			position: "absolute"
+		})
+		.prependTo( "#tabs8Wrapper" );
+	$( "<p>Lorem Ipsum</p>" )
+		.css({
+			height: 25,
+			marginTop: 10,
+			marginBottom: 15
+		})
+		.prependTo( "#tabs8Wrapper" );
+	var element = $( "#tabs8" ).tabs({ heightStyle: "fill" });
+	equalHeight( element, 335 );
+});
+
+test( "hide and show: false", function() {
+	expect( 3 );
+	var element = $( "#tabs1" ).tabs({
+			show: false,
+			hide: false
+		}),
+		widget = element.tabs( "instance" ),
+		panels = element.find( ".ui-tabs-panel" );
+	widget._show = function() {
+		ok( false, "_show() called" );
+	};
+	widget._hide = function() {
+		ok( false, "_hide() called" );
+	};
+
+	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
+	element.tabs( "option", "active", 1 );
+	ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
+	ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
+});
+
+asyncTest( "hide and show - animation", function() {
+	expect( 5 );
+	var element = $( "#tabs1" ).tabs({
+			show: "drop",
+			hide: 2000
+		}),
+		widget = element.tabs( "instance" ),
+		panels = element.find( ".ui-tabs-panel" );
+	widget._show = function( element, options, callback ) {
+		strictEqual( element[ 0 ], panels[ 1 ], "correct element in _show()" );
+		equal( options, "drop", "correct options in _show()" );
+		setTimeout(function() {
+			callback();
+		});
+	};
+	widget._hide = function( element, options, callback ) {
+		strictEqual( element[ 0 ], panels[ 0 ], "correct element in _hide()" );
+		equal( options, 2000, "correct options in _hide()" );
+		setTimeout(function() {
+			callback();
+			start();
+		});
+	};
+
+	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
+	element.tabs( "option", "active", 1 );
+});
+
+} );
diff --git a/tests/unit/tabs/tabs_common.js b/tests/unit/tabs/tabs_common.js
deleted file mode 100644
index d3aa5cd48..000000000
--- a/tests/unit/tabs/tabs_common.js
+++ /dev/null
@@ -1,31 +0,0 @@
-define( [
-	"lib/common",
-	"ui/tabs"
-], function( common ) {
-
-common.testWidget( "tabs", {
-	defaults: {
-		active: null,
-		classes: {
-			"ui-tabs": "ui-corner-all",
-			"ui-tabs-nav": "ui-corner-all",
-			"ui-tab": "ui-corner-top",
-			"ui-tabs-panel": "ui-corner-bottom"
-		},
-		collapsible: false,
-		disabled: false,
-		event: "click",
-		heightStyle: "content",
-		hide: null,
-		show: null,
-
-		// callbacks
-		activate: null,
-		beforeActivate: null,
-		beforeLoad: null,
-		create: null,
-		load: null
-	}
-});
-
-} );
diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js
deleted file mode 100644
index 2e39ca0e6..000000000
--- a/tests/unit/tabs/tabs_core.js
+++ /dev/null
@@ -1,667 +0,0 @@
-define( [
-	"jquery",
-	"./tabs_test_helpers",
-	"ui/tabs"
-], function( $, testHelper ) {
-
-var state = testHelper.state;
-
-module( "tabs: core" );
-
-test( "markup structure", function( assert ) {
-	expect( 17 );
-	var element = $( "#tabs1" ).tabs(),
-		tabList = element.find( "ul, ol" ),
-		tabs = tabList.find( "li" ),
-		active = tabs.eq( 0 ),
-		anchors = tabs.find( "a" ),
-		panels = element.find( ".ui-tabs-panel" );
-
-	assert.hasClasses( element, "ui-tabs ui-widget ui-widget-content" );
-	assert.lacksClasses( element, "ui-tabs-collapsible" );
-	assert.hasClasses( tabList, "ui-tabs-nav ui-widget-header" );
-	equal( tabList.length, 1, "The widget contains exactly one tab list" );
-	assert.hasClasses( tabs[ 0 ], "ui-tab" );
-	assert.hasClasses( tabs[ 1 ], "ui-tab" );
-	assert.hasClasses( tabs[ 2 ], "ui-tab" );
-	equal( tabs.length, 3, "There are exactly three tabs" );
-	assert.hasClasses( anchors[ 0 ], "ui-tabs-anchor" );
-	assert.hasClasses( anchors[ 1 ], "ui-tabs-anchor" );
-	assert.hasClasses( anchors[ 2 ], "ui-tabs-anchor" );
-	equal( anchors.length, 3, "There are exactly 3 anchors" );
-	assert.hasClasses( active, "ui-tabs-active" );
-	assert.hasClasses( panels[ 0 ], "ui-tabs-panel ui-widget-content" );
-	assert.hasClasses( panels[ 1 ], "ui-tabs-panel ui-widget-content" );
-	assert.hasClasses( panels[ 2 ], "ui-tabs-panel ui-widget-content" );
-	equal( panels.length, 3, "There are exactly 3 tab panels" );
-});
-
-$.each({
-	"deep ul": "#tabs3",
-	"multiple lists, ul first": "#tabs4",
-	"multiple lists, ol first": "#tabs5",
-	"empty list": "#tabs6"
-}, function( type, selector ) {
-	test( "markup structure: " + type, function( assert ) {
-		expect( 2 );
-		var element = $( selector ).tabs();
-		assert.hasClasses( element, "ui-tabs" );
-		assert.hasClasses( $( selector + "-list" ), "ui-tabs-nav" );
-	});
-});
-
-// #5893 - Sublist in the tab list are considered as tab
-test( "nested list", function() {
-	expect( 1 );
-
-	var element = $( "#tabs6" ).tabs();
-	equal( element.tabs( "instance" ).anchors.length, 2, "should contain 2 tab" );
-});
-
-test( "disconnected from DOM", function() {
-	expect( 2 );
-
-	var element = $( "#tabs1" ).remove().tabs();
-	equal( element.find( ".ui-tabs-nav" ).length, 1, "should initialize nav" );
-	equal( element.find( ".ui-tabs-panel" ).length, 3, "should initialize panels" );
-});
-
-test( "non-tab list items", function() {
-	expect( 2 );
-
-	var element = $( "#tabs9" ).tabs();
-	equal( element.tabs( "option", "active" ), 0, "defaults to first tab" );
-	equal( element.find( ".ui-tabs-nav li.ui-state-active" ).index(), 1,
-		"first actual tab is active" );
-});
-
-test( "aria-controls", function() {
-	expect( 7 );
-	var element = $( "#tabs1" ).tabs(),
-		tabs = element.find( ".ui-tabs-nav li" );
-	tabs.each(function() {
-		var tab = $( this ),
-			anchor = tab.find( ".ui-tabs-anchor" );
-		equal( anchor.prop( "hash" ).substring( 1 ), tab.attr( "aria-controls" ) );
-	});
-
-	element = $( "#tabs2" ).tabs();
-	tabs = element.find( ".ui-tabs-nav li" );
-	equal( tabs.eq( 0 ).attr( "aria-controls" ), "colon:test" );
-	equal( tabs.eq( 1 ).attr( "aria-controls" ), "inline-style" );
-	ok( /^ui-id-\d+$/.test( tabs.eq( 2 ).attr( "aria-controls" ) ), "generated id" );
-	equal( tabs.eq( 3 ).attr( "aria-controls" ), "custom-id" );
-});
-
-test( "accessibility", function() {
-	expect( 49 );
-	var element = $( "#tabs1" ).tabs({
-			active: 1,
-			disabled: [ 2 ]
-		}),
-		tabs = element.find( ".ui-tabs-nav li" ),
-		anchors = tabs.find( ".ui-tabs-anchor" ),
-		panels = element.find( ".ui-tabs-panel" );
-
-	equal( element.find( ".ui-tabs-nav" ).attr( "role" ), "tablist", "tablist role" );
-	tabs.each(function( index ) {
-		var tab = tabs.eq( index ),
-			anchor = anchors.eq( index ),
-			anchorId = anchor.attr( "id" ),
-			panel = panels.eq( index );
-		equal( tab.attr( "role" ), "tab", "tab " + index + " role" );
-		equal( tab.attr( "aria-labelledby" ), anchorId, "tab " + index + " aria-labelledby" );
-		equal( anchor.attr( "role" ), "presentation", "anchor " + index + " role" );
-		equal( anchor.attr( "tabindex" ), -1, "anchor " + index + " tabindex" );
-		equal( panel.attr( "role" ), "tabpanel", "panel " + index + " role" );
-		equal( panel.attr( "aria-labelledby" ), anchorId, "panel " + index + " aria-labelledby" );
-	});
-
-	equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
-	equal( tabs.eq( 1 ).attr( "tabindex" ), 0, "active tab has tabindex=0" );
-	equal( tabs.eq( 1 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
-	equal( tabs.eq( 1 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded=true" );
-	equal( panels.eq( 1 ).attr( "aria-hidden" ), "false", "active panel has aria-hidden=false" );
-	equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
-	equal( tabs.eq( 0 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
-	equal( tabs.eq( 0 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
-	equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
-	equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
-	equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
-	equal( tabs.eq( 2 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
-	equal( tabs.eq( 2 ).attr( "aria-disabled" ), "true", "disabled tab has aria-disabled=true" );
-	equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
-	equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
-
-	element.tabs( "option", "active", 0 );
-	equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
-	equal( tabs.eq( 0 ).attr( "tabindex" ), 0, "active tab has tabindex=0" );
-	equal( tabs.eq( 0 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
-	equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded=true" );
-	equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "active panel has aria-hidden=false" );
-	equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
-	equal( tabs.eq( 1 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
-	equal( tabs.eq( 1 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
-	equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
-	equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
-	equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
-	equal( tabs.eq( 2 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
-	equal( tabs.eq( 2 ).attr( "aria-disabled" ), "true", "disabled tab has aria-disabled=true" );
-	equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
-	equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
-});
-
-asyncTest( "accessibility - ajax", function( assert ) {
-	expect( 6 );
-	var element = $( "#tabs2" ).tabs(),
-		tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
-		panel = $( "#custom-id" );
-
-	equal( panel.attr( "aria-live" ), "polite", "remote panel has aria-live" );
-	equal( panel.attr( "aria-busy" ), null, "does not have aria-busy on init" );
-	element.tabs( "option", "active", 3 );
-	assert.hasClasses( tab, "ui-tabs-loading" );
-	equal( panel.attr( "aria-busy" ), "true", "panel has aria-busy during load" );
-	element.one( "tabsload", function() {
-		setTimeout(function() {
-			equal( panel.attr( "aria-busy" ), null, "panel does not have aria-busy after load" );
-			assert.lacksClasses( tab, "ui-tabs-loading" );
-			start();
-		}, 1 );
-	});
-});
-
-asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER", function( assert ) {
-	expect( 92 );
-	var element = $( "#tabs1" ).tabs({
-			collapsible: true
-		}),
-		tabs = element.find( ".ui-tabs-nav li" ),
-		panels = element.find( ".ui-tabs-panel" ),
-		keyCode = $.ui.keyCode;
-
-	element.tabs( "instance" ).delay = 1;
-
-	equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
-	tabs.eq( 0 ).simulate( "focus" );
-
-	// down, right, down (wrap), up (wrap)
-	function step1() {
-		assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "first tab has focus" );
-		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-
-		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
-		assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "DOWN moves focus to next tab" );
-		assert.lacksClasses( tabs.eq( 0 ), "ui-state-focus", "first tab is no longer focused" );
-		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
-		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
-		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
-		equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
-		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
-		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.RIGHT } );
-		assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "RIGHT moves focus to next tab" );
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
-		equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
-		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
-		assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "DOWN wraps focus to first tab" );
-		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
-		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.UP } );
-		assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "UP wraps focus to last tab" );
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
-		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
-		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-		setTimeout( step2, 25 );
-	}
-
-	// left, home, space
-	function step2() {
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
-		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
-		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
-		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
-
-		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.LEFT } );
-		assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "LEFT moves focus to previous tab" );
-		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
-		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
-		equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
-		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
-		ok( panels.eq( 2 ).is( ":visible" ), "third panel is still visible" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
-
-		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.HOME } );
-		assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "HOME moves focus to first tab" );
-		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-		equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
-		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is still hidden" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
-		ok( panels.eq( 2 ).is( ":visible" ), "third panel is still visible" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
-
-		// SPACE activates, cancels delay
-		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
-		setTimeout( step3 );
-	}
-
-	// end, enter
-	function step3() {
-		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
-		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tabs has aria-expanded=true" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-
-		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.END } );
-		assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "END moves focus to last tab" );
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
-		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
-		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tabs has aria-expanded=true" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-		// ENTER activates, cancels delay
-		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.ENTER } );
-		setTimeout( step4 );
-	}
-
-	// enter (collapse)
-	function step4() {
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
-		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
-		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
-
-		// ENTER collapses if active
-		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.ENTER } );
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
-		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-
-		setTimeout( start );
-	}
-
-	setTimeout( step1 );
-});
-
-// Navigation with CTRL and COMMAND (both behave the same)
-$.each({
-	ctrl: "CTRL",
-	meta: "COMMAND"
-}, function( modifier, label ) {
-	asyncTest( "keyboard support - " + label + " navigation", function( assert ) {
-		expect( 115 );
-		var element = $( "#tabs1" ).tabs(),
-			tabs = element.find( ".ui-tabs-nav li" ),
-			panels = element.find( ".ui-tabs-panel" ),
-			keyCode = $.ui.keyCode;
-
-		element.tabs( "instance" ).delay = 1;
-
-		equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
-		tabs.eq( 0 ).simulate( "focus" );
-
-		// down
-		function step1() {
-			var eventProperties = { keyCode: keyCode.DOWN };
-			eventProperties[ modifier + "Key" ] = true;
-
-			assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "first tab has focus" );
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-
-			tabs.eq( 0 ).simulate( "keydown", eventProperties );
-			assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "DOWN moves focus to next tab" );
-			assert.lacksClasses( tabs.eq( 0 ), ".ui-state-focus", "first tab is no longer focused" );
-			equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
-			equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
-			equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-			setTimeout( step2, 25 );
-		}
-
-		// right
-		function step2() {
-			var eventProperties = { keyCode: keyCode.RIGHT };
-			eventProperties[ modifier + "Key" ] = true;
-
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-			ok( panels.eq( 1 ).is( ":hidden" ), "second panel is hidden" );
-			equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
-			equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
-
-			tabs.eq( 1 ).simulate( "keydown", eventProperties );
-			assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "RIGHT moves focus to next tab" );
-			equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
-			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-			setTimeout( step3, 25 );
-		}
-
-		// down (wrap)
-		function step3() {
-			var eventProperties = { keyCode: keyCode.DOWN };
-			eventProperties[ modifier + "Key" ] = true;
-
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
-			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-
-			tabs.eq( 2 ).simulate( "keydown", eventProperties );
-			assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "DOWN wraps focus to first tab" );
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-			setTimeout( step4, 25 );
-		}
-
-		// up (wrap)
-		function step4() {
-			var eventProperties = { keyCode: keyCode.UP };
-			eventProperties[ modifier + "Key" ] = true;
-
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-			tabs.eq( 0 ).simulate( "keydown", eventProperties );
-			assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "UP wraps focus to last tab" );
-			equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
-			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-			setTimeout( step5, 25 );
-		}
-
-		// left
-		function step5() {
-			var eventProperties = { keyCode: keyCode.LEFT };
-			eventProperties[ modifier + "Key" ] = true;
-
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
-			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-
-			tabs.eq( 2 ).simulate( "keydown", eventProperties );
-			assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "LEFT moves focus to previous tab" );
-			equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
-			equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
-			equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-			setTimeout( step6, 25 );
-		}
-
-		// home
-		function step6() {
-			var eventProperties = { keyCode: keyCode.HOME };
-			eventProperties[ modifier + "Key" ] = true;
-
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-			ok( panels.eq( 1 ).is( ":hidden" ), "second panel is hidden" );
-			equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
-			equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
-
-			tabs.eq( 1 ).simulate( "keydown", eventProperties );
-			assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "HOME moves focus to first tab" );
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
-			ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
-			equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
-			equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-			setTimeout( step7, 25 );
-		}
-
-		// end
-		function step7() {
-			var eventProperties = { keyCode: keyCode.END };
-			eventProperties[ modifier + "Key" ] = true;
-
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-			tabs.eq( 0 ).simulate( "keydown", eventProperties );
-			assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "END moves focus to last tab" );
-			equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
-			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-
-			setTimeout( step8, 25 );
-		}
-
-		// space
-		function step8() {
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-			ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-			ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
-			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-			equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-
-			tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
-			equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
-			equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
-			ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
-			equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
-			equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
-			ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
-			equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
-			equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
-
-			setTimeout( start );
-		}
-
-		setTimeout( step1 );
-	});
-});
-
-asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function( assert ) {
-	expect( 50 );
-	var element = $( "#tabs1" ).tabs(),
-		tabs = element.find( ".ui-tabs-nav li" ),
-		panels = element.find( ".ui-tabs-panel" ),
-		keyCode = $.ui.keyCode;
-
-	equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
-	panels.attr( "tabindex", -1 );
-	panels.eq( 0 ).simulate( "focus" );
-
-	function step1() {
-		strictEqual( document.activeElement, panels[ 0 ], "first panel is activeElement" );
-
-		panels.eq( 0 ).simulate( "keydown", { keyCode: keyCode.PAGE_DOWN, altKey: true } );
-		strictEqual( document.activeElement, tabs[ 1 ], "second tab is activeElement" );
-		assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "ALT+PAGE_DOWN moves focus to next tab" );
-		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
-		ok( panels.eq( 1 ).is( ":visible" ), "second panel is visible" );
-		equal( tabs.eq( 1 ).attr( "aria-expanded" ), "true", "second tab has aria-expanded=true" );
-		equal( panels.eq( 1 ).attr( "aria-hidden" ), "false", "second panel has aria-hidden=false" );
-		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
-
-		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.PAGE_DOWN, altKey: true } );
-		strictEqual( document.activeElement, tabs[ 2 ], "third tab is activeElement" );
-		assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "ALT+PAGE_DOWN moves focus to next tab" );
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
-		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
-		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is hidden" );
-		equal( tabs.eq( 1 ).attr( "aria-expanded" ), "false", "second tab has aria-expanded=false" );
-		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
-
-		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.PAGE_DOWN, altKey: true } );
-		strictEqual( document.activeElement, tabs[ 0 ], "first tab is activeElement" );
-		assert.hasClasses( tabs.eq( 0 ), "ui-state-focus", "ALT+PAGE_DOWN wraps focus to first tab" );
-		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
-		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "true", "first tab has aria-expanded=true" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
-		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-
-		panels.eq( 0 ).simulate( "focus" );
-		setTimeout( step2 );
-	}
-
-	function step2() {
-		strictEqual( document.activeElement, panels[ 0 ], "first panel is activeElement" );
-
-		panels.eq( 0 ).simulate( "keydown", { keyCode: keyCode.PAGE_UP, altKey: true } );
-		strictEqual( document.activeElement, tabs[ 2 ], "third tab is activeElement" );
-		assert.hasClasses( tabs.eq( 2 ), "ui-state-focus", "ALT+PAGE_UP wraps focus to last tab" );
-		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
-		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "true", "third tab has aria-expanded=true" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
-		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
-		equal( tabs.eq( 0 ).attr( "aria-expanded" ), "false", "first tab has aria-expanded=false" );
-		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
-
-		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.PAGE_UP, altKey: true } );
-		strictEqual( document.activeElement, tabs[ 1 ], "second tab is activeElement" );
-		assert.hasClasses( tabs.eq( 1 ), "ui-state-focus", "ALT+PAGE_UP moves focus to previous tab" );
-		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
-		ok( panels.eq( 1 ).is( ":visible" ), "second panel is visible" );
-		equal( tabs.eq( 1 ).attr( "aria-expanded" ), "true", "second tab has aria-expanded=true" );
-		equal( panels.eq( 1 ).attr( "aria-hidden" ), "false", "second panel has aria-hidden=false" );
-		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
-		equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "third tab has aria-expanded=false" );
-		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
-
-		panels.eq( 1 ).simulate( "focus" );
-		setTimeout( step3 );
-	}
-
-	function step3() {
-		strictEqual( document.activeElement, panels[ 1 ], "second panel is activeElement" );
-
-		panels.eq( 1 ).simulate( "keydown", { keyCode: keyCode.UP, ctrlKey: true } );
-		strictEqual( document.activeElement, tabs[ 1 ], "second tab is activeElement" );
-
-		setTimeout( start );
-	}
-
-	setTimeout( step1 );
-});
-
-test( "#3627 - Ajax tab with url containing a fragment identifier fails to load", function() {
-	expect( 1 );
-
-	$( "#tabs2" ).tabs({
-		active: 2,
-		beforeLoad: function( event, ui ) {
-			event.preventDefault();
-			ok( /test.html$/.test( ui.ajaxSettings.url ), "should ignore fragment identifier" );
-		}
-	});
-});
-
-test( "#4033 - IE expands hash to full url and misinterprets tab as ajax", function() {
-	expect( 2 );
-
-	var element = $("<div><ul><li><a href='#tab'>Tab</a></li></ul><div id='tab'></div></div>");
-	element.appendTo("#qunit-fixture");
-	element.tabs({
-		beforeLoad: function() {
-			event.preventDefault();
-			ok( false, "should not be an ajax tab" );
-		}
-	});
-
-	equal( element.find(".ui-tabs-nav li").attr("aria-controls"), "tab", "aria-contorls attribute is correct" );
-	state( element, 1 );
-});
-
-} );
diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js
deleted file mode 100644
index fb2746248..000000000
--- a/tests/unit/tabs/tabs_events.js
+++ /dev/null
@@ -1,322 +0,0 @@
-define( [
-	"jquery",
-	"./tabs_test_helpers",
-	"ui/tabs"
-], function( $, testHelper ) {
-
-var state = testHelper.state;
-
-module( "tabs: events" );
-
-test( "create", function() {
-	expect( 10 );
-
-	var element = $( "#tabs1" ),
-		tabs = element.find( "ul li" ),
-		panels = element.children( "div" );
-
-	element.tabs({
-		create: function( event, ui ) {
-			equal( ui.tab.length, 1, "tab length" );
-			strictEqual( ui.tab[ 0 ], tabs[ 0 ], "tab" );
-			equal( ui.panel.length, 1, "panel length" );
-			strictEqual( ui.panel[ 0 ], panels[ 0 ], "panel" );
-		}
-	});
-	element.tabs( "destroy" );
-
-	element.tabs({
-		active: 2,
-		create: function( event, ui ) {
-			equal( ui.tab.length, 1, "tab length" );
-			strictEqual( ui.tab[ 0 ], tabs[ 2 ], "tab" );
-			equal( ui.panel.length, 1, "panel length" );
-			strictEqual( ui.panel[ 0 ], panels[ 2 ], "panel" );
-		}
-	});
-	element.tabs( "destroy" );
-
-	element.tabs({
-		active: false,
-		collapsible: true,
-		create: function( event, ui ) {
-			equal( ui.tab.length, 0, "tab length" );
-			equal( ui.panel.length, 0, "panel length" );
-		}
-	});
-	element.tabs( "destroy" );
-});
-
-test( "beforeActivate", function() {
-	expect( 38 );
-
-	var element = $( "#tabs1" ).tabs({
-			active: false,
-			collapsible: true
-		}),
-		tabs = element.find( ".ui-tabs-nav li" ),
-		anchors = tabs.find( ".ui-tabs-anchor" ),
-		panels = element.find( ".ui-tabs-panel" );
-
-	// from collapsed
-	element.one( "tabsbeforeactivate", function( event, ui ) {
-		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.oldTab.length, 0, "oldTab length" );
-		equal( ui.oldPanel.length, 0, "oldPanel length" );
-		equal( ui.newTab.length, 1, "newTab length" );
-		strictEqual( ui.newTab[ 0 ], tabs[ 0 ], "newTab" );
-		equal( ui.newPanel.length, 1, "newPanel length" );
-		strictEqual( ui.newPanel[ 0 ], panels[ 0 ], "newPanel" );
-		state( element, 0, 0, 0 );
-	});
-	element.tabs( "option", "active", 0 );
-	state( element, 1, 0, 0 );
-
-	// switching tabs
-	element.one( "tabsbeforeactivate", function( event, ui ) {
-		equal( event.originalEvent.type, "click", "originalEvent" );
-		equal( ui.oldTab.length, 1, "oldTab length" );
-		strictEqual( ui.oldTab[ 0 ], tabs[ 0 ], "oldTab" );
-		equal( ui.oldPanel.length, 1, "oldPanel length" );
-		strictEqual( ui.oldPanel[ 0 ], panels[ 0 ], "oldPanel" );
-		equal( ui.newTab.length, 1, "newTab length" );
-		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
-		equal( ui.newPanel.length, 1, "newPanel length" );
-		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
-		state( element, 1, 0, 0 );
-	});
-	anchors.eq( 1 ).click();
-	state( element, 0, 1, 0 );
-
-	// collapsing
-	element.one( "tabsbeforeactivate", function( event, ui ) {
-		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.oldTab.length, 1, "oldTab length" );
-		strictEqual( ui.oldTab[ 0 ], tabs[ 1 ], "oldTab" );
-		equal( ui.oldPanel.length, 1, "oldPanel length" );
-		strictEqual( ui.oldPanel[ 0 ], panels[ 1 ], "oldPanel" );
-		equal( ui.newTab.length, 0, "newTab length" );
-		equal( ui.newPanel.length, 0, "newPanel length" );
-		state( element, 0, 1, 0 );
-	});
-	element.tabs( "option", "active", false );
-	state( element, 0, 0, 0 );
-
-	// prevent activation
-	element.one( "tabsbeforeactivate", function( event, ui ) {
-		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.oldTab.length, 0, "oldTab length" );
-		equal( ui.oldPanel.length, 0, "oldTab" );
-		equal( ui.newTab.length, 1, "newTab length" );
-		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
-		equal( ui.newPanel.length, 1, "newPanel length" );
-		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
-		event.preventDefault();
-		state( element, 0, 0, 0 );
-	});
-	element.tabs( "option", "active", 1 );
-	state( element, 0, 0, 0 );
-});
-
-test( "activate", function() {
-	expect( 30 );
-
-	var element = $( "#tabs1" ).tabs({
-			active: false,
-			collapsible: true
-		}),
-		tabs = element.find( ".ui-tabs-nav li" ),
-		anchors = element.find( ".ui-tabs-anchor" ),
-		panels = element.find( ".ui-tabs-panel" );
-
-	// from collapsed
-	element.one( "tabsactivate", function( event, ui ) {
-		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.oldTab.length, 0, "oldTab length" );
-		equal( ui.oldPanel.length, 0, "oldPanel length" );
-		equal( ui.newTab.length, 1, "newTab length" );
-		strictEqual( ui.newTab[ 0 ], tabs[ 0 ], "newTab" );
-		equal( ui.newPanel.length, 1, "newPanel length" );
-		strictEqual( ui.newPanel[ 0 ], panels[ 0 ], "newPanel" );
-		state( element, 1, 0, 0 );
-	});
-	element.tabs( "option", "active", 0 );
-	state( element, 1, 0, 0 );
-
-	// switching tabs
-	element.one( "tabsactivate", function( event, ui ) {
-		equal( event.originalEvent.type, "click", "originalEvent" );
-		equal( ui.oldTab.length, 1, "oldTab length" );
-		strictEqual( ui.oldTab[ 0 ], tabs[ 0 ], "oldTab" );
-		equal( ui.oldPanel.length, 1, "oldPanel length" );
-		strictEqual( ui.oldPanel[ 0 ], panels[ 0 ], "oldPanel" );
-		equal( ui.newTab.length, 1, "newTab length" );
-		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
-		equal( ui.newPanel.length, 1, "newPanel length" );
-		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
-		state( element, 0, 1, 0 );
-	});
-	anchors.eq( 1 ).click();
-	state( element, 0, 1, 0 );
-
-	// collapsing
-	element.one( "tabsactivate", function( event, ui ) {
-		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.oldTab.length, 1, "oldTab length" );
-		strictEqual( ui.oldTab[ 0 ], tabs[ 1 ], "oldTab" );
-		equal( ui.oldPanel.length, 1, "oldPanel length" );
-		strictEqual( ui.oldPanel[ 0 ], panels[ 1 ], "oldPanel" );
-		equal( ui.newTab.length, 0, "newTab length" );
-		equal( ui.newPanel.length, 0, "newPanel length" );
-		state( element, 0, 0, 0 );
-	});
-	element.tabs( "option", "active", false );
-	state( element, 0, 0, 0 );
-
-	// prevent activation
-	element.one( "tabsbeforeactivate", function( event ) {
-		ok( true, "tabsbeforeactivate" );
-		event.preventDefault();
-	});
-	element.one( "tabsactivate", function() {
-		ok( false, "tabsactivate" );
-	});
-	element.tabs( "option", "active", 1 );
-});
-
-test( "beforeLoad", function() {
-	expect( 32 );
-
-	var tab, panelId, panel,
-		element = $( "#tabs2" );
-
-	// init
-	element.one( "tabsbeforeload", function( event, ui ) {
-		tab = element.find( ".ui-tabs-nav li" ).eq( 2 );
-		panelId = tab.attr( "aria-controls" );
-		panel = $( "#" + panelId );
-
-		ok( !( "originalEvent" in event ), "originalEvent" );
-		ok( "abort" in ui.jqXHR, "jqXHR" );
-		ok( ui.ajaxSettings.url, "data/test.html", "ajaxSettings.url" );
-		equal( ui.tab.length, 1, "tab length" );
-		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-		equal( ui.panel.length, 1, "panel length" );
-		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
-		equal( ui.panel.html(), "", "panel html" );
-		event.preventDefault();
-		state( element, 0, 0, 1, 0, 0 );
-	});
-	element.tabs({ active: 2 });
-	state( element, 0, 0, 1, 0, 0 );
-	equal( panel.html(), "", "panel html after" );
-	element.tabs( "destroy" );
-
-	// .option()
-	element.one( "tabsbeforeload", function( event, ui ) {
-		tab = element.find( ".ui-tabs-nav li" ).eq( 2 );
-		panelId = tab.attr( "aria-controls" );
-		panel = $( "#" + panelId );
-
-		ok( !( "originalEvent" in event ), "originalEvent" );
-		ok( "abort" in ui.jqXHR, "jqXHR" );
-		ok( ui.ajaxSettings.url, "data/test.html", "ajaxSettings.url" );
-		equal( ui.tab.length, 1, "tab length" );
-		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-		equal( ui.panel.length, 1, "panel length" );
-		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
-		equal( ui.panel.html(), "", "panel html" );
-		event.preventDefault();
-		state( element, 1, 0, 0, 0, 0 );
-	});
-	element.tabs();
-	element.tabs( "option", "active", 2 );
-	state( element, 0, 0, 1, 0, 0 );
-	equal( panel.html(), "", "panel html after" );
-
-	// click, change panel content
-	element.one( "tabsbeforeload", function( event, ui ) {
-		tab = element.find( ".ui-tabs-nav li" ).eq( 3 );
-		panelId = tab.attr( "aria-controls" );
-		panel = $( "#" + panelId );
-
-		equal( event.originalEvent.type, "click", "originalEvent" );
-		ok( "abort" in ui.jqXHR, "jqXHR" );
-		ok( ui.ajaxSettings.url, "data/test.html", "ajaxSettings.url" );
-		equal( ui.tab.length, 1, "tab length" );
-		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-		equal( ui.panel.length, 1, "panel length" );
-		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
-		ui.panel.html( "<p>testing</p>" );
-		event.preventDefault();
-		state( element, 0, 0, 1, 0, 0 );
-	});
-	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 3 ).click();
-	state( element, 0, 0, 0, 1, 0 );
-	// .toLowerCase() is needed to convert <P> to <p> in old IEs
-	equal( panel.html().toLowerCase(), "<p>testing</p>", "panel html after" );
-});
-
-asyncTest( "load", function() {
-	expect( 21 );
-
-	var tab, panelId, panel,
-		element = $( "#tabs2" );
-
-	// init
-	element.one( "tabsload", function( event, ui ) {
-		tab = element.find( ".ui-tabs-nav li" ).eq( 2 );
-		panelId = tab.attr( "aria-controls" );
-		panel = $( "#" + panelId );
-
-		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.tab.length, 1, "tab length" );
-		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-		equal( ui.panel.length, 1, "panel length" );
-		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
-		equal( ui.panel.find( "p" ).length, 1, "panel html" );
-		state( element, 0, 0, 1, 0, 0 );
-		tabsload1();
-	});
-	element.tabs({ active: 2 });
-
-	function tabsload1() {
-		// .option()
-		element.one( "tabsload", function( event, ui ) {
-			tab = element.find( ".ui-tabs-nav li" ).eq( 3 );
-			panelId = tab.attr( "aria-controls" );
-			panel = $( "#" + panelId );
-
-			ok( !( "originalEvent" in event ), "originalEvent" );
-			equal( ui.tab.length, 1, "tab length" );
-			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-			equal( ui.panel.length, 1, "panel length" );
-			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
-			equal( ui.panel.find( "p" ).length, 1, "panel html" );
-			state( element, 0, 0, 0, 1, 0 );
-			tabsload2();
-		});
-		element.tabs( "option", "active", 3 );
-	}
-
-	function tabsload2() {
-		// click, change panel content
-		element.one( "tabsload", function( event, ui ) {
-			tab = element.find( ".ui-tabs-nav li" ).eq( 4 );
-			panelId = tab.attr( "aria-controls" );
-			panel = $( "#" + panelId );
-
-			equal( event.originalEvent.type, "click", "originalEvent" );
-			equal( ui.tab.length, 1, "tab length" );
-			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-			equal( ui.panel.length, 1, "panel length" );
-			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
-			equal( ui.panel.find( "p" ).length, 1, "panel html" );
-			state( element, 0, 0, 0, 0, 1 );
-			start();
-		});
-		element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).click();
-	}
-});
-
-} );
diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
deleted file mode 100644
index fc1ff6dd6..000000000
--- a/tests/unit/tabs/tabs_methods.js
+++ /dev/null
@@ -1,290 +0,0 @@
-define( [
-	"jquery",
-	"./tabs_test_helpers",
-	"ui/tabs"
-], function( $, testHelper ) {
-
-var disabled = testHelper.disabled,
-	state = testHelper.state;
-
-module( "tabs: methods" );
-
-test( "destroy", function( assert ) {
-	expect( 2 );
-	assert.domEqual( "#tabs1", function() {
-		$( "#tabs1" ).tabs().tabs( "destroy" );
-	});
-	assert.domEqual( "#tabs2", function() {
-		$( "#tabs2" ).tabs().tabs( "destroy" );
-	});
-});
-
-asyncTest( "destroy - ajax", function( assert ) {
-	expect( 1 );
-	assert.domEqual( "#tabs2", function( done ) {
-		var element = $( "#tabs2" ).tabs({
-			load: function() {
-				setTimeout(function() {
-					element.tabs( "destroy" );
-					done();
-					start();
-				});
-			}
-		});
-		element.tabs( "option", "active", 2 );
-	});
-});
-
-test( "enable", function() {
-	expect( 8 );
-
-	var element = $( "#tabs1" ).tabs({ disabled: true });
-	disabled( element, true );
-	element.tabs( "enable" );
-	disabled( element, false );
-	element.tabs( "destroy" );
-
-	element.tabs({ disabled: [ 0, 1 ] });
-	disabled( element, [ 0, 1 ] );
-	element.tabs( "enable" );
-	disabled( element, false );
-});
-
-test( "enable( index )", function() {
-	expect( 10 );
-
-	var element = $( "#tabs1" ).tabs({ disabled: true });
-	disabled( element, true );
-	// fully disabled -> partially disabled
-	element.tabs( "enable", 1 );
-	disabled( element, [ 0, 2 ] );
-	// partially disabled -> partially disabled
-	element.tabs( "enable", 2 );
-	disabled( element, [ 0 ] );
-	// already enabled tab, no change
-	element.tabs( "enable", 2 );
-	disabled( element, [ 0 ] );
-	// partially disabled -> fully enabled
-	element.tabs( "enable", 0 );
-	disabled( element, false );
-});
-
-test( "disable", function() {
-	expect( 8 );
-
-	var element = $( "#tabs1" ).tabs({ disabled: false });
-	disabled( element, false );
-	element.tabs( "disable" );
-	disabled( element, true );
-	element.tabs( "destroy" );
-
-	element.tabs({ disabled: [ 0, 1 ] });
-	disabled( element, [ 0, 1 ] );
-	element.tabs( "disable" );
-	disabled( element, true );
-});
-
-test( "disable( index )", function() {
-	expect( 10 );
-
-	var element = $( "#tabs1" ).tabs({ disabled: false });
-	disabled( element, false );
-	// fully enabled -> partially disabled
-	element.tabs( "disable", 1 );
-	disabled( element, [ 1 ] );
-	// partially disabled -> partially disabled
-	element.tabs( "disable", 2 );
-	disabled( element, [ 1, 2 ] );
-	// already disabled tab, no change
-	element.tabs( "disable", 2 );
-	disabled( element, [ 1, 2 ] );
-	// partially disabled -> fully disabled
-	element.tabs( "disable", 0 );
-	disabled( element, true );
-});
-
-test( "refresh", function() {
-	expect( 27 );
-
-	var element = $( "#tabs1" ).tabs();
-	state( element, 1, 0, 0 );
-	disabled( element, false );
-
-	// disable tab via markup
-	element.find( ".ui-tabs-nav li" ).eq( 1 ).addClass( "ui-state-disabled" );
-	element.tabs( "refresh" );
-	state( element, 1, 0, 0 );
-	disabled( element, [ 1 ] );
-
-	// add remote tab
-	element.find( ".ui-tabs-nav" ).append( "<li id='newTab'><a href='data/test.html'>new</a></li>" );
-	element.tabs( "refresh" );
-	state( element, 1, 0, 0, 0 );
-	disabled( element, [ 1 ] );
-	equal( element.find( "#" + $( "#newTab" ).attr( "aria-controls" ) ).length, 1,
-		"panel added for remote tab" );
-
-	// remove all tabs
-	element.find( ".ui-tabs-nav li, .ui-tabs-panel" ).remove();
-	element.tabs( "refresh" );
-	state( element );
-	equal( element.tabs( "option", "active" ), false, "no active tab" );
-
-	// add tabs
-	element.find( ".ui-tabs-nav" )
-		.append( "<li class='ui-state-disabled'><a href='#newTab2'>new 2</a></li>" )
-		.append( "<li><a href='#newTab3'>new 3</a></li>" )
-		.append( "<li><a href='#newTab4'>new 4</a></li>" )
-		.append( "<li><a href='#newTab5'>new 5</a></li>" );
-	element
-		.append( "<div id='newTab2'>new 2</div>" )
-		.append( "<div id='newTab3'>new 3</div>" )
-		.append( "<div id='newTab4'>new 4</div>" )
-		.append( "<div id='newTab5'>new 5</div>" );
-	element.tabs( "refresh" );
-	state( element, 0, 0, 0, 0 );
-	disabled( element, [ 0 ] );
-
-	// activate third tab
-	element.tabs( "option", "active", 2 );
-	state( element, 0, 0, 1, 0 );
-	disabled( element, [ 0 ] );
-
-	// remove fourth tab, third tab should stay active
-	element.find( ".ui-tabs-nav li" ).eq( 3 ).remove();
-	element.find( ".ui-tabs-panel" ).eq( 3 ).remove();
-	element.tabs( "refresh" );
-	state( element, 0, 0, 1 );
-	disabled( element, [ 0 ] );
-
-	// remove third (active) tab, second tab should become active
-	element.find( ".ui-tabs-nav li" ).eq( 2 ).remove();
-	element.find( ".ui-tabs-panel" ).eq( 2 ).remove();
-	element.tabs( "refresh" );
-	state( element, 0, 1 );
-	disabled( element, [ 0 ] );
-
-	// remove first tab, previously active tab (now first) should stay active
-	element.find( ".ui-tabs-nav li" ).eq( 0 ).remove();
-	element.find( ".ui-tabs-panel" ).eq( 0 ).remove();
-	element.tabs( "refresh" );
-	state( element, 1 );
-	disabled( element, false );
-});
-
-test( "refresh - looping", function() {
-	expect( 6 );
-
-	var element = $( "#tabs1" ).tabs({
-		disabled: [ 0 ],
-		active: 1
-	});
-	state( element, 0, 1, 0 );
-	disabled( element, [ 0 ] );
-
-	// remove active, jump to previous
-	// previous is disabled, just back one more
-	// reached first tab, move to end
-	// activate last tab
-	element.find( ".ui-tabs-nav li" ).eq( 2 ).remove();
-	element.tabs( "refresh" );
-	state( element, 0, 1 );
-	disabled( element, [ 0 ] );
-});
-
-asyncTest( "load", function() {
-	expect( 30 );
-
-	var element = $( "#tabs2" ).tabs();
-
-	// load content of inactive tab
-	// useful for preloading content with custom caching
-	element.one( "tabsbeforeload", function( event, ui ) {
-		var tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
-			panelId = tab.attr( "aria-controls" ),
-			panel = $( "#" + panelId );
-
-		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.tab.length, 1, "tab length" );
-		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-		equal( ui.panel.length, 1, "panel length" );
-		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
-		state( element, 1, 0, 0, 0, 0 );
-	});
-	element.one( "tabsload", function( event, ui ) {
-		// TODO: remove wrapping in 2.0
-		var uiTab = $( ui.tab ),
-			uiPanel = $( ui.panel ),
-			tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
-			panelId = tab.attr( "aria-controls" ),
-			panel = $( "#" + panelId );
-
-		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( uiTab.length, 1, "tab length" );
-		strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
-		equal( uiPanel.length, 1, "panel length" );
-		strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
-		equal( uiPanel.find( "p" ).length, 1, "panel html" );
-		state( element, 1, 0, 0, 0, 0 );
-		setTimeout( tabsload1 );
-	});
-	element.tabs( "load", 3 );
-	state( element, 1, 0, 0, 0, 0 );
-
-	function tabsload1() {
-		// no need to test details of event (tested in events tests)
-		element.one( "tabsbeforeload", function() {
-			ok( true, "tabsbeforeload invoked" );
-		});
-		element.one( "tabsload", function() {
-			ok( true, "tabsload invoked" );
-			setTimeout( tabsload2 );
-		});
-		element.tabs( "option", "active", 3 );
-		state( element, 0, 0, 0, 1, 0 );
-	}
-
-	function tabsload2() {
-		// reload content of active tab
-		element.one( "tabsbeforeload", function( event, ui ) {
-			var tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
-				panelId = tab.attr( "aria-controls" ),
-				panel = $( "#" + panelId );
-
-			ok( !( "originalEvent" in event ), "originalEvent" );
-			equal( ui.tab.length, 1, "tab length" );
-			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-			equal( ui.panel.length, 1, "panel length" );
-			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
-			state( element, 0, 0, 0, 1, 0 );
-		});
-		element.one( "tabsload", function( event, ui ) {
-			// TODO: remove wrapping in 2.0
-			var uiTab = $( ui.tab ),
-				uiPanel = $( ui.panel ),
-				tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
-				panelId = tab.attr( "aria-controls" ),
-				panel = $( "#" + panelId );
-
-			ok( !( "originalEvent" in event ), "originalEvent" );
-			equal( uiTab.length, 1, "tab length" );
-			strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
-			equal( uiPanel.length, 1, "panel length" );
-			strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
-			state( element, 0, 0, 0, 1, 0 );
-			start();
-		});
-		element.tabs( "load", 3 );
-		state( element, 0, 0, 0, 1, 0 );
-	}
-});
-
-test( "widget", function() {
-	expect( 2 );
-	var element = $( "#tabs1" ).tabs(),
-		widgetElement = element.tabs( "widget" );
-	equal( widgetElement.length, 1, "one element" );
-	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
-});
-
-} );
diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js
deleted file mode 100644
index e4c3efa15..000000000
--- a/tests/unit/tabs/tabs_options.js
+++ /dev/null
@@ -1,374 +0,0 @@
-define( [
-	"jquery",
-	"./tabs_test_helpers",
-	"ui/tabs"
-], function( $, testHelper ) {
-
-var disabled = testHelper.disabled,
-	equalHeight = testHelper.equalHeight,
-	state = testHelper.state;
-
-module( "tabs: options" );
-
-test( "{ active: default }", function() {
-	expect( 6 );
-
-	var element = $( "#tabs1" ).tabs();
-	equal( element.tabs( "option", "active" ), 0, "should be 0 by default" );
-	state( element, 1, 0, 0 );
-	element.tabs( "destroy" );
-
-	location.hash = "#fragment-3";
-	element = $( "#tabs1" ).tabs();
-	equal( element.tabs( "option", "active" ), 2, "should be 2 based on URL" );
-	state( element, 0, 0, 1 );
-	element.tabs( "destroy" );
-
-	location.hash = "#custom-id";
-	element = $( "#tabs2" ).tabs();
-	equal( element.tabs( "option", "active" ), 3, "should be 3 based on URL" );
-	state( element, 0, 0, 0, 1, 0 );
-	element.tabs( "destroy" );
-	location.hash = "#";
-});
-
-test( "{ active: false }", function() {
-	expect( 7 );
-
-	var element = $( "#tabs1" ).tabs({
-		active: false,
-		collapsible: true
-	});
-	state( element, 0, 0, 0 );
-	equal( element.find( ".ui-tabs-nav .ui-state-active" ).length, 0, "no tabs selected" );
-	strictEqual( element.tabs( "option", "active" ), false );
-
-	element.tabs( "option", "collapsible", false );
-	state( element, 1, 0, 0 );
-	equal( element.tabs( "option", "active" ), 0 );
-
-	element.tabs( "destroy" );
-	element.tabs({
-		active: false
-	});
-	state( element, 1, 0, 0 );
-	strictEqual( element.tabs( "option", "active" ), 0 );
-});
-
-test( "{ active: Number }", function() {
-	expect( 8 );
-
-	var element = $( "#tabs1" ).tabs({
-		active: 2
-	});
-	equal( element.tabs( "option", "active" ), 2 );
-	state( element, 0, 0, 1 );
-
-	element.tabs( "option", "active", 0 );
-	equal( element.tabs( "option", "active" ), 0 );
-	state( element, 1, 0, 0 );
-
-	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).click();
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.tabs( "option", "active", 10 );
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-});
-
-test( "{ active: -Number }", function() {
-	expect( 8 );
-
-	var element = $( "#tabs1" ).tabs({
-		active: -1
-	});
-	equal( element.tabs( "option", "active" ), 2 );
-	state( element, 0, 0, 1 );
-
-	element.tabs( "option", "active", -2 );
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.tabs( "option", "active", -10 );
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.tabs( "option", "active", -3 );
-	equal( element.tabs( "option", "active" ), 0 );
-	state( element, 1, 0, 0 );
-});
-
-test( "active - mismatched tab/panel order", function() {
-	expect( 3 );
-
-	location.hash = "#tabs7-2";
-	var element = $( "#tabs7" ).tabs();
-	equal( element.tabs( "option", "active" ), 1, "should be 1 based on URL" );
-	state( element, 0, 1 );
-	element.tabs( "option", "active", 0 );
-	state( element, 1, 0 );
-	location.hash = "#";
-});
-
-test( "collapsible", function( assert ) {
-	expect( 13 );
-
-	var element = $( "#tabs1" ).tabs({
-		active: 1,
-		collapsible: true
-	});
-	assert.hasClasses( element, "ui-tabs-collapsible" );
-	element.tabs( "option", "active", false );
-	equal( element.tabs( "option", "active" ), false );
-	state( element, 0, 0, 0 );
-
-	element.tabs( "option", "active", 1 );
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.find( ".ui-state-active .ui-tabs-anchor" ).click();
-	equal( element.tabs( "option", "active" ), false );
-	state( element, 0, 0, 0 );
-
-	element.tabs( "option", "collapsible", false );
-	assert.lacksClasses( element, "ui-tabs-collapsible" );
-
-	element.tabs( "option", "collapsible", true );
-
-	assert.hasClasses( element, "ui-tabs-collapsible" );
-
-	element.tabs({
-		active: 1,
-		collapsible: false
-	});
-	element.tabs( "option", "active", false );
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.find( ".ui-state-active .ui-tabs-anchor" ).eq( 1 ).click();
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-});
-
-test( "disabled", function( assert ) {
-	expect( 23 );
-
-	// fully enabled by default
-	var event,
-		element = $( "#tabs1" ).tabs();
-	disabled( element, false );
-
-	assert.lacksClasses( element.tabs( "widget" ), "ui-state-disabled" );
-	assert.lacksClasses( element.tabs( "widget" ), "ui-tabs-disabled" );
-	ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );
-
-	// disable single tab
-	element.tabs( "option", "disabled", [ 1 ] );
-	disabled( element, [ 1 ] );
-
-	assert.lacksClasses( element.tabs( "widget" ), "ui-state-disabled" );
-	assert.lacksClasses( element.tabs( "widget" ), "ui-tabs-disabled" );
-	ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );
-
-	// disabled active tab
-	element.tabs( "option", "disabled", [ 0, 1 ] );
-	disabled( element, [ 0, 1 ] );
-
-	assert.lacksClasses( element.tabs( "widget" ), "ui-state-disabled" );
-	assert.lacksClasses( element.tabs( "widget" ), "ui-tabs-disabled" );
-	ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );
-
-	// disable all tabs
-	element.tabs( "option", "disabled", [ 0, 1, 2 ] );
-	disabled( element, true );
-
-	assert.lacksClasses( element.tabs( "widget" ), "ui-state-disabled" );
-	assert.lacksClasses( element.tabs( "widget" ), "ui-tabs-disabled" );
-	ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );
-
-	event = $.Event( "click" );
-	element.find( ".ui-tabs-anchor" ).eq( 0 ).trigger( event );
-	ok( event.isDefaultPrevented(), "click is prevented for disabled tab" );
-
-	// enable all tabs
-	element.tabs( "option", "disabled", [] );
-	disabled( element, false );
-});
-
-test( "{ event: null }", function() {
-	expect( 5 );
-
-	var element = $( "#tabs1" ).tabs({
-		event: null
-	});
-	state( element, 1, 0, 0 );
-
-	element.tabs( "option", "active", 1 );
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	// ensure default click handler isn't bound
-	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 2 ).click();
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-});
-
-test( "{ event: custom }", function() {
-	expect( 11 );
-
-	var element = $( "#tabs1" ).tabs({
-		event: "custom1 custom2"
-	});
-	state( element, 1, 0, 0 );
-
-	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).trigger( "custom1" );
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	// ensure default click handler isn't bound
-	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 2 ).trigger( "click" );
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-
-	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 2 ).trigger( "custom2" );
-	equal( element.tabs( "option", "active" ), 2 );
-	state( element, 0, 0, 1 );
-
-	element.tabs( "option", "event", "custom3" );
-
-	// ensure old event handlers are unbound
-	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).trigger( "custom1" );
-	equal( element.tabs( "option", "active" ), 2 );
-	state( element, 0, 0, 1 );
-
-	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).trigger( "custom3" );
-	equal( element.tabs( "option", "active" ), 1 );
-	state( element, 0, 1, 0 );
-});
-
-test( "{ heightStyle: 'auto' }", function() {
-	expect( 2 );
-	var element = $( "#tabs8" ).tabs({ heightStyle: "auto" });
-	equalHeight( element, 45 );
-});
-
-test( "{ heightStyle: 'content' }", function() {
-	expect( 2 );
-	var element = $( "#tabs8" ).tabs({ heightStyle: "content" }),
-		sizes = element.find( ".ui-tabs-panel" ).map(function() {
-			return $( this ).height();
-		}).get();
-	equal( sizes[ 0 ], 45 );
-	equal( sizes[ 1 ], 15 );
-});
-
-test( "{ heightStyle: 'fill' }", function() {
-	expect( 4 );
-	$( "#tabs8Wrapper" ).height( 500 );
-	var element = $( "#tabs8" ).tabs({ heightStyle: "fill" });
-	equalHeight( element, 485 );
-	element.tabs( "destroy" );
-
-	element = $( "#tabs8" ).css({
-		"border": "1px solid black",
-		"padding": "1px 0"
-	});
-	element.tabs({ heightStyle: "fill" });
-	equalHeight( element, 481 );
-});
-
-test( "{ heightStyle: 'fill' } with sibling", function() {
-	expect( 2 );
-	$( "#tabs8Wrapper" ).height( 500 );
-	$( "<p>Lorem Ipsum</p>" )
-		.css({
-			height: 50,
-			marginTop: 20,
-			marginBottom: 30
-		})
-		.prependTo( "#tabs8Wrapper" );
-	var element = $( "#tabs8" ).tabs({ heightStyle: "fill" });
-	equalHeight( element, 385 );
-});
-
-test( "{ heightStyle: 'fill' } with multiple siblings", function() {
-	expect( 2 );
-	$( "#tabs8Wrapper" ).height( 500 );
-	$( "<p>Lorem Ipsum</p>" )
-		.css({
-			height: 50,
-			marginTop: 20,
-			marginBottom: 30
-		})
-		.prependTo( "#tabs8Wrapper" );
-	$( "<p>Lorem Ipsum</p>" )
-		.css({
-			height: 50,
-			marginTop: 20,
-			marginBottom: 30,
-			position: "absolute"
-		})
-		.prependTo( "#tabs8Wrapper" );
-	$( "<p>Lorem Ipsum</p>" )
-		.css({
-			height: 25,
-			marginTop: 10,
-			marginBottom: 15
-		})
-		.prependTo( "#tabs8Wrapper" );
-	var element = $( "#tabs8" ).tabs({ heightStyle: "fill" });
-	equalHeight( element, 335 );
-});
-
-test( "hide and show: false", function() {
-	expect( 3 );
-	var element = $( "#tabs1" ).tabs({
-			show: false,
-			hide: false
-		}),
-		widget = element.tabs( "instance" ),
-		panels = element.find( ".ui-tabs-panel" );
-	widget._show = function() {
-		ok( false, "_show() called" );
-	};
-	widget._hide = function() {
-		ok( false, "_hide() called" );
-	};
-
-	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
-	element.tabs( "option", "active", 1 );
-	ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
-	ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
-});
-
-asyncTest( "hide and show - animation", function() {
-	expect( 5 );
-	var element = $( "#tabs1" ).tabs({
-			show: "drop",
-			hide: 2000
-		}),
-		widget = element.tabs( "instance" ),
-		panels = element.find( ".ui-tabs-panel" );
-	widget._show = function( element, options, callback ) {
-		strictEqual( element[ 0 ], panels[ 1 ], "correct element in _show()" );
-		equal( options, "drop", "correct options in _show()" );
-		setTimeout(function() {
-			callback();
-		});
-	};
-	widget._hide = function( element, options, callback ) {
-		strictEqual( element[ 0 ], panels[ 0 ], "correct element in _hide()" );
-		equal( options, 2000, "correct options in _hide()" );
-		setTimeout(function() {
-			callback();
-			start();
-		});
-	};
-
-	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
-	element.tabs( "option", "active", 1 );
-});
-
-} );
diff --git a/tests/unit/tabs/tabs_test_helpers.js b/tests/unit/tabs/tabs_test_helpers.js
deleted file mode 100644
index 5c9625f8c..000000000
--- a/tests/unit/tabs/tabs_test_helpers.js
+++ /dev/null
@@ -1,74 +0,0 @@
-define( [
-	"jquery",
-	"lib/helper",
-	"ui/tabs"
-], function( $, helper ) {
-
-return $.extend( helper, {
-	disabled: function( tabs, state ) {
-		var expected, actual,
-			internalState = tabs.tabs( "option", "disabled" );
-
-		if ( internalState === false ) {
-			internalState = [];
-		}
-		if ( internalState === true ) {
-			internalState = $.map( new Array( tabs.find( ".ui-tabs-nav li" ).length ), function( _, index ) {
-				return index;
-			});
-		}
-
-		expected = $.map( new Array( tabs.find ( ".ui-tabs-nav li" ).length ), function( _, index ) {
-			if ( typeof state === "boolean" ) {
-				return state ? 1 : 0;
-			} else {
-				return $.inArray( index, state ) !== -1 ? 1 : 0;
-			}
-		});
-
-		actual = tabs.find( ".ui-tabs-nav li" ).map(function( index ) {
-			var tab = $( this ),
-				tabIsDisabled = tab.hasClass( "ui-state-disabled" );
-
-			if ( tabIsDisabled && $.inArray( index, internalState ) !== -1 ) {
-				return 1;
-			}
-			if ( !tabIsDisabled && $.inArray( index, internalState ) === -1 ) {
-				return 0;
-			}
-			// mixed state - invalid
-			return -1;
-		}).get();
-
-		deepEqual( tabs.tabs( "option", "disabled" ), state );
-		deepEqual( actual, expected );
-	},
-
-	equalHeight: function( tabs, height ) {
-		tabs.find( ".ui-tabs-panel" ).each(function() {
-			equal( $( this ).outerHeight(), height );
-		});
-	},
-
-	state: function( tabs ) {
-		var expected = $.makeArray( arguments ).slice( 1 ),
-			actual = tabs.find( ".ui-tabs-nav li" ).map(function() {
-				var tab = $( this ),
-					panel = $( $.ui.tabs.prototype._sanitizeSelector(
-						"#" + tab.attr( "aria-controls" ) ) ),
-					tabIsActive = tab.hasClass( "ui-state-active" ),
-					panelIsActive = panel.css( "display" ) !== "none";
-
-				if ( tabIsActive && panelIsActive ) {
-					return 1;
-				}
-				if ( !tabIsActive && !panelIsActive ) {
-					return 0;
-				}
-				return -1; // mixed state - invalid
-			}).get();
-		deepEqual( actual, expected );
-	}
-} );
-
-} );
diff --git a/tests/unit/tooltip/common-deprecated.js b/tests/unit/tooltip/common-deprecated.js
new file mode 100644
index 000000000..d32e7656d
--- /dev/null
+++ b/tests/unit/tooltip/common-deprecated.js
@@ -0,0 +1,31 @@
+define( [
+	"lib/common",
+	"ui/tooltip"
+], function( common ) {
+
+common.testWidget( "tooltip", {
+	defaults: {
+		classes: {
+			"ui-tooltip": "ui-corner-all ui-widget-shadow"
+		},
+		content: function() {},
+		disabled: false,
+		hide: true,
+		items: "[title]:not([disabled])",
+		position: {
+			my: "left top+15",
+			at: "left bottom",
+			collision: "flipfit flip"
+		},
+		show: true,
+		tooltipClass: null,
+		track: false,
+
+		// callbacks
+		close: null,
+		create: null,
+		open: null
+	}
+});
+
+} );
diff --git a/tests/unit/tooltip/common.js b/tests/unit/tooltip/common.js
new file mode 100644
index 000000000..f8045fc33
--- /dev/null
+++ b/tests/unit/tooltip/common.js
@@ -0,0 +1,30 @@
+define( [
+	"lib/common",
+	"ui/tooltip"
+], function( common ) {
+
+common.testWidget( "tooltip", {
+	defaults: {
+		classes: {
+			"ui-tooltip": "ui-corner-all ui-widget-shadow"
+		},
+		content: function() {},
+		disabled: false,
+		hide: true,
+		items: "[title]:not([disabled])",
+		position: {
+			my: "left top+15",
+			at: "left bottom",
+			collision: "flipfit flip"
+		},
+		show: true,
+		track: false,
+
+		// callbacks
+		close: null,
+		create: null,
+		open: null
+	}
+});
+
+} );
diff --git a/tests/unit/tooltip/core.js b/tests/unit/tooltip/core.js
new file mode 100644
index 000000000..fa24d72ce
--- /dev/null
+++ b/tests/unit/tooltip/core.js
@@ -0,0 +1,224 @@
+define( [
+	"jquery",
+	"ui/tooltip"
+], function( $ ) {
+
+module( "tooltip: core" );
+
+test( "markup structure", function( assert ) {
+	expect( 7 );
+	var element = $( "#tooltipped1" ).tooltip(),
+		tooltip = $( ".ui-tooltip" );
+
+	equal( element.attr( "aria-describedby" ), undefined, "no aria-describedby on init" );
+	equal( tooltip.length, 0, "no tooltip on init" );
+
+	element.tooltip( "open" );
+	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
+	equal( tooltip.length, 1, "tooltip exists" );
+	equal( element.attr( "aria-describedby" ), tooltip.attr( "id" ), "aria-describedby" );
+	assert.hasClasses( tooltip, "ui-tooltip ui-widget ui-widget-content ui-widget-shadow" );
+	equal( tooltip.length, 1, ".ui-tooltip exists" );
+	equal( tooltip.find( ".ui-tooltip-content" ).length, 1,
+		".ui-tooltip-content exists" );
+});
+
+test( "accessibility", function() {
+	expect( 15 );
+
+	var tooltipId, tooltip,
+		element = $( "#multiple-describedby" ).tooltip(),
+		liveRegion = element.tooltip( "instance" ).liveRegion;
+
+	equal( liveRegion.find( ">div" ).length, 0 );
+	equal( liveRegion.attr( "role" ), "log" );
+	equal( liveRegion.attr( "aria-live" ), "assertive" );
+	equal( liveRegion.attr( "aria-relevant" ), "additions" );
+	element.tooltip( "open" );
+	tooltipId = element.data( "ui-tooltip-id" );
+	tooltip = $( "#" + tooltipId );
+	equal( tooltip.attr( "role" ), "tooltip", "role" );
+	equal( element.attr( "aria-describedby" ), "fixture-span " + tooltipId,
+		"multiple describedby when open" );
+
+	equal( element.attr( "title" ), null, "no title when open" );
+	equal( liveRegion.children().length, 1 );
+	equal( liveRegion.children().last().html(), "..." );
+	element.tooltip( "close" );
+	equal( element.attr( "aria-describedby" ), "fixture-span",
+		"correct describedby when closed" );
+	equal( element.attr( "title" ), "...", "title restored when closed" );
+
+	element.tooltip( "open" );
+	equal( liveRegion.children().length, 2,
+		"After the second tooltip show, there should be two children" );
+	equal( liveRegion.children().filter( ":visible" ).length, 1,
+		"Only one of the children should be visible" );
+	ok( liveRegion.children().last().is( ":visible" ),
+		"Only the last child should be visible" );
+	element.tooltip( "close" );
+
+	element.tooltip( "destroy" );
+	equal( liveRegion.parent().length, 0,
+		"Tooltip liveregion element should be removed" );
+});
+
+test( "delegated removal", function() {
+	expect( 2 );
+
+	var container = $( "#contains-tooltipped" ).tooltip(),
+		element = $( "#contained-tooltipped" );
+
+	element.trigger( "mouseover" );
+	equal( $( ".ui-tooltip" ).length, 1 );
+
+	container.empty();
+	equal( $( ".ui-tooltip" ).length, 0 );
+});
+
+test( "nested tooltips", function() {
+	expect( 2 );
+
+	var child = $( "#contained-tooltipped" ),
+		parent = $( "#contains-tooltipped" ).tooltip({
+			show: null,
+			hide: null
+		});
+
+	parent.trigger( "mouseover" );
+	equal( $( ".ui-tooltip:visible" ).text(), "parent" );
+
+	child.trigger( "mouseover" );
+	equal( $( ".ui-tooltip" ).text(), "child" );
+});
+
+// #8742
+test( "form containing an input with name title", function() {
+	expect( 4 );
+
+	var form = $( "#tooltip-form" ).tooltip({
+			show: null,
+			hide: null
+		}),
+		input = form.find( "[name=title]" );
+
+	equal( $( ".ui-tooltip" ).length, 0, "no tooltips on init" );
+
+	input.trigger( "mouseover" );
+	equal( $( ".ui-tooltip" ).length, 1, "tooltip for input" );
+	input.trigger( "mouseleave" );
+	equal( $( ".ui-tooltip" ).length, 0, "tooltip for input closed" );
+
+	form.trigger( "mouseover" );
+	equal( $( ".ui-tooltip" ).length, 0, "no tooltip for form" );
+});
+
+test( "tooltip on .ui-state-disabled element", function() {
+	expect( 2 );
+
+	var container = $( "#contains-tooltipped" ).tooltip(),
+		element = $( "#contained-tooltipped" ).addClass( "ui-state-disabled" );
+
+	element.trigger( "mouseover" );
+	equal( $( ".ui-tooltip" ).length, 1 );
+
+	container.empty();
+	equal( $( ".ui-tooltip" ).length, 0 );
+});
+
+// http://bugs.jqueryui.com/ticket/8740
+asyncTest( "programmatic focus with async content", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip({
+		content: function( response ) {
+			setTimeout(function() {
+				response( "test" );
+			});
+		}
+	});
+
+	element.bind( "tooltipopen", function( event ) {
+		deepEqual( event.originalEvent.type, "focusin" );
+
+		element.bind( "tooltipclose", function( event ) {
+			deepEqual( event.originalEvent.type, "focusout" );
+			start();
+		});
+
+		setTimeout(function() {
+			element.blur();
+		});
+	});
+
+	element.focus();
+});
+
+asyncTest( "destroy during hide animation; only one close event", function() {
+	expect( 1 );
+
+	var element = $( "#tooltipped1" ).tooltip({
+		show: false,
+		hide: true
+	});
+
+	element.bind( "tooltipclose", function() {
+		ok( true, "tooltip closed" );
+	});
+
+	element.tooltip( "open" );
+	element.tooltip( "close" );
+	setTimeout(function() {
+		element.tooltip( "destroy" );
+		start();
+	});
+});
+
+// http://bugs.jqueryui.com/ticket/10602
+asyncTest( "multiple active delegated tooltips", function() {
+	expect( 1 );
+
+	var anchor = $( "#tooltipped1" ),
+		input = anchor.next(),
+		actions = [];
+
+	$( document ).tooltip({
+			show: false,
+			hide: false,
+			open: function( event, ui ) {
+				actions.push( "open:" + ui.tooltip.text() );
+			},
+			close: function( event, ui ) {
+				actions.push( "close:" + ui.tooltip.text() );
+			}
+		});
+
+	function step1() {
+		anchor.simulate( "mouseover" );
+		setTimeout( step2 );
+	}
+
+	function step2() {
+		input.simulate( "focus" );
+		setTimeout( step3 );
+	}
+
+	function step3() {
+		input.simulate( "blur" );
+		setTimeout( step4 );
+	}
+
+	function step4() {
+		anchor.simulate( "mouseout" );
+		deepEqual( actions, [
+			"open:anchortitle",
+			"open:inputtitle",
+			"close:inputtitle",
+			"close:anchortitle"
+		], "Both tooltips open and close" );
+		start();
+	}
+
+	step1();
+});
+
+} );
diff --git a/tests/unit/tooltip/deprecated.html b/tests/unit/tooltip/deprecated.html
new file mode 100644
index 000000000..d21fea57b
--- /dev/null
+++ b/tests/unit/tooltip/deprecated.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Tooltip Test Suite</title>
+
+	<script src="../../lib/css.js" data-modules="core tooltip"></script>
+	<script src="../../lib/bootstrap.js" data-widget="tooltip" data-deprecated="true"></script>
+</head>
+<body>
+
+<div id="qunit"></div>
+<div id="qunit-fixture">
+
+<div>
+	<a id="tooltipped1" href="#" title="anchortitle">anchor</a>
+	<input title="inputtitle">
+	<span id="multiple-describedby" aria-describedby="fixture-span" title="...">aria-describedby</span>
+	<span id="fixture-span" title="title-text">span</span>
+	<span id="contains-tooltipped" title="parent"><span id="contained-tooltipped" title="child">baz</span></span>
+</div>
+
+<form id="tooltip-form">
+	<input name="title" title="attroperties">
+</form>
+
+</div>
+</body>
+</html>
diff --git a/tests/unit/tooltip/deprecated.js b/tests/unit/tooltip/deprecated.js
new file mode 100644
index 000000000..057171ee2
--- /dev/null
+++ b/tests/unit/tooltip/deprecated.js
@@ -0,0 +1,16 @@
+define( [
+	"jquery",
+	"ui/tooltip"
+], function( $ ) {
+
+module( "tooltip: (deprecated) options" );
+
+test( "tooltipClass", function( assert ) {
+	expect( 1 );
+	var element = $( "#tooltipped1" ).tooltip({
+		tooltipClass: "custom"
+	}).tooltip( "open" );
+	assert.hasClasses( $( "#" + element.data( "ui-tooltip-id" ) ), "custom" );
+});
+
+} );
diff --git a/tests/unit/tooltip/events.js b/tests/unit/tooltip/events.js
new file mode 100644
index 000000000..a953c6e91
--- /dev/null
+++ b/tests/unit/tooltip/events.js
@@ -0,0 +1,60 @@
+define( [
+	"jquery",
+	"ui/tooltip"
+], function( $ ) {
+
+module( "tooltip: events" );
+
+test( "programmatic triggers", function() {
+	expect( 4 );
+	var tooltip,
+		element = $( "#tooltipped1" ).tooltip();
+
+	element.one( "tooltipopen", function( event, ui ) {
+		tooltip = ui.tooltip;
+		ok( !( "originalEvent" in event ), "open" );
+		strictEqual( ui.tooltip[0],
+			$( "#" + element.data( "ui-tooltip-id" ) )[0], "ui.tooltip" );
+	});
+	element.tooltip( "open" );
+
+	element.one( "tooltipclose", function( event, ui ) {
+		ok( !( "originalEvent" in event ), "close" );
+		strictEqual( ui.tooltip[0], tooltip[0], "ui.tooltip" );
+	});
+	element.tooltip( "close" );
+});
+
+test( "mouse events", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip();
+
+	element.bind( "tooltipopen", function( event ) {
+		deepEqual( event.originalEvent.type, "mouseover" );
+	});
+	element.trigger( "mouseover" );
+
+	element.bind( "tooltipclose", function( event ) {
+		deepEqual( event.originalEvent.type, "mouseleave" );
+	});
+	element.trigger( "focusout" );
+	element.trigger( "mouseleave" );
+});
+
+test( "focus events", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip();
+
+	element.bind( "tooltipopen", function( event ) {
+		deepEqual( event.originalEvent.type, "focusin" );
+	});
+	element.trigger( "focusin" );
+
+	element.bind( "tooltipclose", function( event ) {
+		deepEqual( event.originalEvent.type, "focusout" );
+	});
+	element.trigger( "mouseleave" );
+	element.trigger( "focusout" );
+});
+
+} );
diff --git a/tests/unit/tooltip/methods.js b/tests/unit/tooltip/methods.js
new file mode 100644
index 000000000..3db7b8f7c
--- /dev/null
+++ b/tests/unit/tooltip/methods.js
@@ -0,0 +1,139 @@
+define( [
+	"jquery",
+	"ui/tooltip"
+], function( $ ) {
+
+module( "tooltip: methods" );
+
+test( "destroy", function( assert ) {
+	expect( 3 );
+	var element = $( "#tooltipped1" );
+
+	assert.domEqual( "#tooltipped1", function() {
+		element.tooltip().tooltip( "destroy" );
+	});
+
+	// make sure that open tooltips are removed on destroy
+	assert.domEqual( "#tooltipped1", function() {
+		element
+			.tooltip()
+			.tooltip( "open", $.Event( "mouseover", { target: element[0] }) )
+			.tooltip( "destroy" );
+	});
+	equal( $( ".ui-tooltip" ).length, 0 );
+});
+
+test( "open/close", function() {
+	expect( 3 );
+	$.fx.off = true;
+	var tooltip,
+		element = $( "#tooltipped1" ).tooltip();
+	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
+
+	element.tooltip( "open" );
+	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
+	ok( tooltip.is( ":visible" ) );
+
+	element.tooltip( "close" );
+	ok( tooltip.is( ":hidden" ) );
+	$.fx.off = false;
+});
+
+// #8626 - Calling open() without an event
+test( "open/close with tracking", function() {
+	expect( 3 );
+	$.fx.off = true;
+	var tooltip,
+		element = $( "#tooltipped1" ).tooltip({ track: true });
+	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
+
+	element.tooltip( "open" );
+	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
+	ok( tooltip.is( ":visible" ) );
+
+	element.tooltip( "close" );
+	ok( tooltip.is( ":hidden" ) );
+	$.fx.off = false;
+});
+
+test( "enable/disable", function( assert ) {
+	expect( 11 );
+	$.fx.off = true;
+	var tooltip,
+		element = $( "#tooltipped1" ).tooltip();
+	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
+
+	element.tooltip( "open" );
+	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
+	ok( tooltip.is( ":visible" ) );
+
+	element.tooltip( "disable" );
+	equal( $( ".ui-tooltip" ).length, 0, "no tooltip when disabled" );
+
+	assert.lacksClasses( element.tooltip( "widget" ), "ui-state-disabled" );
+	ok( !element.tooltip( "widget" ).attr( "aria-disabled" ), "element doesn't get aria-disabled" );
+	assert.lacksClasses( element.tooltip( "widget" ), "ui-tooltip-disabled" );
+	equal( tooltip.attr( "title" ), null, "title removed on disable" );
+
+	element.tooltip( "open" );
+	equal( $( ".ui-tooltip" ).length, 0, "open does nothing when disabled" );
+
+	element.tooltip( "enable" );
+	equal( element.attr( "title" ), "anchortitle", "title restored on enable" );
+
+	// #9719 - Title should be preserved after disabling twice
+	element.tooltip( "disable" );
+	element.tooltip( "disable" );
+	element.tooltip( "enable" );
+	equal( element.attr( "title" ), "anchortitle", "title restored on enable after being disabled twice" );
+
+	element.tooltip( "open" );
+	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
+	ok( tooltip.is( ":visible" ) );
+	$.fx.off = false;
+});
+
+test( "widget", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip(),
+		widgetElement = element.tooltip( "widget" );
+	equal( widgetElement.length, 1, "one element" );
+	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
+});
+
+test( "preserve changes to title attributes on close and destroy", function() {
+	expect( 6 );
+	var element = $( "#tooltipped1" ),
+		changed = "changed title text",
+		original = "original title text",
+		tests = [];
+
+	// 1. Changes to title attribute are preserved on close()
+	tests[ 0 ] = { title: changed, expected: changed, method: "close" };
+	// 2. Changes to title attribute are preserved on destroy()
+	tests[ 1 ] = { title: changed, expected: changed , method: "destroy" };
+	// 3. Changes to title attribute are NOT preserved when set to empty string on close()
+	tests[ 2 ] = { title: "", expected: original, method: "close" };
+	// 4. Changes to title attribute are NOT preserved when set to empty string on destroy()
+	tests[ 3 ] = { title: "", expected: original, method: "destroy" };
+	// 5. Changes to title attribute NOT preserved when attribute has been removed on close()
+	tests[ 4 ] = { expected: original, method: "close" };
+	// 6. Changes to title attribute NOT preserved when attribute has been removed on destroy()
+	tests[ 5 ] = { expected: original, method: "destroy" };
+
+	$.each( tests, function( index, test ) {
+
+		element.attr( "title", original ).tooltip()
+			.tooltip( "open", $.Event( "mouseover", { target: element[ 0 ] } ) );
+		if ( test.title ) {
+			element.attr( "title", test.title );
+		} else {
+			element.removeAttr( "title" );
+		}
+		element.tooltip( test.method );
+		equal( $( "#tooltipped1" ).attr( "title" ), test.expected );
+
+	} );
+});
+
+} );
diff --git a/tests/unit/tooltip/options.js b/tests/unit/tooltip/options.js
new file mode 100644
index 000000000..d091e3bad
--- /dev/null
+++ b/tests/unit/tooltip/options.js
@@ -0,0 +1,215 @@
+define( [
+	"jquery",
+	"ui/tooltip"
+], function( $ ) {
+
+module( "tooltip: options" );
+
+test( "disabled: true", function() {
+	expect( 1 );
+	$( "#tooltipped1" ).tooltip({
+		disabled: true
+	}).tooltip( "open" );
+	equal( $( ".ui-tooltip" ).length, 0 );
+});
+
+test( "content: default", function() {
+	expect( 1 );
+	var element = $( "#tooltipped1" ).tooltip().tooltip( "open" );
+	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "anchortitle" );
+});
+
+test( "content: default; HTML escaping", function() {
+	expect( 2 );
+	var scriptText = "<script>$.ui.tooltip.hacked = true;</script>",
+		element = $( "#tooltipped1" );
+
+	$.ui.tooltip.hacked = false;
+	element.attr( "title", scriptText )
+		.tooltip()
+		.tooltip( "open" );
+	equal( $.ui.tooltip.hacked, false, "script did not execute" );
+	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), scriptText,
+		"correct tooltip text" );
+});
+
+test( "content: return string", function() {
+	expect( 1 );
+	var element = $( "#tooltipped1" ).tooltip({
+		content: function() {
+			return "customstring";
+		}
+	}).tooltip( "open" );
+	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "customstring" );
+});
+
+test( "content: return jQuery", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip({
+		content: function() {
+			return $( "<div id='unique'>" ).html( "cu<b id='bold'>s</b>tomstring" );
+		}
+	}).tooltip( "open" ),
+	liveRegion = element.tooltip( "instance" ).liveRegion;
+	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "customstring" );
+	equal( liveRegion.children().last().html().toLowerCase(), "<div>cu<b>s</b>tomstring</div>",
+		"The accessibility live region will strip the ids but keep the structure" );
+});
+
+asyncTest( "content: sync + async callback", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip({
+		content: function( response ) {
+			setTimeout(function() {
+				deepEqual( $( "#" + element.data("ui-tooltip-id") ).text(), "loading..." );
+
+				response( "customstring2" );
+				setTimeout(function() {
+					deepEqual( $( "#" + element.data("ui-tooltip-id") ).text(), "customstring2" );
+					start();
+				}, 13 );
+			}, 13 );
+			return "loading...";
+		}
+	}).tooltip( "open" );
+});
+
+// http://bugs.jqueryui.com/ticket/8740
+asyncTest( "content: async callback loses focus before load", function() {
+	expect( 1 );
+
+	var element = $( "#tooltipped1" ).tooltip({
+		content: function( response ) {
+			setTimeout(function() {
+				element.trigger( "mouseleave" );
+				setTimeout(function() {
+					response( "sometext" );
+					setTimeout(function() {
+						ok( !$( "#" + element.data( "ui-tooltip-id" ) ).is( ":visible" ),
+							"Tooltip should not display" );
+						start();
+					});
+				});
+			});
+		}
+	});
+	element.trigger( "mouseover" );
+});
+
+test( "content: change while open", function() {
+	expect( 2 ) ;
+	var element = $( "#tooltipped1" ).tooltip({
+		content: function() {
+			return "old";
+		}
+	});
+
+	element.one( "tooltipopen", function( event, ui ) {
+		equal( ui.tooltip.text(), "old", "original content" );
+		element.tooltip( "option", "content", function() {
+			return "new";
+		});
+		equal( ui.tooltip.text(), "new", "updated content" );
+	});
+
+	element.tooltip( "open" );
+});
+
+test( "content: string", function() {
+	expect( 1 );
+	$( "#tooltipped1" ).tooltip({
+		content: "just a string",
+		open: function( event, ui ) {
+			equal( ui.tooltip.text(), "just a string" );
+		}
+	}).tooltip( "open" );
+});
+
+test( "content: element", function() {
+	expect( 1 );
+	var content = "<p>this is a <i>test</i> of the emergency broadcast system.</p>",
+		element = $( content )[ 0 ];
+	$( "#tooltipped1" ).tooltip({
+		content: element,
+		open: function( event, ui ) {
+			equal( ui.tooltip.children().html().toLowerCase(), content );
+		}
+	}).tooltip( "open" );
+});
+
+test( "content: jQuery", function() {
+	expect( 1 );
+	var content = "<p>this is a <i>test</i> of the emergency broadcast system.</p>",
+		element = $( content );
+	$( "#tooltipped1" ).tooltip({
+		content: element,
+		open: function( event, ui ) {
+			equal( ui.tooltip.children().html().toLowerCase(), content );
+		}
+	}).tooltip( "open" );
+});
+
+test( "items", function() {
+	expect( 2 );
+	var event,
+		element = $( "#qunit-fixture" ).tooltip({
+			items: "#fixture-span"
+		});
+
+	event = $.Event( "mouseenter" );
+	event.target = $( "#fixture-span" )[ 0 ];
+	element.tooltip( "open", event );
+	deepEqual( $( "#" + $( "#fixture-span" ).data( "ui-tooltip-id" ) ).text(), "title-text" );
+
+	// make sure default [title] doesn't get used
+	event.target = $( "#tooltipped1" )[ 0 ];
+	element.tooltip( "open", event );
+	deepEqual( $( "#tooltipped1" ).data( "ui-tooltip-id" ), undefined );
+
+	element.tooltip( "destroy" );
+});
+
+test( "track + show delay", function() {
+	expect( 2 );
+	var event,
+		leftVal = 314,
+		topVal = 159,
+		offsetVal = 26,
+		element = $( "#tooltipped1" ).tooltip({
+			track: true,
+			show: {
+				delay: 1
+			},
+			position: {
+				my: "left+" + offsetVal + " top+" + offsetVal,
+				at: "right bottom"
+			}
+		});
+
+	event = $.Event( "mouseover" );
+	event.target = $( "#tooltipped1" )[ 0 ];
+	event.originalEvent = { type: "mouseover" };
+	event.pageX = leftVal;
+	event.pageY = topVal;
+	element.trigger( event );
+
+	event = $.Event( "mousemove" );
+	event.target = $( "#tooltipped1" )[ 0 ];
+	event.originalEvent = { type: "mousemove" };
+	event.pageX = leftVal;
+	event.pageY = topVal;
+	element.trigger( event );
+
+	equal( $( ".ui-tooltip" ).css( "left" ), leftVal + offsetVal + "px" );
+	equal( $( ".ui-tooltip" ).css( "top" ), topVal + offsetVal + "px" );
+});
+
+test( "track and programmatic focus", function() {
+	expect( 1 );
+	$( "#qunit-fixture div input" ).tooltip({
+		track: true
+	}).focus();
+	equal( "inputtitle", $( ".ui-tooltip" ).text() );
+});
+
+} );
diff --git a/tests/unit/tooltip/tooltip_common.js b/tests/unit/tooltip/tooltip_common.js
deleted file mode 100644
index f8045fc33..000000000
--- a/tests/unit/tooltip/tooltip_common.js
+++ /dev/null
@@ -1,30 +0,0 @@
-define( [
-	"lib/common",
-	"ui/tooltip"
-], function( common ) {
-
-common.testWidget( "tooltip", {
-	defaults: {
-		classes: {
-			"ui-tooltip": "ui-corner-all ui-widget-shadow"
-		},
-		content: function() {},
-		disabled: false,
-		hide: true,
-		items: "[title]:not([disabled])",
-		position: {
-			my: "left top+15",
-			at: "left bottom",
-			collision: "flipfit flip"
-		},
-		show: true,
-		track: false,
-
-		// callbacks
-		close: null,
-		create: null,
-		open: null
-	}
-});
-
-} );
diff --git a/tests/unit/tooltip/tooltip_common_deprecated.js b/tests/unit/tooltip/tooltip_common_deprecated.js
deleted file mode 100644
index d32e7656d..000000000
--- a/tests/unit/tooltip/tooltip_common_deprecated.js
+++ /dev/null
@@ -1,31 +0,0 @@
-define( [
-	"lib/common",
-	"ui/tooltip"
-], function( common ) {
-
-common.testWidget( "tooltip", {
-	defaults: {
-		classes: {
-			"ui-tooltip": "ui-corner-all ui-widget-shadow"
-		},
-		content: function() {},
-		disabled: false,
-		hide: true,
-		items: "[title]:not([disabled])",
-		position: {
-			my: "left top+15",
-			at: "left bottom",
-			collision: "flipfit flip"
-		},
-		show: true,
-		tooltipClass: null,
-		track: false,
-
-		// callbacks
-		close: null,
-		create: null,
-		open: null
-	}
-});
-
-} );
diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/tooltip_core.js
deleted file mode 100644
index fa24d72ce..000000000
--- a/tests/unit/tooltip/tooltip_core.js
+++ /dev/null
@@ -1,224 +0,0 @@
-define( [
-	"jquery",
-	"ui/tooltip"
-], function( $ ) {
-
-module( "tooltip: core" );
-
-test( "markup structure", function( assert ) {
-	expect( 7 );
-	var element = $( "#tooltipped1" ).tooltip(),
-		tooltip = $( ".ui-tooltip" );
-
-	equal( element.attr( "aria-describedby" ), undefined, "no aria-describedby on init" );
-	equal( tooltip.length, 0, "no tooltip on init" );
-
-	element.tooltip( "open" );
-	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
-	equal( tooltip.length, 1, "tooltip exists" );
-	equal( element.attr( "aria-describedby" ), tooltip.attr( "id" ), "aria-describedby" );
-	assert.hasClasses( tooltip, "ui-tooltip ui-widget ui-widget-content ui-widget-shadow" );
-	equal( tooltip.length, 1, ".ui-tooltip exists" );
-	equal( tooltip.find( ".ui-tooltip-content" ).length, 1,
-		".ui-tooltip-content exists" );
-});
-
-test( "accessibility", function() {
-	expect( 15 );
-
-	var tooltipId, tooltip,
-		element = $( "#multiple-describedby" ).tooltip(),
-		liveRegion = element.tooltip( "instance" ).liveRegion;
-
-	equal( liveRegion.find( ">div" ).length, 0 );
-	equal( liveRegion.attr( "role" ), "log" );
-	equal( liveRegion.attr( "aria-live" ), "assertive" );
-	equal( liveRegion.attr( "aria-relevant" ), "additions" );
-	element.tooltip( "open" );
-	tooltipId = element.data( "ui-tooltip-id" );
-	tooltip = $( "#" + tooltipId );
-	equal( tooltip.attr( "role" ), "tooltip", "role" );
-	equal( element.attr( "aria-describedby" ), "fixture-span " + tooltipId,
-		"multiple describedby when open" );
-
-	equal( element.attr( "title" ), null, "no title when open" );
-	equal( liveRegion.children().length, 1 );
-	equal( liveRegion.children().last().html(), "..." );
-	element.tooltip( "close" );
-	equal( element.attr( "aria-describedby" ), "fixture-span",
-		"correct describedby when closed" );
-	equal( element.attr( "title" ), "...", "title restored when closed" );
-
-	element.tooltip( "open" );
-	equal( liveRegion.children().length, 2,
-		"After the second tooltip show, there should be two children" );
-	equal( liveRegion.children().filter( ":visible" ).length, 1,
-		"Only one of the children should be visible" );
-	ok( liveRegion.children().last().is( ":visible" ),
-		"Only the last child should be visible" );
-	element.tooltip( "close" );
-
-	element.tooltip( "destroy" );
-	equal( liveRegion.parent().length, 0,
-		"Tooltip liveregion element should be removed" );
-});
-
-test( "delegated removal", function() {
-	expect( 2 );
-
-	var container = $( "#contains-tooltipped" ).tooltip(),
-		element = $( "#contained-tooltipped" );
-
-	element.trigger( "mouseover" );
-	equal( $( ".ui-tooltip" ).length, 1 );
-
-	container.empty();
-	equal( $( ".ui-tooltip" ).length, 0 );
-});
-
-test( "nested tooltips", function() {
-	expect( 2 );
-
-	var child = $( "#contained-tooltipped" ),
-		parent = $( "#contains-tooltipped" ).tooltip({
-			show: null,
-			hide: null
-		});
-
-	parent.trigger( "mouseover" );
-	equal( $( ".ui-tooltip:visible" ).text(), "parent" );
-
-	child.trigger( "mouseover" );
-	equal( $( ".ui-tooltip" ).text(), "child" );
-});
-
-// #8742
-test( "form containing an input with name title", function() {
-	expect( 4 );
-
-	var form = $( "#tooltip-form" ).tooltip({
-			show: null,
-			hide: null
-		}),
-		input = form.find( "[name=title]" );
-
-	equal( $( ".ui-tooltip" ).length, 0, "no tooltips on init" );
-
-	input.trigger( "mouseover" );
-	equal( $( ".ui-tooltip" ).length, 1, "tooltip for input" );
-	input.trigger( "mouseleave" );
-	equal( $( ".ui-tooltip" ).length, 0, "tooltip for input closed" );
-
-	form.trigger( "mouseover" );
-	equal( $( ".ui-tooltip" ).length, 0, "no tooltip for form" );
-});
-
-test( "tooltip on .ui-state-disabled element", function() {
-	expect( 2 );
-
-	var container = $( "#contains-tooltipped" ).tooltip(),
-		element = $( "#contained-tooltipped" ).addClass( "ui-state-disabled" );
-
-	element.trigger( "mouseover" );
-	equal( $( ".ui-tooltip" ).length, 1 );
-
-	container.empty();
-	equal( $( ".ui-tooltip" ).length, 0 );
-});
-
-// http://bugs.jqueryui.com/ticket/8740
-asyncTest( "programmatic focus with async content", function() {
-	expect( 2 );
-	var element = $( "#tooltipped1" ).tooltip({
-		content: function( response ) {
-			setTimeout(function() {
-				response( "test" );
-			});
-		}
-	});
-
-	element.bind( "tooltipopen", function( event ) {
-		deepEqual( event.originalEvent.type, "focusin" );
-
-		element.bind( "tooltipclose", function( event ) {
-			deepEqual( event.originalEvent.type, "focusout" );
-			start();
-		});
-
-		setTimeout(function() {
-			element.blur();
-		});
-	});
-
-	element.focus();
-});
-
-asyncTest( "destroy during hide animation; only one close event", function() {
-	expect( 1 );
-
-	var element = $( "#tooltipped1" ).tooltip({
-		show: false,
-		hide: true
-	});
-
-	element.bind( "tooltipclose", function() {
-		ok( true, "tooltip closed" );
-	});
-
-	element.tooltip( "open" );
-	element.tooltip( "close" );
-	setTimeout(function() {
-		element.tooltip( "destroy" );
-		start();
-	});
-});
-
-// http://bugs.jqueryui.com/ticket/10602
-asyncTest( "multiple active delegated tooltips", function() {
-	expect( 1 );
-
-	var anchor = $( "#tooltipped1" ),
-		input = anchor.next(),
-		actions = [];
-
-	$( document ).tooltip({
-			show: false,
-			hide: false,
-			open: function( event, ui ) {
-				actions.push( "open:" + ui.tooltip.text() );
-			},
-			close: function( event, ui ) {
-				actions.push( "close:" + ui.tooltip.text() );
-			}
-		});
-
-	function step1() {
-		anchor.simulate( "mouseover" );
-		setTimeout( step2 );
-	}
-
-	function step2() {
-		input.simulate( "focus" );
-		setTimeout( step3 );
-	}
-
-	function step3() {
-		input.simulate( "blur" );
-		setTimeout( step4 );
-	}
-
-	function step4() {
-		anchor.simulate( "mouseout" );
-		deepEqual( actions, [
-			"open:anchortitle",
-			"open:inputtitle",
-			"close:inputtitle",
-			"close:anchortitle"
-		], "Both tooltips open and close" );
-		start();
-	}
-
-	step1();
-});
-
-} );
diff --git a/tests/unit/tooltip/tooltip_deprecated.html b/tests/unit/tooltip/tooltip_deprecated.html
deleted file mode 100644
index d21fea57b..000000000
--- a/tests/unit/tooltip/tooltip_deprecated.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>jQuery UI Tooltip Test Suite</title>
-
-	<script src="../../lib/css.js" data-modules="core tooltip"></script>
-	<script src="../../lib/bootstrap.js" data-widget="tooltip" data-deprecated="true"></script>
-</head>
-<body>
-
-<div id="qunit"></div>
-<div id="qunit-fixture">
-
-<div>
-	<a id="tooltipped1" href="#" title="anchortitle">anchor</a>
-	<input title="inputtitle">
-	<span id="multiple-describedby" aria-describedby="fixture-span" title="...">aria-describedby</span>
-	<span id="fixture-span" title="title-text">span</span>
-	<span id="contains-tooltipped" title="parent"><span id="contained-tooltipped" title="child">baz</span></span>
-</div>
-
-<form id="tooltip-form">
-	<input name="title" title="attroperties">
-</form>
-
-</div>
-</body>
-</html>
diff --git a/tests/unit/tooltip/tooltip_deprecated.js b/tests/unit/tooltip/tooltip_deprecated.js
deleted file mode 100644
index 057171ee2..000000000
--- a/tests/unit/tooltip/tooltip_deprecated.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define( [
-	"jquery",
-	"ui/tooltip"
-], function( $ ) {
-
-module( "tooltip: (deprecated) options" );
-
-test( "tooltipClass", function( assert ) {
-	expect( 1 );
-	var element = $( "#tooltipped1" ).tooltip({
-		tooltipClass: "custom"
-	}).tooltip( "open" );
-	assert.hasClasses( $( "#" + element.data( "ui-tooltip-id" ) ), "custom" );
-});
-
-} );
diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/tooltip_events.js
deleted file mode 100644
index a953c6e91..000000000
--- a/tests/unit/tooltip/tooltip_events.js
+++ /dev/null
@@ -1,60 +0,0 @@
-define( [
-	"jquery",
-	"ui/tooltip"
-], function( $ ) {
-
-module( "tooltip: events" );
-
-test( "programmatic triggers", function() {
-	expect( 4 );
-	var tooltip,
-		element = $( "#tooltipped1" ).tooltip();
-
-	element.one( "tooltipopen", function( event, ui ) {
-		tooltip = ui.tooltip;
-		ok( !( "originalEvent" in event ), "open" );
-		strictEqual( ui.tooltip[0],
-			$( "#" + element.data( "ui-tooltip-id" ) )[0], "ui.tooltip" );
-	});
-	element.tooltip( "open" );
-
-	element.one( "tooltipclose", function( event, ui ) {
-		ok( !( "originalEvent" in event ), "close" );
-		strictEqual( ui.tooltip[0], tooltip[0], "ui.tooltip" );
-	});
-	element.tooltip( "close" );
-});
-
-test( "mouse events", function() {
-	expect( 2 );
-	var element = $( "#tooltipped1" ).tooltip();
-
-	element.bind( "tooltipopen", function( event ) {
-		deepEqual( event.originalEvent.type, "mouseover" );
-	});
-	element.trigger( "mouseover" );
-
-	element.bind( "tooltipclose", function( event ) {
-		deepEqual( event.originalEvent.type, "mouseleave" );
-	});
-	element.trigger( "focusout" );
-	element.trigger( "mouseleave" );
-});
-
-test( "focus events", function() {
-	expect( 2 );
-	var element = $( "#tooltipped1" ).tooltip();
-
-	element.bind( "tooltipopen", function( event ) {
-		deepEqual( event.originalEvent.type, "focusin" );
-	});
-	element.trigger( "focusin" );
-
-	element.bind( "tooltipclose", function( event ) {
-		deepEqual( event.originalEvent.type, "focusout" );
-	});
-	element.trigger( "mouseleave" );
-	element.trigger( "focusout" );
-});
-
-} );
diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js
deleted file mode 100644
index 3db7b8f7c..000000000
--- a/tests/unit/tooltip/tooltip_methods.js
+++ /dev/null
@@ -1,139 +0,0 @@
-define( [
-	"jquery",
-	"ui/tooltip"
-], function( $ ) {
-
-module( "tooltip: methods" );
-
-test( "destroy", function( assert ) {
-	expect( 3 );
-	var element = $( "#tooltipped1" );
-
-	assert.domEqual( "#tooltipped1", function() {
-		element.tooltip().tooltip( "destroy" );
-	});
-
-	// make sure that open tooltips are removed on destroy
-	assert.domEqual( "#tooltipped1", function() {
-		element
-			.tooltip()
-			.tooltip( "open", $.Event( "mouseover", { target: element[0] }) )
-			.tooltip( "destroy" );
-	});
-	equal( $( ".ui-tooltip" ).length, 0 );
-});
-
-test( "open/close", function() {
-	expect( 3 );
-	$.fx.off = true;
-	var tooltip,
-		element = $( "#tooltipped1" ).tooltip();
-	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
-
-	element.tooltip( "open" );
-	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
-	ok( tooltip.is( ":visible" ) );
-
-	element.tooltip( "close" );
-	ok( tooltip.is( ":hidden" ) );
-	$.fx.off = false;
-});
-
-// #8626 - Calling open() without an event
-test( "open/close with tracking", function() {
-	expect( 3 );
-	$.fx.off = true;
-	var tooltip,
-		element = $( "#tooltipped1" ).tooltip({ track: true });
-	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
-
-	element.tooltip( "open" );
-	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
-	ok( tooltip.is( ":visible" ) );
-
-	element.tooltip( "close" );
-	ok( tooltip.is( ":hidden" ) );
-	$.fx.off = false;
-});
-
-test( "enable/disable", function( assert ) {
-	expect( 11 );
-	$.fx.off = true;
-	var tooltip,
-		element = $( "#tooltipped1" ).tooltip();
-	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
-
-	element.tooltip( "open" );
-	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
-	ok( tooltip.is( ":visible" ) );
-
-	element.tooltip( "disable" );
-	equal( $( ".ui-tooltip" ).length, 0, "no tooltip when disabled" );
-
-	assert.lacksClasses( element.tooltip( "widget" ), "ui-state-disabled" );
-	ok( !element.tooltip( "widget" ).attr( "aria-disabled" ), "element doesn't get aria-disabled" );
-	assert.lacksClasses( element.tooltip( "widget" ), "ui-tooltip-disabled" );
-	equal( tooltip.attr( "title" ), null, "title removed on disable" );
-
-	element.tooltip( "open" );
-	equal( $( ".ui-tooltip" ).length, 0, "open does nothing when disabled" );
-
-	element.tooltip( "enable" );
-	equal( element.attr( "title" ), "anchortitle", "title restored on enable" );
-
-	// #9719 - Title should be preserved after disabling twice
-	element.tooltip( "disable" );
-	element.tooltip( "disable" );
-	element.tooltip( "enable" );
-	equal( element.attr( "title" ), "anchortitle", "title restored on enable after being disabled twice" );
-
-	element.tooltip( "open" );
-	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
-	ok( tooltip.is( ":visible" ) );
-	$.fx.off = false;
-});
-
-test( "widget", function() {
-	expect( 2 );
-	var element = $( "#tooltipped1" ).tooltip(),
-		widgetElement = element.tooltip( "widget" );
-	equal( widgetElement.length, 1, "one element" );
-	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
-});
-
-test( "preserve changes to title attributes on close and destroy", function() {
-	expect( 6 );
-	var element = $( "#tooltipped1" ),
-		changed = "changed title text",
-		original = "original title text",
-		tests = [];
-
-	// 1. Changes to title attribute are preserved on close()
-	tests[ 0 ] = { title: changed, expected: changed, method: "close" };
-	// 2. Changes to title attribute are preserved on destroy()
-	tests[ 1 ] = { title: changed, expected: changed , method: "destroy" };
-	// 3. Changes to title attribute are NOT preserved when set to empty string on close()
-	tests[ 2 ] = { title: "", expected: original, method: "close" };
-	// 4. Changes to title attribute are NOT preserved when set to empty string on destroy()
-	tests[ 3 ] = { title: "", expected: original, method: "destroy" };
-	// 5. Changes to title attribute NOT preserved when attribute has been removed on close()
-	tests[ 4 ] = { expected: original, method: "close" };
-	// 6. Changes to title attribute NOT preserved when attribute has been removed on destroy()
-	tests[ 5 ] = { expected: original, method: "destroy" };
-
-	$.each( tests, function( index, test ) {
-
-		element.attr( "title", original ).tooltip()
-			.tooltip( "open", $.Event( "mouseover", { target: element[ 0 ] } ) );
-		if ( test.title ) {
-			element.attr( "title", test.title );
-		} else {
-			element.removeAttr( "title" );
-		}
-		element.tooltip( test.method );
-		equal( $( "#tooltipped1" ).attr( "title" ), test.expected );
-
-	} );
-});
-
-} );
diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
deleted file mode 100644
index d091e3bad..000000000
--- a/tests/unit/tooltip/tooltip_options.js
+++ /dev/null
@@ -1,215 +0,0 @@
-define( [
-	"jquery",
-	"ui/tooltip"
-], function( $ ) {
-
-module( "tooltip: options" );
-
-test( "disabled: true", function() {
-	expect( 1 );
-	$( "#tooltipped1" ).tooltip({
-		disabled: true
-	}).tooltip( "open" );
-	equal( $( ".ui-tooltip" ).length, 0 );
-});
-
-test( "content: default", function() {
-	expect( 1 );
-	var element = $( "#tooltipped1" ).tooltip().tooltip( "open" );
-	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "anchortitle" );
-});
-
-test( "content: default; HTML escaping", function() {
-	expect( 2 );
-	var scriptText = "<script>$.ui.tooltip.hacked = true;</script>",
-		element = $( "#tooltipped1" );
-
-	$.ui.tooltip.hacked = false;
-	element.attr( "title", scriptText )
-		.tooltip()
-		.tooltip( "open" );
-	equal( $.ui.tooltip.hacked, false, "script did not execute" );
-	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), scriptText,
-		"correct tooltip text" );
-});
-
-test( "content: return string", function() {
-	expect( 1 );
-	var element = $( "#tooltipped1" ).tooltip({
-		content: function() {
-			return "customstring";
-		}
-	}).tooltip( "open" );
-	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "customstring" );
-});
-
-test( "content: return jQuery", function() {
-	expect( 2 );
-	var element = $( "#tooltipped1" ).tooltip({
-		content: function() {
-			return $( "<div id='unique'>" ).html( "cu<b id='bold'>s</b>tomstring" );
-		}
-	}).tooltip( "open" ),
-	liveRegion = element.tooltip( "instance" ).liveRegion;
-	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "customstring" );
-	equal( liveRegion.children().last().html().toLowerCase(), "<div>cu<b>s</b>tomstring</div>",
-		"The accessibility live region will strip the ids but keep the structure" );
-});
-
-asyncTest( "content: sync + async callback", function() {
-	expect( 2 );
-	var element = $( "#tooltipped1" ).tooltip({
-		content: function( response ) {
-			setTimeout(function() {
-				deepEqual( $( "#" + element.data("ui-tooltip-id") ).text(), "loading..." );
-
-				response( "customstring2" );
-				setTimeout(function() {
-					deepEqual( $( "#" + element.data("ui-tooltip-id") ).text(), "customstring2" );
-					start();
-				}, 13 );
-			}, 13 );
-			return "loading...";
-		}
-	}).tooltip( "open" );
-});
-
-// http://bugs.jqueryui.com/ticket/8740
-asyncTest( "content: async callback loses focus before load", function() {
-	expect( 1 );
-
-	var element = $( "#tooltipped1" ).tooltip({
-		content: function( response ) {
-			setTimeout(function() {
-				element.trigger( "mouseleave" );
-				setTimeout(function() {
-					response( "sometext" );
-					setTimeout(function() {
-						ok( !$( "#" + element.data( "ui-tooltip-id" ) ).is( ":visible" ),
-							"Tooltip should not display" );
-						start();
-					});
-				});
-			});
-		}
-	});
-	element.trigger( "mouseover" );
-});
-
-test( "content: change while open", function() {
-	expect( 2 ) ;
-	var element = $( "#tooltipped1" ).tooltip({
-		content: function() {
-			return "old";
-		}
-	});
-
-	element.one( "tooltipopen", function( event, ui ) {
-		equal( ui.tooltip.text(), "old", "original content" );
-		element.tooltip( "option", "content", function() {
-			return "new";
-		});
-		equal( ui.tooltip.text(), "new", "updated content" );
-	});
-
-	element.tooltip( "open" );
-});
-
-test( "content: string", function() {
-	expect( 1 );
-	$( "#tooltipped1" ).tooltip({
-		content: "just a string",
-		open: function( event, ui ) {
-			equal( ui.tooltip.text(), "just a string" );
-		}
-	}).tooltip( "open" );
-});
-
-test( "content: element", function() {
-	expect( 1 );
-	var content = "<p>this is a <i>test</i> of the emergency broadcast system.</p>",
-		element = $( content )[ 0 ];
-	$( "#tooltipped1" ).tooltip({
-		content: element,
-		open: function( event, ui ) {
-			equal( ui.tooltip.children().html().toLowerCase(), content );
-		}
-	}).tooltip( "open" );
-});
-
-test( "content: jQuery", function() {
-	expect( 1 );
-	var content = "<p>this is a <i>test</i> of the emergency broadcast system.</p>",
-		element = $( content );
-	$( "#tooltipped1" ).tooltip({
-		content: element,
-		open: function( event, ui ) {
-			equal( ui.tooltip.children().html().toLowerCase(), content );
-		}
-	}).tooltip( "open" );
-});
-
-test( "items", function() {
-	expect( 2 );
-	var event,
-		element = $( "#qunit-fixture" ).tooltip({
-			items: "#fixture-span"
-		});
-
-	event = $.Event( "mouseenter" );
-	event.target = $( "#fixture-span" )[ 0 ];
-	element.tooltip( "open", event );
-	deepEqual( $( "#" + $( "#fixture-span" ).data( "ui-tooltip-id" ) ).text(), "title-text" );
-
-	// make sure default [title] doesn't get used
-	event.target = $( "#tooltipped1" )[ 0 ];
-	element.tooltip( "open", event );
-	deepEqual( $( "#tooltipped1" ).data( "ui-tooltip-id" ), undefined );
-
-	element.tooltip( "destroy" );
-});
-
-test( "track + show delay", function() {
-	expect( 2 );
-	var event,
-		leftVal = 314,
-		topVal = 159,
-		offsetVal = 26,
-		element = $( "#tooltipped1" ).tooltip({
-			track: true,
-			show: {
-				delay: 1
-			},
-			position: {
-				my: "left+" + offsetVal + " top+" + offsetVal,
-				at: "right bottom"
-			}
-		});
-
-	event = $.Event( "mouseover" );
-	event.target = $( "#tooltipped1" )[ 0 ];
-	event.originalEvent = { type: "mouseover" };
-	event.pageX = leftVal;
-	event.pageY = topVal;
-	element.trigger( event );
-
-	event = $.Event( "mousemove" );
-	event.target = $( "#tooltipped1" )[ 0 ];
-	event.originalEvent = { type: "mousemove" };
-	event.pageX = leftVal;
-	event.pageY = topVal;
-	element.trigger( event );
-
-	equal( $( ".ui-tooltip" ).css( "left" ), leftVal + offsetVal + "px" );
-	equal( $( ".ui-tooltip" ).css( "top" ), topVal + offsetVal + "px" );
-});
-
-test( "track and programmatic focus", function() {
-	expect( 1 );
-	$( "#qunit-fixture div input" ).tooltip({
-		track: true
-	}).focus();
-	equal( "inputtitle", $( ".ui-tooltip" ).text() );
-});
-
-} );
diff --git a/tests/unit/widget/animation.js b/tests/unit/widget/animation.js
new file mode 100644
index 000000000..4e9d93ccf
--- /dev/null
+++ b/tests/unit/widget/animation.js
@@ -0,0 +1,263 @@
+define( [
+	"jquery",
+	"ui/widget"
+], function( $ ) {
+
+module( "widget animation", (function() {
+	var show = $.fn.show,
+		fadeIn = $.fn.fadeIn,
+		slideDown = $.fn.slideDown;
+	return {
+		setup: function() {
+			$.widget( "ui.testWidget", {
+				_create: function() {
+					this.element.hide();
+				},
+				show: function( fn ) {
+					this._show( this.element, this.options.show, fn );
+				}
+			});
+			$.effects = { effect: { testEffect: $.noop } };
+		},
+		teardown: function() {
+			delete $.ui.testWidget;
+			delete $.effects.effect.testEffect;
+			$.fn.show = show;
+			$.fn.fadeIn = fadeIn;
+			$.fn.slideDown = slideDown;
+		}
+	};
+}()));
+
+asyncTest( "show: null", function() {
+	expect( 4 );
+
+	var element = $( "#widget" ).testWidget(),
+		hasRun = false;
+	$.fn.show = function() {
+		ok( true, "show called" );
+		equal( arguments.length, 0, "no args passed to show" );
+	};
+
+	element
+		.delay( 50 )
+		.queue(function( next ) {
+			ok( !hasRun, "queue before show" );
+			next();
+		})
+		.testWidget( "show", function() {
+			hasRun = true;
+		})
+		.queue(function( next ) {
+			ok( hasRun, "queue after show" );
+			start();
+			next();
+		});
+});
+
+asyncTest( "show: true", function() {
+	expect( 4 );
+
+	var element = $( "#widget" ).testWidget({
+			show: true
+		}),
+		hasRun = false;
+	$.fn.fadeIn = function( duration, easing, complete ) {
+		return this.queue(function( next ) {
+			strictEqual( duration, undefined, "duration" );
+			strictEqual( easing, undefined, "easing" );
+			complete();
+			next();
+		});
+	};
+
+	element
+		.delay( 50 )
+		.queue(function( next ) {
+			ok( !hasRun, "queue before show" );
+			next();
+		})
+		.testWidget( "show", function() {
+			hasRun = true;
+		})
+		.queue(function( next ) {
+			ok( hasRun, "queue after show" );
+			start();
+			next();
+		});
+});
+
+asyncTest( "show: number", function() {
+	expect( 4 );
+
+	var element = $( "#widget" ).testWidget({
+		show: 123
+	}),
+	hasRun = false;
+	$.fn.fadeIn = function( duration, easing, complete ) {
+		return this.queue(function( next ) {
+			strictEqual( duration, 123, "duration" );
+			strictEqual( easing, undefined, "easing" );
+			complete();
+			next();
+		});
+	};
+
+	element
+		.delay( 50 )
+		.queue(function( next ) {
+			ok( !hasRun, "queue before show" );
+			next();
+		})
+		.testWidget( "show", function() {
+			hasRun = true;
+		})
+		.queue(function( next ) {
+			ok( hasRun, "queue after show" );
+			start();
+			next();
+		});
+});
+
+asyncTest( "show: core animation", function() {
+	expect( 4 );
+
+	var element = $( "#widget" ).testWidget({
+		show: "slideDown"
+	}),
+	hasRun = false;
+	$.fn.slideDown = function( duration, easing, complete ) {
+		return this.queue(function( next ) {
+			strictEqual( duration, undefined, "duration" );
+			strictEqual( easing, undefined, "easing" );
+			complete();
+			next();
+		});
+	};
+
+	element
+		.delay( 50 )
+		.queue(function( next ) {
+			ok( !hasRun, "queue before show" );
+			next();
+		})
+		.testWidget( "show", function() {
+			hasRun = true;
+		})
+		.queue(function( next ) {
+			ok( hasRun, "queue after show" );
+			start();
+			next();
+		});
+});
+
+asyncTest( "show: effect", function() {
+	expect( 5 );
+
+	var element = $( "#widget" ).testWidget({
+		show: "testEffect"
+	}),
+	hasRun = false;
+	$.fn.show = function( options ) {
+		return this.queue(function( next ) {
+			equal( options.effect, "testEffect", "effect" );
+			ok( !("duration" in options), "duration" );
+			ok( !("easing" in options), "easing" );
+			options.complete();
+			next();
+		});
+	};
+
+	element
+		.delay( 50 )
+		.queue(function( next ) {
+			ok( !hasRun, "queue before show" );
+			next();
+		})
+		.testWidget( "show", function() {
+			hasRun = true;
+		})
+		.queue(function( next ) {
+			ok( hasRun, "queue after show" );
+			start();
+			next();
+		});
+});
+
+asyncTest( "show: object(core animation)", function() {
+	expect( 4 );
+
+	var element = $( "#widget" ).testWidget({
+		show: {
+			effect: "slideDown",
+			duration: 123,
+			easing: "testEasing"
+		}
+	}),
+	hasRun = false;
+	$.fn.slideDown = function( duration, easing, complete ) {
+		return this.queue(function( next ) {
+			equal( duration, 123, "duration" );
+			equal( easing, "testEasing", "easing" );
+			complete();
+			next();
+		});
+	};
+
+	element
+		.delay( 50 )
+		.queue(function( next ) {
+			ok( !hasRun, "queue before show" );
+			next();
+		})
+		.testWidget( "show", function() {
+			hasRun = true;
+		})
+		.queue(function( next ) {
+			ok( hasRun, "queue after show" );
+			start();
+			next();
+		});
+});
+
+asyncTest( "show: object(effect)", function() {
+	expect( 3 );
+
+	var element = $( "#widget" ).testWidget({
+		show: {
+			effect: "testEffect",
+			duration: 123,
+			easing: "testEasing"
+		}
+	}),
+	hasRun = false;
+	$.fn.show = function( options ) {
+		return this.queue(function( next ) {
+			deepEqual( options, {
+				effect: "testEffect",
+				duration: 123,
+				easing: "testEasing",
+				complete: options.complete
+			});
+			options.complete();
+			next();
+		});
+	};
+
+	element
+		.delay( 50 )
+		.queue(function( next ) {
+			ok( !hasRun, "queue before show" );
+			next();
+		})
+		.testWidget( "show", function() {
+			hasRun = true;
+		})
+		.queue(function( next ) {
+			ok( hasRun, "queue after show" );
+			start();
+			next();
+		});
+});
+
+} );
diff --git a/tests/unit/widget/classes.js b/tests/unit/widget/classes.js
new file mode 100644
index 000000000..1b4a45120
--- /dev/null
+++ b/tests/unit/widget/classes.js
@@ -0,0 +1,146 @@
+define( [
+	"jquery",
+	"ui/widget"
+], function( $ ) {
+
+module( "widget factory classes", {
+	setup: function() {
+		$.widget( "ui.classesWidget", {
+			options: {
+				classes: {
+					"ui-classes-widget": "ui-theme-widget",
+					"ui-classes-element": "ui-theme-element ui-theme-element-2"
+				}
+			},
+			_create: function() {
+				this.span = $( "<span>" )
+					.appendTo( this.element );
+
+				this.element.wrap( "<div>" );
+
+				this.wrapper = this.element.parent();
+
+				this._addClass( "ui-classes-element", "ui-core-element" )
+					._addClass( "ui-classes-element-2" )
+					._addClass( null, "ui-core-element-null" )
+					._addClass( this.span, null, "ui-core-span-null" )
+					._addClass( this.span, "ui-classes-span", "ui-core-span" )
+					._addClass( this.wrapper, "ui-classes-widget" );
+
+			},
+			toggleClasses: function( bool ) {
+				this._toggleClass( "ui-classes-element", "ui-core-element", bool )
+					._toggleClass( "ui-classes-element-2", null, bool )
+					._toggleClass( null, "ui-core-element-null", bool )
+					._toggleClass( this.span, null, "ui-core-span-null", bool )
+					._toggleClass( this.span, "ui-classes-span", "ui-core-span", bool )
+					._toggleClass( this.wrapper, "ui-classes-widget", null, bool );
+			},
+			removeClasses: function() {
+				this._removeClass( "ui-classes-element", "ui-core-element" )
+					._removeClass( "ui-classes-element-2" )
+					._removeClass(  null, "ui-core-element-null"  )
+					._removeClass( this.span, null, "ui-core-span-null" )
+					._removeClass( this.span, "ui-classes-span", "ui-core-span" )
+					._removeClass( this.wrapper, "ui-classes-widget" );
+			},
+			_destroy: function() {
+				this.span.remove();
+				this.element.unwrap();
+			}
+		});
+	},
+	teardown: function() {
+		delete $.ui.classesWidget;
+		delete $.fn.classesWidget;
+	}
+});
+
+function elementHasClasses( widget, method, assert ) {
+	var toggle = method === "toggle" ? ( ", true" ) : "";
+
+	assert.hasClasses( widget, "ui-classes-element ui-theme-element ui-theme-element-2",
+		"_" + method + "Class works with ( keys, extra" + toggle + " )" );
+	assert.hasClasses( widget, "ui-classes-element-2",
+		"_" + method + "Class works with ( keys, null" + toggle + " )" );
+	assert.hasClasses( widget, "ui-core-element-null",
+		"_" + method + "Class works with ( null, extra" + toggle + " )" );
+	assert.hasClasses( widget.parent(), "ui-classes-widget ui-theme-widget",
+		"_" + method + "Class works with ( element, null, extra" + toggle + " )" );
+	assert.hasClasses( widget.find( "span" ), "ui-classes-span ui-core-span",
+		"_" + method + "Class works with ( element, keys, extra" + toggle + " )" );
+	assert.hasClasses( widget.find( "span" ), "ui-core-span-null",
+		"_" + method + "Class works with ( element, keys, null" + toggle + " )" );
+}
+function elementLacksClasses( widget, method, assert ) {
+	var toggle = method === "toggle" ? ( ", false" ) : "";
+
+	assert.lacksClasses( widget, "ui-classes-element ui-theme-element ui-theme-element-2",
+		"_" + method + "Class works with ( keys, extra" + toggle + " )" );
+	assert.lacksClasses( widget, "ui-classes-element-2",
+		"_" + method + "Class works with ( keys, null" + toggle + " )" );
+	assert.lacksClasses( widget, "ui-core-element-null",
+		"_" + method + "Class works with ( null, extra" + toggle + " )" );
+	assert.lacksClasses( widget.parent(), "ui-classes-widget ui-theme-widget",
+		"_" + method + "Class works with ( element, null, extra" + toggle + " )" );
+	assert.lacksClasses( widget.find( "span" ), "ui-classes-span ui-core-span",
+		"_" + method + "Class works with ( element, keys, extra" + toggle + " )" );
+	assert.lacksClasses( widget.find( "span" ), "ui-core-span-null",
+		"_" + method + "Class works with ( element, keys, null" + toggle + " )" );
+}
+
+test( ".option() - classes setter", function( assert ) {
+	expect( 11 );
+
+	var testWidget = $.ui.classesWidget();
+
+	elementHasClasses( testWidget.element, "add", assert );
+
+	testWidget.option({
+		classes: {
+			"ui-classes-span": "custom-theme-span",
+			"ui-classes-widget": "ui-theme-widget custom-theme-widget",
+			"ui-classes-element": "ui-theme-element-2"
+		}
+	});
+
+	assert.lacksClasses( testWidget.element, "ui-theme-element",
+		"Removing a class from the value removes the class" );
+
+	testWidget.option( "classes.ui-classes-element", "" );
+	assert.hasClasses( testWidget.element, "ui-classes-element",
+		"Setting to empty value leaves structure class" );
+	assert.lacksClasses( testWidget.element, "ui-theme-element-2",
+		"Setting empty value removes previous value classes" );
+	assert.hasClasses( testWidget.span, "ui-classes-span custom-theme-span",
+		"Adding a class to an empty value works as expected" );
+	assert.hasClasses( testWidget.wrapper, "ui-classes-widget custom-theme-widget",
+		"Appending a class to the current value works as expected" );
+});
+
+test( ".destroy() - class removal", function( assert ) {
+	expect( 1 );
+
+	assert.domEqual( "#widget", function() {
+		$( "#widget" ).classesWidget().classesWidget( "destroy" );
+	});
+});
+
+test( "._add/_remove/_toggleClass()", function( assert ) {
+	expect( 24 );
+
+	var widget = $( "#widget" ).classesWidget();
+
+	elementHasClasses( widget, "add", assert );
+
+	widget.classesWidget( "toggleClasses", false );
+	elementLacksClasses( widget, "toggle", assert );
+
+	widget.classesWidget( "toggleClasses", true );
+	elementHasClasses( widget, "toggle", assert );
+
+	widget.classesWidget( "removeClasses" );
+	elementLacksClasses( widget, "remove", assert );
+});
+
+} );
diff --git a/tests/unit/widget/core.js b/tests/unit/widget/core.js
new file mode 100644
index 000000000..22832765b
--- /dev/null
+++ b/tests/unit/widget/core.js
@@ -0,0 +1,1514 @@
+define( [
+	"jquery",
+	"lib/common",
+	"ui/widget"
+], function( $, common ) {
+
+module( "widget factory", {
+	teardown: function() {
+		if ( $.ui ) {
+			delete $.ui.testWidget;
+			delete $.fn.testWidget;
+		}
+	}
+});
+
+common.testJshint( "widget" );
+
+test( "widget creation", function() {
+	expect( 5 );
+	var method,
+		myPrototype = {
+			_create: function() {
+				equal( method, "_create", "create function is copied over" );
+			},
+			creationTest: function() {
+				equal( method, "creationTest", "random function is copied over" );
+			}
+		};
+
+	$.widget( "ui.testWidget", myPrototype );
+	ok( $.isFunction( $.ui.testWidget ), "constructor was created" );
+	equal( typeof $.ui.testWidget.prototype, "object", "prototype was created" );
+	method = "_create";
+	$.ui.testWidget.prototype._create();
+	method = "creationTest";
+	$.ui.testWidget.prototype.creationTest();
+	equal( $.ui.testWidget.prototype.option, $.Widget.prototype.option,
+		"option method copied over from base widget" );
+});
+
+test( "element normalization", function() {
+	expect( 11 );
+	var elem;
+	$.widget( "ui.testWidget", {} );
+
+	$.ui.testWidget.prototype._create = function() {
+		// workaround for core ticket #8381
+		this.element.appendTo( "#qunit-fixture" );
+		ok( this.element.is( "div" ), "generated div" );
+		deepEqual( this.element.testWidget( "instance" ), this, "instance stored in .data()" );
+	};
+	$.ui.testWidget();
+
+	$.ui.testWidget.prototype.defaultElement = "<span data-test='pass'></span>";
+	$.ui.testWidget.prototype._create = function() {
+		ok( this.element.is( "span[data-test=pass]" ), "generated span with properties" );
+		deepEqual( this.element.testWidget( "instance" ), this, "instance stored in .data()" );
+	};
+	$.ui.testWidget();
+
+	elem = $( "<input>" );
+	$.ui.testWidget.prototype._create = function() {
+		deepEqual( this.element[ 0 ], elem[ 0 ], "from element" );
+		deepEqual( elem.testWidget( "instance" ), this, "instance stored in .data()" );
+	};
+	$.ui.testWidget( {}, elem[ 0 ] );
+
+	elem = $( "<div>" );
+	$.ui.testWidget.prototype._create = function() {
+		deepEqual( this.element[ 0 ], elem[ 0 ], "from jQuery object" );
+		deepEqual( elem.testWidget( "instance" ), this, "instance stored in .data()" );
+	};
+	$.ui.testWidget( {}, elem );
+
+	elem = $( "<div id='element-normalization-selector'></div>" )
+		.appendTo( "#qunit-fixture" );
+	$.ui.testWidget.prototype._create = function() {
+		deepEqual( this.element[ 0 ], elem[ 0 ], "from selector" );
+		deepEqual( elem.testWidget( "instance" ), this, "instance stored in .data()" );
+	};
+	$.ui.testWidget( {}, "#element-normalization-selector" );
+
+	$.ui.testWidget.prototype.defaultElement = null;
+	$.ui.testWidget.prototype._create = function() {
+		// using strictEqual throws an error (Maximum call stack size exceeded)
+		ok( this.element[ 0 ] === this, "instance as element" );
+	};
+	$.ui.testWidget();
+});
+
+test( "custom selector expression", function() {
+	expect( 1 );
+	var elem = $( "<div>" ).appendTo( "#qunit-fixture" );
+	$.widget( "ui.testWidget", {} );
+	elem.testWidget();
+	deepEqual( $( ":ui-testwidget" )[0], elem[0] );
+	elem.testWidget( "destroy" );
+});
+
+test( "jQuery usage", function() {
+	expect( 14 );
+
+	var elem, instance, ret,
+		shouldCreate = false;
+
+	$.widget( "ui.testWidget", {
+		getterSetterVal: 5,
+		_create: function() {
+			ok( shouldCreate, "create called on instantiation" );
+		},
+		methodWithParams: function( param1, param2 ) {
+			ok( true, "method called via .pluginName(methodName)" );
+			equal( param1, "value1",
+				"parameter passed via .pluginName(methodName, param)" );
+			equal( param2, "value2",
+				"multiple parameters passed via .pluginName(methodName, param, param)" );
+
+			return this;
+		},
+		getterSetterMethod: function( val ) {
+			if ( val ) {
+				this.getterSetterVal = val;
+			} else {
+				return this.getterSetterVal;
+			}
+		},
+		jQueryObject: function() {
+			return $( "body" );
+		}
+	});
+
+	shouldCreate = true;
+	elem = $( "<div>" )
+		.bind( "testwidgetcreate", function() {
+			ok( shouldCreate, "create event triggered on instantiation" );
+		})
+		.testWidget();
+	shouldCreate = false;
+
+	instance = elem.testWidget( "instance" );
+	equal( typeof instance, "object", "instance stored in .data(pluginName)" );
+	equal( instance.element[0], elem[0], "element stored on widget" );
+	ret = elem.testWidget( "methodWithParams", "value1", "value2" );
+	equal( ret, elem, "jQuery object returned from method call" );
+
+	ret = elem.testWidget( "getterSetterMethod" );
+	equal( ret, 5, "getter/setter can act as getter" );
+	ret = elem.testWidget( "getterSetterMethod", 30 );
+	equal( ret, elem, "getter/setter method can be chainable" );
+	equal( instance.getterSetterVal, 30, "getter/setter can act as setter" );
+	ret = elem.testWidget( "jQueryObject" );
+	equal( ret[ 0 ], document.body, "returned jQuery object" );
+	equal( ret.end(), elem, "stack preserved" );
+
+	elem.testWidget( "destroy" );
+	equal( elem.testWidget( "instance" ), null );
+});
+
+test( "direct usage", function() {
+	expect( 9 );
+
+	var elem, instance, ret,
+		shouldCreate = false;
+
+	$.widget( "ui.testWidget", {
+		getterSetterVal: 5,
+		_create: function() {
+			ok( shouldCreate, "create called on instantiation" );
+		},
+		methodWithParams: function( param1, param2 ) {
+			ok( true, "method called dirctly" );
+			equal( param1, "value1", "parameter passed via direct call" );
+			equal( param2, "value2", "multiple parameters passed via direct call" );
+
+			return this;
+		},
+		getterSetterMethod: function( val ) {
+			if ( val ) {
+				this.getterSetterVal = val;
+			} else {
+				return this.getterSetterVal;
+			}
+		}
+	});
+
+	elem = $( "<div>" )[ 0 ];
+
+	shouldCreate = true;
+	instance = new $.ui.testWidget( {}, elem );
+	shouldCreate = false;
+
+	equal( $( elem ).testWidget( "instance" ), instance,
+		"instance stored in .data(pluginName)" );
+	equal( instance.element[ 0 ], elem, "element stored on widget" );
+
+	ret = instance.methodWithParams( "value1", "value2" );
+	equal( ret, instance, "plugin returned from method call" );
+
+	ret = instance.getterSetterMethod();
+	equal( ret, 5, "getter/setter can act as getter" );
+	instance.getterSetterMethod( 30 );
+	equal( instance.getterSetterVal, 30, "getter/setter can act as setter" );
+});
+
+test( "error handling", function() {
+	expect( 3 );
+	var error = $.error;
+	$.widget( "ui.testWidget", {
+		_privateMethod: function () {}
+	});
+	$.error = function( msg ) {
+		equal( msg, "cannot call methods on testWidget prior to initialization; " +
+			"attempted to call method 'missing'", "method call before init" );
+	};
+	$( "<div>" ).testWidget( "missing" );
+	$.error = function( msg ) {
+		equal( msg, "no such method 'missing' for testWidget widget instance",
+			"invalid method call on widget instance" );
+	};
+	$( "<div>" ).testWidget().testWidget( "missing" );
+	$.error = function ( msg ) {
+		equal( msg, "no such method '_privateMethod' for testWidget widget instance",
+			"invalid method call on widget instance" );
+	};
+	$( "<div>" ).testWidget().testWidget( "_privateMethod" );
+	$.error = error;
+});
+
+test( "merge multiple option arguments", function() {
+	expect( 1 );
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			deepEqual( this.options, {
+				classes: {},
+				create: null,
+				disabled: false,
+				option1: "value1",
+				option2: "value2",
+				option3: "value3",
+				option4: {
+					option4a: "valuea",
+					option4b: "valueb"
+				}
+			});
+		}
+	});
+	$( "<div>" ).testWidget({
+		option1: "valuex",
+		option2: "valuex",
+		option3: "value3",
+		option4: {
+			option4a: "valuex"
+		}
+	}, {
+		option1: "value1",
+		option2: "value2",
+		option4: {
+			option4b: "valueb"
+		}
+	}, {
+		option4: {
+			option4a: "valuea"
+		}
+	});
+});
+
+test( "._getCreateOptions()", function() {
+	expect( 3 );
+	$.widget( "ui.testWidget", {
+		options: {
+			option1: "valuex",
+			option2: "valuex",
+			option3: "value3"
+		},
+		_getCreateOptions: function() {
+
+			// Support: IE8
+			// Strict equality fails when comparing this.window in ie8
+			equal( this.window[ 0 ], window, "this.window is properly defined" );
+			strictEqual( this.document[ 0 ], document, "this.document is properly defined" );
+
+			return {
+				option1: "override1",
+				option2: "overideX"
+			};
+		},
+		_create: function() {
+			deepEqual( this.options, {
+				classes: {},
+				create: null,
+				disabled: false,
+				option1: "override1",
+				option2: "value2",
+				option3: "value3"
+			});
+		}
+	});
+	$( "<div>" ).testWidget({ option2: "value2" });
+});
+
+test( "._getCreateEventData()", function() {
+	expect( 1 );
+	var data = { foo: "bar" };
+	$.widget( "ui.testWidget", {
+		_getCreateEventData: function() {
+			return data;
+		}
+	});
+	$( "<div>" ).testWidget({
+		create: function( event, ui ) {
+			strictEqual( ui, data, "event data" );
+		}
+	});
+});
+
+test( "re-init", function() {
+	expect( 3 );
+	var div = $( "<div>" ),
+		actions = [];
+
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			actions.push( "create" );
+		},
+		_init: function() {
+			actions.push( "init" );
+		},
+		_setOption: function( key ) {
+			actions.push( "option" + key );
+		}
+	});
+
+	actions = [];
+	div.testWidget({ foo: "bar" });
+	deepEqual( actions, [ "create", "init" ], "correct methods called on init" );
+
+	actions = [];
+	div.testWidget();
+	deepEqual( actions, [ "init" ], "correct methods call on re-init" );
+
+	actions = [];
+	div.testWidget({ foo: "bar" });
+	deepEqual( actions, [ "optionfoo", "init" ], "correct methods called on re-init with options" );
+});
+
+test( "redeclare", function() {
+	expect( 2 );
+
+	$.widget( "ui.testWidget", {} );
+	equal( $.ui.testWidget.prototype.widgetEventPrefix, "testWidget" );
+
+	$.widget( "ui.testWidget", {} );
+	equal( $.ui.testWidget.prototype.widgetEventPrefix, "testWidget" );
+});
+
+test( "inheritance", function() {
+	expect( 6 );
+	// #5830 - Widget: Using inheritance overwrites the base classes options
+	$.widget( "ui.testWidgetBase", {
+		options: {
+			obj: {
+				key1: "foo",
+				key2: "bar"
+			},
+			arr: [ "testing" ]
+		}
+	});
+
+	$.widget( "ui.testWidgetExtension", $.ui.testWidgetBase, {
+		options: {
+			obj: {
+				key1: "baz"
+			},
+			arr: [ "alpha", "beta" ]
+		}
+	});
+
+	equal( $.ui.testWidgetBase.prototype.widgetEventPrefix, "testWidgetBase",
+		"base class event prefix" );
+	deepEqual( $.ui.testWidgetBase.prototype.options.obj, {
+		key1: "foo",
+		key2: "bar"
+	}, "base class option object not overridden");
+	deepEqual( $.ui.testWidgetBase.prototype.options.arr, [ "testing" ],
+		"base class option array not overridden");
+
+	equal( $.ui.testWidgetExtension.prototype.widgetEventPrefix, "testWidgetExtension",
+		"extension class event prefix" );
+	deepEqual( $.ui.testWidgetExtension.prototype.options.obj, {
+		key1: "baz",
+		key2: "bar"
+	}, "extension class option object extends base");
+	deepEqual( $.ui.testWidgetExtension.prototype.options.arr, [ "alpha", "beta" ],
+		"extension class option array overwrites base");
+
+	delete $.ui.testWidgetBase;
+	delete $.ui.testWidgetExtension;
+});
+
+test( "._super()", function() {
+	expect( 9 );
+	var instance;
+	$.widget( "ui.testWidget", {
+		method: function( a, b ) {
+			deepEqual( this, instance, "this is correct in testWidget" );
+			deepEqual( a, 5, "parameter passed to testWidget" );
+			deepEqual( b, 20, "second parameter passed to testWidget" );
+			return a + b;
+		}
+	});
+
+	$.widget( "ui.testWidget2", $.ui.testWidget, {
+		method: function( a, b ) {
+			deepEqual( this, instance, "this is correct in testWidget2" );
+			deepEqual( a, 5, "parameter passed to testWidget2" );
+			deepEqual( b, 10, "parameter passed to testWidget2" );
+			return this._super( a, b*2 );
+		}
+	});
+
+	$.widget( "ui.testWidget3", $.ui.testWidget2, {
+		method: function( a ) {
+			deepEqual( this, instance, "this is correct in testWidget3" );
+			deepEqual( a, 5, "parameter passed to testWidget3" );
+			var ret = this._super( a, a*2 );
+			deepEqual( ret, 25, "super returned value" );
+		}
+	});
+
+	instance = $( "<div>" ).testWidget3().testWidget3( "instance" );
+	instance.method( 5 );
+	delete $.ui.testWidget3;
+	delete $.ui.testWidget2;
+});
+
+test( "._superApply()", function() {
+	expect( 10 );
+	var instance;
+	$.widget( "ui.testWidget", {
+		method: function( a, b ) {
+			deepEqual( this, instance, "this is correct in testWidget" );
+			deepEqual( a, 5, "parameter passed to testWidget" );
+			deepEqual( b, 10, "second parameter passed to testWidget" );
+			return a + b;
+		}
+	});
+
+	$.widget( "ui.testWidget2", $.ui.testWidget, {
+		method: function( a, b ) {
+			deepEqual( this, instance, "this is correct in testWidget2" );
+			deepEqual( a, 5, "parameter passed to testWidget2" );
+			deepEqual( b, 10, "second parameter passed to testWidget2" );
+			return this._superApply( arguments );
+		}
+	});
+
+	$.widget( "ui.testWidget3", $.ui.testWidget2, {
+		method: function( a, b ) {
+			deepEqual( this, instance, "this is correct in testWidget3" );
+			deepEqual( a, 5, "parameter passed to testWidget3" );
+			deepEqual( b, 10, "second parameter passed to testWidget3" );
+			var ret = this._superApply( arguments );
+			deepEqual( ret, 15, "super returned value" );
+		}
+	});
+
+	instance = $( "<div>" ).testWidget3().testWidget3( "instance" );
+	instance.method( 5, 10 );
+	delete $.ui.testWidget3;
+	delete $.ui.testWidget2;
+});
+
+test( ".option() - getter", function() {
+	expect( 6 );
+	$.widget( "ui.testWidget", {
+		_create: function() {}
+	});
+
+	var options,
+		div = $( "<div>" ).testWidget({
+			foo: "bar",
+			baz: 5,
+			qux: [ "quux", "quuux" ]
+		});
+
+	deepEqual( div.testWidget( "option", "x" ), null, "non-existent option" );
+	deepEqual( div.testWidget( "option", "foo"), "bar", "single option - string" );
+	deepEqual( div.testWidget( "option", "baz"), 5, "single option - number" );
+	deepEqual( div.testWidget( "option", "qux"), [ "quux", "quuux" ],
+		"single option - array" );
+
+	options = div.testWidget( "option" );
+	deepEqual( options, {
+		baz: 5,
+		classes: {},
+		create: null,
+		disabled: false,
+		foo: "bar",
+		qux: [ "quux", "quuux" ]
+	}, "full options hash returned" );
+	options.foo = "notbar";
+	deepEqual( div.testWidget( "option", "foo"), "bar",
+		"modifying returned options hash does not modify plugin instance" );
+});
+
+test( ".option() - deep option getter", function() {
+	expect( 5 );
+	$.widget( "ui.testWidget", {} );
+	var div = $( "<div>" ).testWidget({
+		foo: {
+			bar: "baz",
+			qux: {
+				quux: "xyzzy"
+			}
+		}
+	});
+	equal( div.testWidget( "option", "foo.bar" ), "baz", "one level deep - string" );
+	deepEqual( div.testWidget( "option", "foo.qux" ), { quux: "xyzzy" },
+		"one level deep - object" );
+	equal( div.testWidget( "option", "foo.qux.quux" ), "xyzzy", "two levels deep - string" );
+	equal( div.testWidget( "option", "x.y" ), null, "top level non-existent" );
+	equal( div.testWidget( "option", "foo.x.y" ), null, "one level deep - non-existent" );
+});
+
+test( ".option() - delegate to ._setOptions()", function() {
+	expect( 2 );
+	var div,
+		calls = [];
+	$.widget( "ui.testWidget", {
+		_create: function() {},
+		_setOptions: function( options ) {
+			calls.push( options );
+		}
+	});
+	div = $( "<div>" ).testWidget();
+
+	calls = [];
+	div.testWidget( "option", "foo", "bar" );
+	deepEqual( calls, [{ foo: "bar" }], "_setOptions called for single option" );
+
+	calls = [];
+	div.testWidget( "option", {
+		bar: "qux",
+		quux: "quuux"
+	});
+	deepEqual( calls, [{ bar: "qux", quux: "quuux" }],
+		"_setOptions called with multiple options" );
+});
+
+test( ".option() - delegate to ._setOption()", function() {
+	expect( 3 );
+	var div,
+		calls = [];
+	$.widget( "ui.testWidget", {
+		_create: function() {},
+		_setOption: function( key, val ) {
+			calls.push({
+				key: key,
+				val: val
+			});
+		}
+	});
+	div = $( "<div>" ).testWidget();
+
+	calls = [];
+	div.testWidget( "option", "foo", "bar" );
+	deepEqual( calls, [{ key: "foo", val: "bar" }],
+		"_setOption called for single option" );
+
+	calls = [];
+	div.testWidget( "option", "foo", undefined );
+	deepEqual( calls, [{ key: "foo", val: undefined }],
+		"_setOption called for single option where value is undefined" );
+
+	calls = [];
+	div.testWidget( "option", {
+		bar: "qux",
+		quux: "quuux"
+	});
+	deepEqual( calls, [
+		{ key: "bar", val: "qux" },
+		{ key: "quux", val: "quuux" }
+	], "_setOption called with multiple options" );
+});
+
+test( ".option() - deep option setter", function() {
+	expect( 9 );
+	$.widget( "ui.testWidget", {} );
+	var result, div = $( "<div>" ).testWidget();
+	function deepOption( from, to, msg ) {
+		div.testWidget( "instance" ).options.foo = from;
+		$.ui.testWidget.prototype._setOption = function( key, value ) {
+			deepEqual( key, "foo", msg + ": key" );
+			deepEqual( value, to, msg + ": value" );
+		};
+	}
+
+	deepOption( { bar: "baz" }, { bar: "qux" }, "one deep" );
+	div.testWidget( "option", "foo.bar", "qux" );
+
+	deepOption( { bar: "baz" }, { bar: undefined }, "one deep - value = undefined" );
+
+	result = div.testWidget( "option", "foo.bar", undefined );
+
+	deepEqual ( result, div, "option should return widget on successful set operation" );
+
+	deepOption( null, { bar: "baz" }, "null" );
+	div.testWidget( "option", "foo.bar", "baz" );
+
+	deepOption(
+		{ bar: "baz", qux: { quux: "quuux" } },
+		{ bar: "baz", qux: { quux: "quuux", newOpt: "newVal" } },
+		"add property" );
+	div.testWidget( "option", "foo.qux.newOpt", "newVal" );
+});
+
+test( ".enable()", function() {
+	expect( 2 );
+	$.widget( "ui.testWidget", {
+		_create: function() {},
+		_setOption: function( key, val ) {
+			deepEqual( key, "disabled", "_setOption called with disabled option" );
+			deepEqual( val, false, "disabled set to false" );
+		}
+	});
+	$( "<div>" ).testWidget().testWidget( "enable" );
+});
+
+test( ".disable()", function() {
+	expect( 2 );
+	$.widget( "ui.testWidget", {
+		_create: function() {},
+		_setOption: function( key, val ) {
+			deepEqual( key, "disabled", "_setOption called with disabled option" );
+			deepEqual( val, true, "disabled set to true" );
+		}
+	});
+	$( "<div>" ).testWidget().testWidget( "disable" );
+});
+
+test( ".widget() - base", function() {
+	expect( 2 );
+	var constructor = $.widget( "ui.testWidget", {
+			_create: function() {}
+		}),
+		div = $( "<div>" ).testWidget();
+	deepEqual( div[0], div.testWidget( "widget" )[0]);
+	deepEqual( constructor, $.ui.testWidget, "$.widget returns the constructor" );
+});
+
+test( ".widget() - overriden", function() {
+	expect( 1 );
+	var wrapper = $( "<div>" );
+	$.widget( "ui.testWidget", {
+		_create: function() {},
+		widget: function() {
+			return wrapper;
+		}
+	});
+	deepEqual( wrapper[0], $( "<div>" ).testWidget().testWidget( "widget" )[0] );
+});
+
+test( ".instance()", function() {
+	expect( 2 );
+	var div;
+
+	$.widget( "ui.testWidget", {
+		_create: function() {}
+	});
+
+	div = $( "<div>" );
+	equal( div.testWidget( "instance" ), undefined );
+	div.testWidget();
+	equal( div.testWidget( "instance" ), div.testWidget( "instance" ) );
+});
+
+test( "._on() to element (default)", function() {
+	expect( 12 );
+	var that, widget;
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			that = this;
+			this._on({
+				keyup: this.keyup,
+				keydown: "keydown"
+			});
+		},
+		keyup: function( event ) {
+			equal( that, this );
+			equal( that.element[0], event.currentTarget );
+			equal( "keyup", event.type );
+		},
+		keydown: function( event ) {
+			equal( that, this );
+			equal( that.element[0], event.currentTarget );
+			equal( "keydown", event.type );
+		}
+	});
+	widget = $( "<div></div>" )
+		.testWidget()
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	widget
+		.testWidget( "disable" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	widget
+		.testWidget( "enable" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	widget
+		.testWidget( "destroy" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+});
+
+test( "._on() to element with suppressDisabledCheck", function() {
+	expect( 18 );
+	var that, widget;
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			that = this;
+			this._on( true, {
+				keyup: this.keyup,
+				keydown: "keydown"
+			});
+		},
+		keyup: function( event ) {
+			equal( that, this );
+			equal( that.element[0], event.currentTarget );
+			equal( "keyup", event.type );
+		},
+		keydown: function( event ) {
+			equal( that, this );
+			equal( that.element[0], event.currentTarget );
+			equal( "keydown", event.type );
+		}
+	});
+	widget = $( "<div></div>" )
+		.testWidget()
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	widget
+		.testWidget( "disable" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	widget
+		.testWidget( "enable" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	widget
+		.testWidget( "destroy" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+});
+
+test( "._on() to descendent", function() {
+	expect( 12 );
+	var that, widget, descendant;
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			that = this;
+			this._on( this.element.find( "strong" ), {
+				keyup: this.keyup,
+				keydown: "keydown"
+			});
+		},
+		keyup: function( event ) {
+			equal( that, this );
+			equal( that.element.find( "strong" )[0], event.currentTarget );
+			equal( "keyup", event.type );
+		},
+		keydown: function(event) {
+			equal( that, this );
+			equal( that.element.find( "strong" )[0], event.currentTarget );
+			equal( "keydown", event.type );
+		}
+	});
+	// trigger events on both widget and descendent to ensure that only descendent receives them
+	widget = $( "<div><p><strong>hello</strong> world</p></div>" )
+		.testWidget()
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	descendant = widget.find( "strong" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	widget
+		.testWidget( "disable" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	descendant
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	widget
+		.testWidget( "enable" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	descendant
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	descendant
+		.addClass( "ui-state-disabled" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	widget
+		.testWidget( "destroy" )
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+	descendant
+		.trigger( "keyup" )
+		.trigger( "keydown" );
+});
+
+test( "_on() with delegate", function() {
+	expect( 8 );
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			var uuid = this.uuid;
+			this.element = {
+				bind: function( event, handler ) {
+					equal( event, "click.testWidget" + uuid );
+					ok( $.isFunction(handler) );
+				},
+				trigger: $.noop
+			};
+			this.widget = function() {
+				return {
+					delegate: function( selector, event, handler ) {
+						equal( selector, "a" );
+						equal( event, "click.testWidget" + uuid );
+						ok( $.isFunction(handler) );
+					}
+				};
+			};
+			this._on({
+				"click": "handler",
+				"click a": "handler"
+			});
+			this.widget = function() {
+				return {
+					delegate: function( selector, event, handler ) {
+						equal( selector, "form fieldset > input" );
+						equal( event, "change.testWidget" + uuid );
+						ok( $.isFunction(handler) );
+					}
+				};
+			};
+			this._on({
+				"change form fieldset > input": "handler"
+			});
+		}
+	});
+	$.ui.testWidget();
+});
+
+test( "_on() with delegate to descendent", function() {
+	expect( 4 );
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			this.target = $( "<p><strong>hello</strong> world</p>" );
+			this.child = this.target.children();
+			this._on( this.target, {
+				"keyup": "handlerDirect",
+				"keyup strong": "handlerDelegated"
+			});
+			this.child.trigger( "keyup" );
+		},
+		handlerDirect: function( event ) {
+			deepEqual( event.currentTarget, this.target[ 0 ] );
+			deepEqual( event.target, this.child[ 0 ] );
+		},
+		handlerDelegated: function( event ) {
+			deepEqual( event.currentTarget, this.child[ 0 ] );
+			deepEqual( event.target, this.child[ 0 ] );
+		}
+	});
+	$.ui.testWidget();
+});
+
+test( "_on() to common element", function() {
+	expect( 4 );
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			this._on( this.document, {
+				"customevent": "_handler",
+				"with:colons": "_colonHandler",
+				"with-dashes": "_dashHandler",
+				"with-dashes:and-colons": "_commbinedHandler"
+			});
+		},
+		_handler: function() {
+			ok( true, "handler triggered" );
+		},
+		_colonHandler: function() {
+			ok( true, "colon handler triggered" );
+		},
+		_dashHandler: function() {
+			ok( true, "dash handler triggered" );
+		},
+		_commbinedHandler: function() {
+			ok( true, "combined handler triggered" );
+		}
+	});
+	var widget = $( "#widget" ).testWidget().testWidget( "instance" );
+	$( "#widget-wrapper" ).testWidget();
+	widget.destroy();
+	$( document ).trigger( "customevent" );
+	$( document ).trigger( "with:colons" );
+	$( document ).trigger( "with-dashes" );
+	$( document ).trigger( "with-dashes:and-colons" );
+});
+
+test( "_off() - single event", function() {
+	expect( 3 );
+
+	$.widget( "ui.testWidget", {} );
+	var shouldTriggerWidget, shouldTriggerOther,
+		element = $( "#widget" ),
+		widget = element.testWidget().testWidget( "instance" );
+	widget._on( element, { foo: function() {
+		ok( shouldTriggerWidget, "foo called from _on" );
+	}});
+	element.bind( "foo", function() {
+		ok( shouldTriggerOther, "foo called from bind" );
+	});
+	shouldTriggerWidget = true;
+	shouldTriggerOther = true;
+	element.trigger( "foo" );
+	shouldTriggerWidget = false;
+	widget._off( element, "foo" );
+	element.trigger( "foo" );
+});
+
+test( "_off() - multiple events", function() {
+	expect( 6 );
+
+	$.widget( "ui.testWidget", {} );
+	var shouldTriggerWidget, shouldTriggerOther,
+		element = $( "#widget" ),
+		widget = element.testWidget().testWidget( "instance" );
+	widget._on( element, {
+		foo: function() {
+			ok( shouldTriggerWidget, "foo called from _on" );
+		},
+		bar: function() {
+			ok( shouldTriggerWidget, "bar called from _on" );
+		}
+	});
+	element.bind( "foo bar", function( event ) {
+		ok( shouldTriggerOther, event.type + " called from bind" );
+	});
+	shouldTriggerWidget = true;
+	shouldTriggerOther = true;
+	element.trigger( "foo" );
+	element.trigger( "bar" );
+	shouldTriggerWidget = false;
+	widget._off( element, "foo bar" );
+	element.trigger( "foo" );
+	element.trigger( "bar" );
+});
+
+test( "_off() - all events", function() {
+	expect( 6 );
+
+	$.widget( "ui.testWidget", {} );
+	var shouldTriggerWidget, shouldTriggerOther,
+		element = $( "#widget" ),
+		widget = element.testWidget().testWidget( "instance" );
+	widget._on( element, {
+		foo: function() {
+			ok( shouldTriggerWidget, "foo called from _on" );
+		},
+		bar: function() {
+			ok( shouldTriggerWidget, "bar called from _on" );
+		}
+	});
+	element.bind( "foo bar", function( event ) {
+		ok( shouldTriggerOther, event.type + " called from bind" );
+	});
+	shouldTriggerWidget = true;
+	shouldTriggerOther = true;
+	element.trigger( "foo" );
+	element.trigger( "bar" );
+	shouldTriggerWidget = false;
+	widget._off( element );
+	element.trigger( "foo" );
+	element.trigger( "bar" );
+});
+
+test( "._hoverable()", function( assert ) {
+	expect( 10 );
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			this._hoverable( this.element.children() );
+		}
+	});
+
+	var div = $( "#widget" ).testWidget().children();
+	assert.lacksClasses( div, "ui-state-hover", "not hovered on init" );
+	div.trigger( "mouseenter" );
+	assert.hasClasses( div, "ui-state-hover", "hovered after mouseenter" );
+	div.trigger( "mouseleave" );
+	assert.lacksClasses( div, "ui-state-hover", "not hovered after mouseleave" );
+
+	div.trigger( "mouseenter" );
+	assert.hasClasses( div, "ui-state-hover", "hovered after mouseenter" );
+	$( "#widget" ).testWidget( "disable" );
+	assert.lacksClasses( div, "ui-state-hover", "not hovered while disabled" );
+	div.trigger( "mouseenter" );
+	assert.lacksClasses( div, "ui-state-hover", "can't hover while disabled" );
+	$( "#widget" ).testWidget( "enable" );
+	assert.lacksClasses( div, "ui-state-hover", "enabling doesn't reset hover" );
+
+	div.trigger( "mouseenter" );
+	assert.hasClasses( div, "ui-state-hover", "hovered after mouseenter" );
+	$( "#widget" ).testWidget( "destroy" );
+	assert.lacksClasses( div, "ui-state-hover", "not hovered after destroy" );
+	div.trigger( "mouseenter" );
+	assert.lacksClasses( div, "ui-state-hover", "event handler removed on destroy" );
+});
+
+test( "._focusable()", function( assert ) {
+	expect( 10 );
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			this._focusable( this.element.children() );
+		}
+	});
+
+	var div = $( "#widget" ).testWidget().children();
+	assert.lacksClasses( div, "ui-state-focus", "not focused on init" );
+	div.trigger( "focusin" );
+	assert.hasClasses( div, "ui-state-focus", "focused after explicit focus" );
+	div.trigger( "focusout" );
+	assert.lacksClasses( div, "ui-state-focus", "not focused after blur" );
+
+	div.trigger( "focusin" );
+	assert.hasClasses( div, "ui-state-focus", "focused after explicit focus" );
+	$( "#widget" ).testWidget( "disable" );
+	assert.lacksClasses( div, "ui-state-focus", "not focused while disabled" );
+	div.trigger( "focusin" );
+	assert.lacksClasses( div, "ui-state-focus", "can't focus while disabled" );
+	$( "#widget" ).testWidget( "enable" );
+	assert.lacksClasses( div, "ui-state-focus", "enabling doesn't reset focus" );
+
+	div.trigger( "focusin" );
+	assert.hasClasses( div, "ui-state-focus", "focused after explicit focus" );
+	$( "#widget" ).testWidget( "destroy" );
+	assert.lacksClasses( div, "ui-state-focus", "not focused after destroy" );
+	div.trigger( "focusin" );
+	assert.lacksClasses( div, "ui-state-focus", "event handler removed on destroy" );
+});
+
+test( "._trigger() - no event, no ui", function() {
+	expect( 7 );
+	var handlers = [];
+
+	$.widget( "ui.testWidget", {
+		_create: function() {}
+	});
+
+	$( "#widget" ).testWidget({
+		foo: function( event, ui ) {
+			deepEqual( event.type, "testwidgetfoo", "correct event type in callback" );
+			deepEqual( ui, {}, "empty ui hash passed" );
+			handlers.push( "callback" );
+		}
+	});
+	$( document ).add( "#widget-wrapper" ).add( "#widget" )
+		.bind( "testwidgetfoo", function( event, ui ) {
+			deepEqual( ui, {}, "empty ui hash passed" );
+			handlers.push( this );
+		});
+	deepEqual( $( "#widget" ).testWidget( "instance" )._trigger( "foo" ), true,
+		"_trigger returns true when event is not cancelled" );
+	deepEqual( handlers, [
+		$( "#widget" )[ 0 ],
+		$( "#widget-wrapper" )[ 0 ],
+		document,
+		"callback"
+	], "event bubbles and then invokes callback" );
+
+	$( document ).unbind( "testwidgetfoo" );
+});
+
+test( "._trigger() - cancelled event", function() {
+	expect( 3 );
+
+	$.widget( "ui.testWidget", {
+		_create: function() {}
+	});
+
+	$( "#widget" ).testWidget({
+		foo: function() {
+			ok( true, "callback invoked even if event is cancelled" );
+		}
+	})
+	.bind( "testwidgetfoo", function() {
+		ok( true, "event was triggered" );
+		return false;
+	});
+	deepEqual( $( "#widget" ).testWidget( "instance" )._trigger( "foo" ), false,
+		"_trigger returns false when event is cancelled" );
+});
+
+test( "._trigger() - cancelled callback", function() {
+	expect( 1 );
+	$.widget( "ui.testWidget", {
+		_create: function() {}
+	});
+
+	$( "#widget" ).testWidget({
+		foo: function() {
+			return false;
+		}
+	});
+	deepEqual( $( "#widget" ).testWidget( "instance" )._trigger( "foo" ), false,
+		"_trigger returns false when callback returns false" );
+});
+
+test( "._trigger() - provide event and ui", function() {
+	expect( 7 );
+
+	var originalEvent = $.Event( "originalTest" );
+	$.widget( "ui.testWidget", {
+		_create: function() {},
+		testEvent: function() {
+			var ui = {
+					foo: "bar",
+					baz: {
+						qux: 5,
+						quux: 20
+					}
+				};
+			this._trigger( "foo", originalEvent, ui );
+			deepEqual( ui, {
+				foo: "notbar",
+				baz: {
+					qux: 10,
+					quux: "jQuery"
+				}
+			}, "ui object modified" );
+		}
+	});
+	$( "#widget" ).bind( "testwidgetfoo", function( event, ui ) {
+		equal( event.originalEvent, originalEvent, "original event object passed" );
+		deepEqual( ui, {
+			foo: "bar",
+			baz: {
+				qux: 5,
+				quux: 20
+			}
+		}, "ui hash passed" );
+		ui.foo = "notbar";
+	});
+	$( "#widget-wrapper" ).bind( "testwidgetfoo", function( event, ui ) {
+		equal( event.originalEvent, originalEvent, "original event object passed" );
+		deepEqual( ui, {
+			foo: "notbar",
+			baz: {
+				qux: 5,
+				quux: 20
+			}
+		}, "modified ui hash passed" );
+		ui.baz.qux = 10;
+	});
+	$( "#widget" ).testWidget({
+		foo: function( event, ui ) {
+			equal( event.originalEvent, originalEvent, "original event object passed" );
+			deepEqual( ui, {
+				foo: "notbar",
+				baz: {
+					qux: 10,
+					quux: 20
+				}
+			}, "modified ui hash passed" );
+			ui.baz.quux = "jQuery";
+		}
+	})
+	.testWidget( "testEvent" );
+});
+
+test( "._trigger() - array as ui", function() {
+	// #6795 - Widget: handle array arguments to _trigger consistently
+	expect( 4 );
+
+	$.widget( "ui.testWidget", {
+		_create: function() {},
+		testEvent: function() {
+			var ui = {
+					foo: "bar",
+					baz: {
+						qux: 5,
+						quux: 20
+					}
+				},
+				extra = {
+					bar: 5
+				};
+			this._trigger( "foo", null, [ ui, extra ] );
+		}
+	});
+	$( "#widget" ).bind( "testwidgetfoo", function( event, ui, extra ) {
+		deepEqual( ui, {
+			foo: "bar",
+			baz: {
+				qux: 5,
+				quux: 20
+			}
+		}, "event: ui hash passed" );
+		deepEqual( extra, {
+			bar: 5
+		}, "event: extra argument passed" );
+	});
+	$( "#widget" ).testWidget({
+		foo: function( event, ui, extra ) {
+			deepEqual( ui, {
+				foo: "bar",
+				baz: {
+					qux: 5,
+					quux: 20
+				}
+			}, "callback: ui hash passed" );
+			deepEqual( extra, {
+				bar: 5
+			}, "callback: extra argument passed" );
+		}
+	})
+	.testWidget( "testEvent" );
+});
+
+test( "._trigger() - instance as element", function() {
+	expect( 4 );
+	$.widget( "ui.testWidget", {
+		defaultElement: null,
+		testEvent: function() {
+			this._trigger( "foo", null, { foo: "bar" } );
+		}
+	});
+	var instance = $.ui.testWidget({
+		foo: function( event, ui ) {
+			equal( event.type, "testwidgetfoo", "event object passed to callback" );
+			deepEqual( ui, { foo: "bar" }, "ui object passed to callback" );
+		}
+	});
+	$( instance ).bind( "testwidgetfoo", function( event, ui ) {
+		equal( event.type, "testwidgetfoo", "event object passed to event handler" );
+		deepEqual( ui, { foo: "bar" }, "ui object passed to event handler" );
+	});
+	instance.testEvent();
+});
+
+(function() {
+	function shouldDestroy( expected, callback ) {
+		expect( 1 );
+		var destroyed = false;
+		$.widget( "ui.testWidget", {
+			_create: function() {},
+			destroy: function() {
+				destroyed = true;
+			}
+		});
+		callback();
+		equal( destroyed, expected );
+	}
+
+	test( "auto-destroy - .remove()", function() {
+		shouldDestroy( true, function() {
+			$( "#widget" ).testWidget().remove();
+		});
+	});
+
+	test( "auto-destroy - .remove() when disabled", function() {
+		shouldDestroy( true, function() {
+			$( "#widget" ).testWidget({ disabled: true }).remove();
+		});
+	});
+
+	test( "auto-destroy - .remove() on parent", function() {
+		shouldDestroy( true, function() {
+			$( "#widget" ).testWidget().parent().remove();
+		});
+	});
+
+	test( "auto-destroy - .remove() on child", function() {
+		shouldDestroy( false, function() {
+			$( "#widget" ).testWidget().children().remove();
+		});
+	});
+
+	test( "auto-destroy - .empty()", function() {
+		shouldDestroy( false, function() {
+			$( "#widget" ).testWidget().empty();
+		});
+	});
+
+	test( "auto-destroy - .empty() on parent", function() {
+		shouldDestroy( true, function() {
+			$( "#widget" ).testWidget().parent().empty();
+		});
+	});
+
+	test( "auto-destroy - .detach()", function() {
+		shouldDestroy( false, function() {
+			$( "#widget" ).testWidget().detach();
+		});
+	});
+
+	test( "destroy - remove event bubbling", function() {
+		shouldDestroy( false, function() {
+			$( "<div>child</div>" ).appendTo( $( "#widget" ).testWidget() )
+				.trigger( "remove" );
+		});
+	});
+}());
+
+test( "redefine", function() {
+	expect( 4 );
+	$.widget( "ui.testWidget", {
+		method: function( str ) {
+			strictEqual( this, instance, "original invoked with correct this" );
+			equal( str, "bar", "original invoked with correct parameter" );
+		}
+	});
+	$.ui.testWidget.foo = "bar";
+	$.widget( "ui.testWidget", $.ui.testWidget, {
+		method: function( str ) {
+			equal( str, "foo", "new invoked with correct parameter" );
+			this._super( "bar" );
+		}
+	});
+
+	var instance = new $.ui.testWidget({});
+	instance.method( "foo" );
+	equal( $.ui.testWidget.foo, "bar", "static properties remain" );
+});
+
+test( "redefine deep prototype chain", function() {
+	expect( 8 );
+	$.widget( "ui.testWidget", {
+		method: function( str ) {
+			strictEqual( this, instance, "original invoked with correct this" );
+			equal( str, "level 4", "original invoked with correct parameter" );
+		}
+	});
+	$.widget( "ui.testWidget2", $.ui.testWidget, {
+		method: function( str ) {
+			strictEqual( this, instance, "testWidget2 invoked with correct this" );
+			equal( str, "level 2", "testWidget2 invoked with correct parameter" );
+			this._super( "level 3" );
+		}
+	});
+	$.widget( "ui.testWidget3", $.ui.testWidget2, {
+		method: function( str ) {
+			strictEqual( this, instance, "testWidget3 invoked with correct this" );
+			equal( str, "level 1", "testWidget3 invoked with correct parameter" );
+			this._super( "level 2" );
+		}
+	});
+	// redefine testWidget after other widgets have inherited from it
+	// this tests whether the inheriting widgets get updated prototype chains
+	$.widget( "ui.testWidget", $.ui.testWidget, {
+		method: function( str ) {
+			strictEqual( this, instance, "new invoked with correct this" );
+			equal( str, "level 3", "new invoked with correct parameter" );
+			this._super( "level 4" );
+		}
+	});
+	// redefine testWidget3 after it has been automatically redefined
+	// this tests whether we properly handle _super() when the topmost prototype
+	// doesn't have the method defined
+	$.widget( "ui.testWidget3", $.ui.testWidget3, {} );
+
+	var instance = new $.ui.testWidget3({});
+	instance.method( "level 1" );
+
+	delete $.ui.testWidget3;
+	delete $.ui.testWidget2;
+});
+
+test( "redefine - widgetEventPrefix", function() {
+	expect( 2 );
+
+	$.widget( "ui.testWidget", {
+		widgetEventPrefix: "test"
+	});
+	equal( $.ui.testWidget.prototype.widgetEventPrefix, "test",
+		"cusotm prefix in original" );
+
+	$.widget( "ui.testWidget", $.ui.testWidget, {} );
+	equal( $.ui.testWidget.prototype.widgetEventPrefix, "test",
+		"cusotm prefix in extension" );
+
+});
+
+test( "mixins", function() {
+	expect( 2 );
+
+	var mixin = {
+		method: function() {
+			return "mixed " + this._super();
+		}
+	};
+
+	$.widget( "ui.testWidget1", {
+		method: function() {
+			return "testWidget1";
+		}
+	});
+	$.widget( "ui.testWidget2", {
+		method: function() {
+			return "testWidget2";
+		}
+	});
+	$.widget( "ui.testWidget1", $.ui.testWidget1, mixin );
+	$.widget( "ui.testWidget2", $.ui.testWidget2, mixin );
+
+	equal( $( "<div>" ).testWidget1().testWidget1( "method" ),
+		"mixed testWidget1", "testWidget1 mixin successful" );
+	equal( $( "<div>" ).testWidget2().testWidget2( "method" ),
+		"mixed testWidget2", "testWidget2 mixin successful" );
+});
+
+asyncTest( "_delay", function() {
+	expect( 6 );
+	var order = 0,
+		that;
+	$.widget( "ui.testWidget", {
+		defaultElement: null,
+		_create: function() {
+			that = this;
+			var timer = this._delay(function() {
+				strictEqual( this, that );
+				equal( order, 1 );
+				start();
+			}, 500);
+			ok( timer !== undefined );
+			timer = this._delay("callback");
+			ok( timer !== undefined );
+		},
+		callback: function() {
+			strictEqual( this, that );
+			equal( order, 0 );
+			order += 1;
+		}
+	});
+	$( "#widget" ).testWidget();
+});
+
+test( "$.widget.bridge()", function() {
+	expect( 14 );
+
+	var instance, ret,
+		elem = $( "<div>" );
+
+	function TestWidget( options, element ) {
+		deepEqual( options, { foo: "bar" }, "options passed" );
+		strictEqual( element, elem[ 0 ], "element passed" );
+	}
+
+	$.extend( TestWidget.prototype, {
+		method: function( param ) {
+			ok( true, "method called via .pluginName(methodName)" );
+			equal( param, "value1",
+				"parameter passed via .pluginName(methodName, param)" );
+		},
+		getter: function() {
+			return "qux";
+		},
+		option: function( options ) {
+			deepEqual( options, {} );
+		}
+	});
+
+	$.widget.bridge( "testWidget", TestWidget );
+
+	ok( $.isFunction( $.fn.testWidget ), "jQuery plugin was created" );
+
+	strictEqual( elem.testWidget({ foo: "bar" }), elem, "plugin returns original jQuery object" );
+	instance = elem.data( "testWidget" );
+	equal( typeof instance, "object", "instance stored in .data(pluginName)" );
+	equal( typeof elem.testWidget( "instance" ), "object", "also retrievable via instance method" );
+
+	ret = elem.testWidget( "method", "value1" );
+	equal( ret, elem, "jQuery object returned from method call" );
+
+	ret = elem.testWidget( "getter" );
+	equal( ret, "qux", "getter returns value" );
+
+	elem.testWidget();
+	ok( true, "_init is optional" );
+
+	TestWidget.prototype._init = function() {
+		ok( "_init", "_init now exists, so its called" );
+	};
+	elem.testWidget();
+});
+
+test( "$.widget.bridge() - widgetFullName", function() {
+	expect( 1 );
+
+	var instance,
+		elem = $( "<div>" );
+
+	function TestWidget() {}
+	TestWidget.prototype.widgetFullName = "custom-widget";
+	$.widget.bridge( "testWidget", TestWidget );
+
+	elem.testWidget();
+	instance = elem.data( "custom-widget" );
+	equal( typeof instance, "object", "instance stored in .data(widgetFullName)" );
+});
+
+} );
diff --git a/tests/unit/widget/extend.js b/tests/unit/widget/extend.js
new file mode 100644
index 000000000..a5a8cccaa
--- /dev/null
+++ b/tests/unit/widget/extend.js
@@ -0,0 +1,112 @@
+define( [
+	"jquery",
+	"ui/widget"
+], function( $ ) {
+
+test( "$.widget.extend()", function() {
+	expect( 27 );
+
+	var ret, empty, optionsWithLength, optionsWithDate, myKlass, customObject, optionsWithCustomObject, nullUndef,
+		target, recursive, obj, input, output,
+		settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
+		options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
+		optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
+		merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
+		deep1 = { foo: { bar: true } },
+		deep2 = { foo: { baz: true }, foo2: document },
+		deep2copy = { foo: { baz: true }, foo2: document },
+		deepmerged = { foo: { bar: true, baz: true }, foo2: document },
+		arr = [1, 2, 3],
+		nestedarray = { arr: arr },
+		defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
+		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
+		options1 = { xnumber2: 1, xstring2: "x" },
+		options1Copy = { xnumber2: 1, xstring2: "x" },
+		options2 = { xstring2: "xx", xxx: "newstringx" },
+		options2Copy = { xstring2: "xx", xxx: "newstringx" },
+		merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
+
+	$.widget.extend( settings, options );
+	deepEqual( settings, merged, "Check if extended: settings must be extended" );
+	deepEqual( options, optionsCopy, "Check if not modified: options must not be modified" );
+
+	$.widget.extend( deep1, deep2 );
+	deepEqual( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );
+	deepEqual( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
+	equal( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
+
+	strictEqual( $.widget.extend({}, nestedarray).arr, arr, "Don't clone arrays" );
+	ok( $.isPlainObject( $.widget.extend({ arr: arr }, { arr: {} }).arr ), "Cloned object heve to be an plain object" );
+
+	empty = {};
+	optionsWithLength = { foo: { length: -1 } };
+	$.widget.extend( empty, optionsWithLength );
+	deepEqual( empty.foo, optionsWithLength.foo, "The length property must copy correctly" );
+
+	empty = {};
+	optionsWithDate = { foo: { date: new Date() } };
+	$.widget.extend( empty, optionsWithDate );
+	deepEqual( empty.foo, optionsWithDate.foo, "Dates copy correctly" );
+
+	myKlass = function() {};
+	customObject = new myKlass();
+	optionsWithCustomObject = { foo: { date: customObject } };
+	empty = {};
+	$.widget.extend( empty, optionsWithCustomObject );
+	strictEqual( empty.foo.date, customObject, "Custom objects copy correctly (no methods)" );
+
+	// Makes the class a little more realistic
+	myKlass.prototype = { someMethod: function(){} };
+	empty = {};
+	$.widget.extend( empty, optionsWithCustomObject );
+	strictEqual( empty.foo.date, customObject, "Custom objects copy correctly" );
+
+	ret = $.widget.extend({ foo: 4 }, { foo: Number(5) } );
+	equal( ret.foo, 5, "Wrapped numbers copy correctly" );
+
+	nullUndef = $.widget.extend( {}, options, { xnumber2: null } );
+	strictEqual( nullUndef.xnumber2, null, "Check to make sure null values are copied");
+
+	nullUndef = $.widget.extend( {}, options, { xnumber2: undefined } );
+	strictEqual( nullUndef.xnumber2, options.xnumber2, "Check to make sure undefined values are not copied");
+
+	nullUndef = $.widget.extend( {}, options, { xnumber0: null } );
+	strictEqual( nullUndef.xnumber0, null, "Check to make sure null values are inserted");
+
+	target = {};
+	recursive = { foo:target, bar:5 };
+	$.widget.extend( target, recursive );
+	deepEqual( target, { foo: {}, bar: 5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" );
+
+	ret = $.widget.extend( { foo: [] }, { foo: [0] } ); // 1907
+	equal( ret.foo.length, 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" );
+
+	ret = $.widget.extend( { foo: "1,2,3" }, { foo: [ 1, 2, 3 ] } );
+	deepEqual( ret.foo, [ 1, 2, 3 ], "Properly extend a string to array." );
+
+	ret = $.widget.extend( { foo: "1,2,3" }, { foo: { to: "object" } } );
+	deepEqual( ret.foo, { to: "object" }, "Properly extend a string to object." );
+
+	ret = $.widget.extend( { foo: "bar" }, { foo: null } );
+	strictEqual( ret.foo, null, "Make sure a null value doesn't crash with deep extend, for #1908" );
+
+	obj = { foo: null };
+	$.widget.extend( obj, { foo:"notnull" } );
+	equal( obj.foo, "notnull", "Make sure a null value can be overwritten" );
+
+	settings = $.widget.extend( {}, defaults, options1, options2 );
+	deepEqual( settings, merged2, "Check if extended: settings must be extended" );
+	deepEqual( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );
+	deepEqual( options1, options1Copy, "Check if not modified: options1 must not be modified" );
+	deepEqual( options2, options2Copy, "Check if not modified: options2 must not be modified" );
+
+	input = {
+		key: [ 1, 2, 3 ]
+	};
+	output = $.widget.extend( {}, input );
+	deepEqual( input, output, "don't clone arrays" );
+	input.key[0] = 10;
+	deepEqual( input, output, "don't clone arrays" );
+});
+
+} );
diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html
index 8ccce8525..0e9d50051 100644
--- a/tests/unit/widget/widget.html
+++ b/tests/unit/widget/widget.html
@@ -5,13 +5,7 @@
 	<title>jQuery UI Widget Test Suite</title>
 
 	<script src="../../lib/css.js" data-modules="core"></script>
-	<script src="../../lib/bootstrap.js"
-		data-modules="
-			widget_core
-			widget_extend
-			widget_animation
-			widget_classes
-		">
+	<script src="../../lib/bootstrap.js" data-modules="core extend animation classes">
 	</script>
 </head>
 <body>
diff --git a/tests/unit/widget/widget_animation.js b/tests/unit/widget/widget_animation.js
deleted file mode 100644
index 4e9d93ccf..000000000
--- a/tests/unit/widget/widget_animation.js
+++ /dev/null
@@ -1,263 +0,0 @@
-define( [
-	"jquery",
-	"ui/widget"
-], function( $ ) {
-
-module( "widget animation", (function() {
-	var show = $.fn.show,
-		fadeIn = $.fn.fadeIn,
-		slideDown = $.fn.slideDown;
-	return {
-		setup: function() {
-			$.widget( "ui.testWidget", {
-				_create: function() {
-					this.element.hide();
-				},
-				show: function( fn ) {
-					this._show( this.element, this.options.show, fn );
-				}
-			});
-			$.effects = { effect: { testEffect: $.noop } };
-		},
-		teardown: function() {
-			delete $.ui.testWidget;
-			delete $.effects.effect.testEffect;
-			$.fn.show = show;
-			$.fn.fadeIn = fadeIn;
-			$.fn.slideDown = slideDown;
-		}
-	};
-}()));
-
-asyncTest( "show: null", function() {
-	expect( 4 );
-
-	var element = $( "#widget" ).testWidget(),
-		hasRun = false;
-	$.fn.show = function() {
-		ok( true, "show called" );
-		equal( arguments.length, 0, "no args passed to show" );
-	};
-
-	element
-		.delay( 50 )
-		.queue(function( next ) {
-			ok( !hasRun, "queue before show" );
-			next();
-		})
-		.testWidget( "show", function() {
-			hasRun = true;
-		})
-		.queue(function( next ) {
-			ok( hasRun, "queue after show" );
-			start();
-			next();
-		});
-});
-
-asyncTest( "show: true", function() {
-	expect( 4 );
-
-	var element = $( "#widget" ).testWidget({
-			show: true
-		}),
-		hasRun = false;
-	$.fn.fadeIn = function( duration, easing, complete ) {
-		return this.queue(function( next ) {
-			strictEqual( duration, undefined, "duration" );
-			strictEqual( easing, undefined, "easing" );
-			complete();
-			next();
-		});
-	};
-
-	element
-		.delay( 50 )
-		.queue(function( next ) {
-			ok( !hasRun, "queue before show" );
-			next();
-		})
-		.testWidget( "show", function() {
-			hasRun = true;
-		})
-		.queue(function( next ) {
-			ok( hasRun, "queue after show" );
-			start();
-			next();
-		});
-});
-
-asyncTest( "show: number", function() {
-	expect( 4 );
-
-	var element = $( "#widget" ).testWidget({
-		show: 123
-	}),
-	hasRun = false;
-	$.fn.fadeIn = function( duration, easing, complete ) {
-		return this.queue(function( next ) {
-			strictEqual( duration, 123, "duration" );
-			strictEqual( easing, undefined, "easing" );
-			complete();
-			next();
-		});
-	};
-
-	element
-		.delay( 50 )
-		.queue(function( next ) {
-			ok( !hasRun, "queue before show" );
-			next();
-		})
-		.testWidget( "show", function() {
-			hasRun = true;
-		})
-		.queue(function( next ) {
-			ok( hasRun, "queue after show" );
-			start();
-			next();
-		});
-});
-
-asyncTest( "show: core animation", function() {
-	expect( 4 );
-
-	var element = $( "#widget" ).testWidget({
-		show: "slideDown"
-	}),
-	hasRun = false;
-	$.fn.slideDown = function( duration, easing, complete ) {
-		return this.queue(function( next ) {
-			strictEqual( duration, undefined, "duration" );
-			strictEqual( easing, undefined, "easing" );
-			complete();
-			next();
-		});
-	};
-
-	element
-		.delay( 50 )
-		.queue(function( next ) {
-			ok( !hasRun, "queue before show" );
-			next();
-		})
-		.testWidget( "show", function() {
-			hasRun = true;
-		})
-		.queue(function( next ) {
-			ok( hasRun, "queue after show" );
-			start();
-			next();
-		});
-});
-
-asyncTest( "show: effect", function() {
-	expect( 5 );
-
-	var element = $( "#widget" ).testWidget({
-		show: "testEffect"
-	}),
-	hasRun = false;
-	$.fn.show = function( options ) {
-		return this.queue(function( next ) {
-			equal( options.effect, "testEffect", "effect" );
-			ok( !("duration" in options), "duration" );
-			ok( !("easing" in options), "easing" );
-			options.complete();
-			next();
-		});
-	};
-
-	element
-		.delay( 50 )
-		.queue(function( next ) {
-			ok( !hasRun, "queue before show" );
-			next();
-		})
-		.testWidget( "show", function() {
-			hasRun = true;
-		})
-		.queue(function( next ) {
-			ok( hasRun, "queue after show" );
-			start();
-			next();
-		});
-});
-
-asyncTest( "show: object(core animation)", function() {
-	expect( 4 );
-
-	var element = $( "#widget" ).testWidget({
-		show: {
-			effect: "slideDown",
-			duration: 123,
-			easing: "testEasing"
-		}
-	}),
-	hasRun = false;
-	$.fn.slideDown = function( duration, easing, complete ) {
-		return this.queue(function( next ) {
-			equal( duration, 123, "duration" );
-			equal( easing, "testEasing", "easing" );
-			complete();
-			next();
-		});
-	};
-
-	element
-		.delay( 50 )
-		.queue(function( next ) {
-			ok( !hasRun, "queue before show" );
-			next();
-		})
-		.testWidget( "show", function() {
-			hasRun = true;
-		})
-		.queue(function( next ) {
-			ok( hasRun, "queue after show" );
-			start();
-			next();
-		});
-});
-
-asyncTest( "show: object(effect)", function() {
-	expect( 3 );
-
-	var element = $( "#widget" ).testWidget({
-		show: {
-			effect: "testEffect",
-			duration: 123,
-			easing: "testEasing"
-		}
-	}),
-	hasRun = false;
-	$.fn.show = function( options ) {
-		return this.queue(function( next ) {
-			deepEqual( options, {
-				effect: "testEffect",
-				duration: 123,
-				easing: "testEasing",
-				complete: options.complete
-			});
-			options.complete();
-			next();
-		});
-	};
-
-	element
-		.delay( 50 )
-		.queue(function( next ) {
-			ok( !hasRun, "queue before show" );
-			next();
-		})
-		.testWidget( "show", function() {
-			hasRun = true;
-		})
-		.queue(function( next ) {
-			ok( hasRun, "queue after show" );
-			start();
-			next();
-		});
-});
-
-} );
diff --git a/tests/unit/widget/widget_classes.js b/tests/unit/widget/widget_classes.js
deleted file mode 100644
index 1b4a45120..000000000
--- a/tests/unit/widget/widget_classes.js
+++ /dev/null
@@ -1,146 +0,0 @@
-define( [
-	"jquery",
-	"ui/widget"
-], function( $ ) {
-
-module( "widget factory classes", {
-	setup: function() {
-		$.widget( "ui.classesWidget", {
-			options: {
-				classes: {
-					"ui-classes-widget": "ui-theme-widget",
-					"ui-classes-element": "ui-theme-element ui-theme-element-2"
-				}
-			},
-			_create: function() {
-				this.span = $( "<span>" )
-					.appendTo( this.element );
-
-				this.element.wrap( "<div>" );
-
-				this.wrapper = this.element.parent();
-
-				this._addClass( "ui-classes-element", "ui-core-element" )
-					._addClass( "ui-classes-element-2" )
-					._addClass( null, "ui-core-element-null" )
-					._addClass( this.span, null, "ui-core-span-null" )
-					._addClass( this.span, "ui-classes-span", "ui-core-span" )
-					._addClass( this.wrapper, "ui-classes-widget" );
-
-			},
-			toggleClasses: function( bool ) {
-				this._toggleClass( "ui-classes-element", "ui-core-element", bool )
-					._toggleClass( "ui-classes-element-2", null, bool )
-					._toggleClass( null, "ui-core-element-null", bool )
-					._toggleClass( this.span, null, "ui-core-span-null", bool )
-					._toggleClass( this.span, "ui-classes-span", "ui-core-span", bool )
-					._toggleClass( this.wrapper, "ui-classes-widget", null, bool );
-			},
-			removeClasses: function() {
-				this._removeClass( "ui-classes-element", "ui-core-element" )
-					._removeClass( "ui-classes-element-2" )
-					._removeClass(  null, "ui-core-element-null"  )
-					._removeClass( this.span, null, "ui-core-span-null" )
-					._removeClass( this.span, "ui-classes-span", "ui-core-span" )
-					._removeClass( this.wrapper, "ui-classes-widget" );
-			},
-			_destroy: function() {
-				this.span.remove();
-				this.element.unwrap();
-			}
-		});
-	},
-	teardown: function() {
-		delete $.ui.classesWidget;
-		delete $.fn.classesWidget;
-	}
-});
-
-function elementHasClasses( widget, method, assert ) {
-	var toggle = method === "toggle" ? ( ", true" ) : "";
-
-	assert.hasClasses( widget, "ui-classes-element ui-theme-element ui-theme-element-2",
-		"_" + method + "Class works with ( keys, extra" + toggle + " )" );
-	assert.hasClasses( widget, "ui-classes-element-2",
-		"_" + method + "Class works with ( keys, null" + toggle + " )" );
-	assert.hasClasses( widget, "ui-core-element-null",
-		"_" + method + "Class works with ( null, extra" + toggle + " )" );
-	assert.hasClasses( widget.parent(), "ui-classes-widget ui-theme-widget",
-		"_" + method + "Class works with ( element, null, extra" + toggle + " )" );
-	assert.hasClasses( widget.find( "span" ), "ui-classes-span ui-core-span",
-		"_" + method + "Class works with ( element, keys, extra" + toggle + " )" );
-	assert.hasClasses( widget.find( "span" ), "ui-core-span-null",
-		"_" + method + "Class works with ( element, keys, null" + toggle + " )" );
-}
-function elementLacksClasses( widget, method, assert ) {
-	var toggle = method === "toggle" ? ( ", false" ) : "";
-
-	assert.lacksClasses( widget, "ui-classes-element ui-theme-element ui-theme-element-2",
-		"_" + method + "Class works with ( keys, extra" + toggle + " )" );
-	assert.lacksClasses( widget, "ui-classes-element-2",
-		"_" + method + "Class works with ( keys, null" + toggle + " )" );
-	assert.lacksClasses( widget, "ui-core-element-null",
-		"_" + method + "Class works with ( null, extra" + toggle + " )" );
-	assert.lacksClasses( widget.parent(), "ui-classes-widget ui-theme-widget",
-		"_" + method + "Class works with ( element, null, extra" + toggle + " )" );
-	assert.lacksClasses( widget.find( "span" ), "ui-classes-span ui-core-span",
-		"_" + method + "Class works with ( element, keys, extra" + toggle + " )" );
-	assert.lacksClasses( widget.find( "span" ), "ui-core-span-null",
-		"_" + method + "Class works with ( element, keys, null" + toggle + " )" );
-}
-
-test( ".option() - classes setter", function( assert ) {
-	expect( 11 );
-
-	var testWidget = $.ui.classesWidget();
-
-	elementHasClasses( testWidget.element, "add", assert );
-
-	testWidget.option({
-		classes: {
-			"ui-classes-span": "custom-theme-span",
-			"ui-classes-widget": "ui-theme-widget custom-theme-widget",
-			"ui-classes-element": "ui-theme-element-2"
-		}
-	});
-
-	assert.lacksClasses( testWidget.element, "ui-theme-element",
-		"Removing a class from the value removes the class" );
-
-	testWidget.option( "classes.ui-classes-element", "" );
-	assert.hasClasses( testWidget.element, "ui-classes-element",
-		"Setting to empty value leaves structure class" );
-	assert.lacksClasses( testWidget.element, "ui-theme-element-2",
-		"Setting empty value removes previous value classes" );
-	assert.hasClasses( testWidget.span, "ui-classes-span custom-theme-span",
-		"Adding a class to an empty value works as expected" );
-	assert.hasClasses( testWidget.wrapper, "ui-classes-widget custom-theme-widget",
-		"Appending a class to the current value works as expected" );
-});
-
-test( ".destroy() - class removal", function( assert ) {
-	expect( 1 );
-
-	assert.domEqual( "#widget", function() {
-		$( "#widget" ).classesWidget().classesWidget( "destroy" );
-	});
-});
-
-test( "._add/_remove/_toggleClass()", function( assert ) {
-	expect( 24 );
-
-	var widget = $( "#widget" ).classesWidget();
-
-	elementHasClasses( widget, "add", assert );
-
-	widget.classesWidget( "toggleClasses", false );
-	elementLacksClasses( widget, "toggle", assert );
-
-	widget.classesWidget( "toggleClasses", true );
-	elementHasClasses( widget, "toggle", assert );
-
-	widget.classesWidget( "removeClasses" );
-	elementLacksClasses( widget, "remove", assert );
-});
-
-} );
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
deleted file mode 100644
index 22832765b..000000000
--- a/tests/unit/widget/widget_core.js
+++ /dev/null
@@ -1,1514 +0,0 @@
-define( [
-	"jquery",
-	"lib/common",
-	"ui/widget"
-], function( $, common ) {
-
-module( "widget factory", {
-	teardown: function() {
-		if ( $.ui ) {
-			delete $.ui.testWidget;
-			delete $.fn.testWidget;
-		}
-	}
-});
-
-common.testJshint( "widget" );
-
-test( "widget creation", function() {
-	expect( 5 );
-	var method,
-		myPrototype = {
-			_create: function() {
-				equal( method, "_create", "create function is copied over" );
-			},
-			creationTest: function() {
-				equal( method, "creationTest", "random function is copied over" );
-			}
-		};
-
-	$.widget( "ui.testWidget", myPrototype );
-	ok( $.isFunction( $.ui.testWidget ), "constructor was created" );
-	equal( typeof $.ui.testWidget.prototype, "object", "prototype was created" );
-	method = "_create";
-	$.ui.testWidget.prototype._create();
-	method = "creationTest";
-	$.ui.testWidget.prototype.creationTest();
-	equal( $.ui.testWidget.prototype.option, $.Widget.prototype.option,
-		"option method copied over from base widget" );
-});
-
-test( "element normalization", function() {
-	expect( 11 );
-	var elem;
-	$.widget( "ui.testWidget", {} );
-
-	$.ui.testWidget.prototype._create = function() {
-		// workaround for core ticket #8381
-		this.element.appendTo( "#qunit-fixture" );
-		ok( this.element.is( "div" ), "generated div" );
-		deepEqual( this.element.testWidget( "instance" ), this, "instance stored in .data()" );
-	};
-	$.ui.testWidget();
-
-	$.ui.testWidget.prototype.defaultElement = "<span data-test='pass'></span>";
-	$.ui.testWidget.prototype._create = function() {
-		ok( this.element.is( "span[data-test=pass]" ), "generated span with properties" );
-		deepEqual( this.element.testWidget( "instance" ), this, "instance stored in .data()" );
-	};
-	$.ui.testWidget();
-
-	elem = $( "<input>" );
-	$.ui.testWidget.prototype._create = function() {
-		deepEqual( this.element[ 0 ], elem[ 0 ], "from element" );
-		deepEqual( elem.testWidget( "instance" ), this, "instance stored in .data()" );
-	};
-	$.ui.testWidget( {}, elem[ 0 ] );
-
-	elem = $( "<div>" );
-	$.ui.testWidget.prototype._create = function() {
-		deepEqual( this.element[ 0 ], elem[ 0 ], "from jQuery object" );
-		deepEqual( elem.testWidget( "instance" ), this, "instance stored in .data()" );
-	};
-	$.ui.testWidget( {}, elem );
-
-	elem = $( "<div id='element-normalization-selector'></div>" )
-		.appendTo( "#qunit-fixture" );
-	$.ui.testWidget.prototype._create = function() {
-		deepEqual( this.element[ 0 ], elem[ 0 ], "from selector" );
-		deepEqual( elem.testWidget( "instance" ), this, "instance stored in .data()" );
-	};
-	$.ui.testWidget( {}, "#element-normalization-selector" );
-
-	$.ui.testWidget.prototype.defaultElement = null;
-	$.ui.testWidget.prototype._create = function() {
-		// using strictEqual throws an error (Maximum call stack size exceeded)
-		ok( this.element[ 0 ] === this, "instance as element" );
-	};
-	$.ui.testWidget();
-});
-
-test( "custom selector expression", function() {
-	expect( 1 );
-	var elem = $( "<div>" ).appendTo( "#qunit-fixture" );
-	$.widget( "ui.testWidget", {} );
-	elem.testWidget();
-	deepEqual( $( ":ui-testwidget" )[0], elem[0] );
-	elem.testWidget( "destroy" );
-});
-
-test( "jQuery usage", function() {
-	expect( 14 );
-
-	var elem, instance, ret,
-		shouldCreate = false;
-
-	$.widget( "ui.testWidget", {
-		getterSetterVal: 5,
-		_create: function() {
-			ok( shouldCreate, "create called on instantiation" );
-		},
-		methodWithParams: function( param1, param2 ) {
-			ok( true, "method called via .pluginName(methodName)" );
-			equal( param1, "value1",
-				"parameter passed via .pluginName(methodName, param)" );
-			equal( param2, "value2",
-				"multiple parameters passed via .pluginName(methodName, param, param)" );
-
-			return this;
-		},
-		getterSetterMethod: function( val ) {
-			if ( val ) {
-				this.getterSetterVal = val;
-			} else {
-				return this.getterSetterVal;
-			}
-		},
-		jQueryObject: function() {
-			return $( "body" );
-		}
-	});
-
-	shouldCreate = true;
-	elem = $( "<div>" )
-		.bind( "testwidgetcreate", function() {
-			ok( shouldCreate, "create event triggered on instantiation" );
-		})
-		.testWidget();
-	shouldCreate = false;
-
-	instance = elem.testWidget( "instance" );
-	equal( typeof instance, "object", "instance stored in .data(pluginName)" );
-	equal( instance.element[0], elem[0], "element stored on widget" );
-	ret = elem.testWidget( "methodWithParams", "value1", "value2" );
-	equal( ret, elem, "jQuery object returned from method call" );
-
-	ret = elem.testWidget( "getterSetterMethod" );
-	equal( ret, 5, "getter/setter can act as getter" );
-	ret = elem.testWidget( "getterSetterMethod", 30 );
-	equal( ret, elem, "getter/setter method can be chainable" );
-	equal( instance.getterSetterVal, 30, "getter/setter can act as setter" );
-	ret = elem.testWidget( "jQueryObject" );
-	equal( ret[ 0 ], document.body, "returned jQuery object" );
-	equal( ret.end(), elem, "stack preserved" );
-
-	elem.testWidget( "destroy" );
-	equal( elem.testWidget( "instance" ), null );
-});
-
-test( "direct usage", function() {
-	expect( 9 );
-
-	var elem, instance, ret,
-		shouldCreate = false;
-
-	$.widget( "ui.testWidget", {
-		getterSetterVal: 5,
-		_create: function() {
-			ok( shouldCreate, "create called on instantiation" );
-		},
-		methodWithParams: function( param1, param2 ) {
-			ok( true, "method called dirctly" );
-			equal( param1, "value1", "parameter passed via direct call" );
-			equal( param2, "value2", "multiple parameters passed via direct call" );
-
-			return this;
-		},
-		getterSetterMethod: function( val ) {
-			if ( val ) {
-				this.getterSetterVal = val;
-			} else {
-				return this.getterSetterVal;
-			}
-		}
-	});
-
-	elem = $( "<div>" )[ 0 ];
-
-	shouldCreate = true;
-	instance = new $.ui.testWidget( {}, elem );
-	shouldCreate = false;
-
-	equal( $( elem ).testWidget( "instance" ), instance,
-		"instance stored in .data(pluginName)" );
-	equal( instance.element[ 0 ], elem, "element stored on widget" );
-
-	ret = instance.methodWithParams( "value1", "value2" );
-	equal( ret, instance, "plugin returned from method call" );
-
-	ret = instance.getterSetterMethod();
-	equal( ret, 5, "getter/setter can act as getter" );
-	instance.getterSetterMethod( 30 );
-	equal( instance.getterSetterVal, 30, "getter/setter can act as setter" );
-});
-
-test( "error handling", function() {
-	expect( 3 );
-	var error = $.error;
-	$.widget( "ui.testWidget", {
-		_privateMethod: function () {}
-	});
-	$.error = function( msg ) {
-		equal( msg, "cannot call methods on testWidget prior to initialization; " +
-			"attempted to call method 'missing'", "method call before init" );
-	};
-	$( "<div>" ).testWidget( "missing" );
-	$.error = function( msg ) {
-		equal( msg, "no such method 'missing' for testWidget widget instance",
-			"invalid method call on widget instance" );
-	};
-	$( "<div>" ).testWidget().testWidget( "missing" );
-	$.error = function ( msg ) {
-		equal( msg, "no such method '_privateMethod' for testWidget widget instance",
-			"invalid method call on widget instance" );
-	};
-	$( "<div>" ).testWidget().testWidget( "_privateMethod" );
-	$.error = error;
-});
-
-test( "merge multiple option arguments", function() {
-	expect( 1 );
-	$.widget( "ui.testWidget", {
-		_create: function() {
-			deepEqual( this.options, {
-				classes: {},
-				create: null,
-				disabled: false,
-				option1: "value1",
-				option2: "value2",
-				option3: "value3",
-				option4: {
-					option4a: "valuea",
-					option4b: "valueb"
-				}
-			});
-		}
-	});
-	$( "<div>" ).testWidget({
-		option1: "valuex",
-		option2: "valuex",
-		option3: "value3",
-		option4: {
-			option4a: "valuex"
-		}
-	}, {
-		option1: "value1",
-		option2: "value2",
-		option4: {
-			option4b: "valueb"
-		}
-	}, {
-		option4: {
-			option4a: "valuea"
-		}
-	});
-});
-
-test( "._getCreateOptions()", function() {
-	expect( 3 );
-	$.widget( "ui.testWidget", {
-		options: {
-			option1: "valuex",
-			option2: "valuex",
-			option3: "value3"
-		},
-		_getCreateOptions: function() {
-
-			// Support: IE8
-			// Strict equality fails when comparing this.window in ie8
-			equal( this.window[ 0 ], window, "this.window is properly defined" );
-			strictEqual( this.document[ 0 ], document, "this.document is properly defined" );
-
-			return {
-				option1: "override1",
-				option2: "overideX"
-			};
-		},
-		_create: function() {
-			deepEqual( this.options, {
-				classes: {},
-				create: null,
-				disabled: false,
-				option1: "override1",
-				option2: "value2",
-				option3: "value3"
-			});
-		}
-	});
-	$( "<div>" ).testWidget({ option2: "value2" });
-});
-
-test( "._getCreateEventData()", function() {
-	expect( 1 );
-	var data = { foo: "bar" };
-	$.widget( "ui.testWidget", {
-		_getCreateEventData: function() {
-			return data;
-		}
-	});
-	$( "<div>" ).testWidget({
-		create: function( event, ui ) {
-			strictEqual( ui, data, "event data" );
-		}
-	});
-});
-
-test( "re-init", function() {
-	expect( 3 );
-	var div = $( "<div>" ),
-		actions = [];
-
-	$.widget( "ui.testWidget", {
-		_create: function() {
-			actions.push( "create" );
-		},
-		_init: function() {
-			actions.push( "init" );
-		},
-		_setOption: function( key ) {
-			actions.push( "option" + key );
-		}
-	});
-
-	actions = [];
-	div.testWidget({ foo: "bar" });
-	deepEqual( actions, [ "create", "init" ], "correct methods called on init" );
-
-	actions = [];
-	div.testWidget();
-	deepEqual( actions, [ "init" ], "correct methods call on re-init" );
-
-	actions = [];
-	div.testWidget({ foo: "bar" });
-	deepEqual( actions, [ "optionfoo", "init" ], "correct methods called on re-init with options" );
-});
-
-test( "redeclare", function() {
-	expect( 2 );
-
-	$.widget( "ui.testWidget", {} );
-	equal( $.ui.testWidget.prototype.widgetEventPrefix, "testWidget" );
-
-	$.widget( "ui.testWidget", {} );
-	equal( $.ui.testWidget.prototype.widgetEventPrefix, "testWidget" );
-});
-
-test( "inheritance", function() {
-	expect( 6 );
-	// #5830 - Widget: Using inheritance overwrites the base classes options
-	$.widget( "ui.testWidgetBase", {
-		options: {
-			obj: {
-				key1: "foo",
-				key2: "bar"
-			},
-			arr: [ "testing" ]
-		}
-	});
-
-	$.widget( "ui.testWidgetExtension", $.ui.testWidgetBase, {
-		options: {
-			obj: {
-				key1: "baz"
-			},
-			arr: [ "alpha", "beta" ]
-		}
-	});
-
-	equal( $.ui.testWidgetBase.prototype.widgetEventPrefix, "testWidgetBase",
-		"base class event prefix" );
-	deepEqual( $.ui.testWidgetBase.prototype.options.obj, {
-		key1: "foo",
-		key2: "bar"
-	}, "base class option object not overridden");
-	deepEqual( $.ui.testWidgetBase.prototype.options.arr, [ "testing" ],
-		"base class option array not overridden");
-
-	equal( $.ui.testWidgetExtension.prototype.widgetEventPrefix, "testWidgetExtension",
-		"extension class event prefix" );
-	deepEqual( $.ui.testWidgetExtension.prototype.options.obj, {
-		key1: "baz",
-		key2: "bar"
-	}, "extension class option object extends base");
-	deepEqual( $.ui.testWidgetExtension.prototype.options.arr, [ "alpha", "beta" ],
-		"extension class option array overwrites base");
-
-	delete $.ui.testWidgetBase;
-	delete $.ui.testWidgetExtension;
-});
-
-test( "._super()", function() {
-	expect( 9 );
-	var instance;
-	$.widget( "ui.testWidget", {
-		method: function( a, b ) {
-			deepEqual( this, instance, "this is correct in testWidget" );
-			deepEqual( a, 5, "parameter passed to testWidget" );
-			deepEqual( b, 20, "second parameter passed to testWidget" );
-			return a + b;
-		}
-	});
-
-	$.widget( "ui.testWidget2", $.ui.testWidget, {
-		method: function( a, b ) {
-			deepEqual( this, instance, "this is correct in testWidget2" );
-			deepEqual( a, 5, "parameter passed to testWidget2" );
-			deepEqual( b, 10, "parameter passed to testWidget2" );
-			return this._super( a, b*2 );
-		}
-	});
-
-	$.widget( "ui.testWidget3", $.ui.testWidget2, {
-		method: function( a ) {
-			deepEqual( this, instance, "this is correct in testWidget3" );
-			deepEqual( a, 5, "parameter passed to testWidget3" );
-			var ret = this._super( a, a*2 );
-			deepEqual( ret, 25, "super returned value" );
-		}
-	});
-
-	instance = $( "<div>" ).testWidget3().testWidget3( "instance" );
-	instance.method( 5 );
-	delete $.ui.testWidget3;
-	delete $.ui.testWidget2;
-});
-
-test( "._superApply()", function() {
-	expect( 10 );
-	var instance;
-	$.widget( "ui.testWidget", {
-		method: function( a, b ) {
-			deepEqual( this, instance, "this is correct in testWidget" );
-			deepEqual( a, 5, "parameter passed to testWidget" );
-			deepEqual( b, 10, "second parameter passed to testWidget" );
-			return a + b;
-		}
-	});
-
-	$.widget( "ui.testWidget2", $.ui.testWidget, {
-		method: function( a, b ) {
-			deepEqual( this, instance, "this is correct in testWidget2" );
-			deepEqual( a, 5, "parameter passed to testWidget2" );
-			deepEqual( b, 10, "second parameter passed to testWidget2" );
-			return this._superApply( arguments );
-		}
-	});
-
-	$.widget( "ui.testWidget3", $.ui.testWidget2, {
-		method: function( a, b ) {
-			deepEqual( this, instance, "this is correct in testWidget3" );
-			deepEqual( a, 5, "parameter passed to testWidget3" );
-			deepEqual( b, 10, "second parameter passed to testWidget3" );
-			var ret = this._superApply( arguments );
-			deepEqual( ret, 15, "super returned value" );
-		}
-	});
-
-	instance = $( "<div>" ).testWidget3().testWidget3( "instance" );
-	instance.method( 5, 10 );
-	delete $.ui.testWidget3;
-	delete $.ui.testWidget2;
-});
-
-test( ".option() - getter", function() {
-	expect( 6 );
-	$.widget( "ui.testWidget", {
-		_create: function() {}
-	});
-
-	var options,
-		div = $( "<div>" ).testWidget({
-			foo: "bar",
-			baz: 5,
-			qux: [ "quux", "quuux" ]
-		});
-
-	deepEqual( div.testWidget( "option", "x" ), null, "non-existent option" );
-	deepEqual( div.testWidget( "option", "foo"), "bar", "single option - string" );
-	deepEqual( div.testWidget( "option", "baz"), 5, "single option - number" );
-	deepEqual( div.testWidget( "option", "qux"), [ "quux", "quuux" ],
-		"single option - array" );
-
-	options = div.testWidget( "option" );
-	deepEqual( options, {
-		baz: 5,
-		classes: {},
-		create: null,
-		disabled: false,
-		foo: "bar",
-		qux: [ "quux", "quuux" ]
-	}, "full options hash returned" );
-	options.foo = "notbar";
-	deepEqual( div.testWidget( "option", "foo"), "bar",
-		"modifying returned options hash does not modify plugin instance" );
-});
-
-test( ".option() - deep option getter", function() {
-	expect( 5 );
-	$.widget( "ui.testWidget", {} );
-	var div = $( "<div>" ).testWidget({
-		foo: {
-			bar: "baz",
-			qux: {
-				quux: "xyzzy"
-			}
-		}
-	});
-	equal( div.testWidget( "option", "foo.bar" ), "baz", "one level deep - string" );
-	deepEqual( div.testWidget( "option", "foo.qux" ), { quux: "xyzzy" },
-		"one level deep - object" );
-	equal( div.testWidget( "option", "foo.qux.quux" ), "xyzzy", "two levels deep - string" );
-	equal( div.testWidget( "option", "x.y" ), null, "top level non-existent" );
-	equal( div.testWidget( "option", "foo.x.y" ), null, "one level deep - non-existent" );
-});
-
-test( ".option() - delegate to ._setOptions()", function() {
-	expect( 2 );
-	var div,
-		calls = [];
-	$.widget( "ui.testWidget", {
-		_create: function() {},
-		_setOptions: function( options ) {
-			calls.push( options );
-		}
-	});
-	div = $( "<div>" ).testWidget();
-
-	calls = [];
-	div.testWidget( "option", "foo", "bar" );
-	deepEqual( calls, [{ foo: "bar" }], "_setOptions called for single option" );
-
-	calls = [];
-	div.testWidget( "option", {
-		bar: "qux",
-		quux: "quuux"
-	});
-	deepEqual( calls, [{ bar: "qux", quux: "quuux" }],
-		"_setOptions called with multiple options" );
-});
-
-test( ".option() - delegate to ._setOption()", function() {
-	expect( 3 );
-	var div,
-		calls = [];
-	$.widget( "ui.testWidget", {
-		_create: function() {},
-		_setOption: function( key, val ) {
-			calls.push({
-				key: key,
-				val: val
-			});
-		}
-	});
-	div = $( "<div>" ).testWidget();
-
-	calls = [];
-	div.testWidget( "option", "foo", "bar" );
-	deepEqual( calls, [{ key: "foo", val: "bar" }],
-		"_setOption called for single option" );
-
-	calls = [];
-	div.testWidget( "option", "foo", undefined );
-	deepEqual( calls, [{ key: "foo", val: undefined }],
-		"_setOption called for single option where value is undefined" );
-
-	calls = [];
-	div.testWidget( "option", {
-		bar: "qux",
-		quux: "quuux"
-	});
-	deepEqual( calls, [
-		{ key: "bar", val: "qux" },
-		{ key: "quux", val: "quuux" }
-	], "_setOption called with multiple options" );
-});
-
-test( ".option() - deep option setter", function() {
-	expect( 9 );
-	$.widget( "ui.testWidget", {} );
-	var result, div = $( "<div>" ).testWidget();
-	function deepOption( from, to, msg ) {
-		div.testWidget( "instance" ).options.foo = from;
-		$.ui.testWidget.prototype._setOption = function( key, value ) {
-			deepEqual( key, "foo", msg + ": key" );
-			deepEqual( value, to, msg + ": value" );
-		};
-	}
-
-	deepOption( { bar: "baz" }, { bar: "qux" }, "one deep" );
-	div.testWidget( "option", "foo.bar", "qux" );
-
-	deepOption( { bar: "baz" }, { bar: undefined }, "one deep - value = undefined" );
-
-	result = div.testWidget( "option", "foo.bar", undefined );
-
-	deepEqual ( result, div, "option should return widget on successful set operation" );
-
-	deepOption( null, { bar: "baz" }, "null" );
-	div.testWidget( "option", "foo.bar", "baz" );
-
-	deepOption(
-		{ bar: "baz", qux: { quux: "quuux" } },
-		{ bar: "baz", qux: { quux: "quuux", newOpt: "newVal" } },
-		"add property" );
-	div.testWidget( "option", "foo.qux.newOpt", "newVal" );
-});
-
-test( ".enable()", function() {
-	expect( 2 );
-	$.widget( "ui.testWidget", {
-		_create: function() {},
-		_setOption: function( key, val ) {
-			deepEqual( key, "disabled", "_setOption called with disabled option" );
-			deepEqual( val, false, "disabled set to false" );
-		}
-	});
-	$( "<div>" ).testWidget().testWidget( "enable" );
-});
-
-test( ".disable()", function() {
-	expect( 2 );
-	$.widget( "ui.testWidget", {
-		_create: function() {},
-		_setOption: function( key, val ) {
-			deepEqual( key, "disabled", "_setOption called with disabled option" );
-			deepEqual( val, true, "disabled set to true" );
-		}
-	});
-	$( "<div>" ).testWidget().testWidget( "disable" );
-});
-
-test( ".widget() - base", function() {
-	expect( 2 );
-	var constructor = $.widget( "ui.testWidget", {
-			_create: function() {}
-		}),
-		div = $( "<div>" ).testWidget();
-	deepEqual( div[0], div.testWidget( "widget" )[0]);
-	deepEqual( constructor, $.ui.testWidget, "$.widget returns the constructor" );
-});
-
-test( ".widget() - overriden", function() {
-	expect( 1 );
-	var wrapper = $( "<div>" );
-	$.widget( "ui.testWidget", {
-		_create: function() {},
-		widget: function() {
-			return wrapper;
-		}
-	});
-	deepEqual( wrapper[0], $( "<div>" ).testWidget().testWidget( "widget" )[0] );
-});
-
-test( ".instance()", function() {
-	expect( 2 );
-	var div;
-
-	$.widget( "ui.testWidget", {
-		_create: function() {}
-	});
-
-	div = $( "<div>" );
-	equal( div.testWidget( "instance" ), undefined );
-	div.testWidget();
-	equal( div.testWidget( "instance" ), div.testWidget( "instance" ) );
-});
-
-test( "._on() to element (default)", function() {
-	expect( 12 );
-	var that, widget;
-	$.widget( "ui.testWidget", {
-		_create: function() {
-			that = this;
-			this._on({
-				keyup: this.keyup,
-				keydown: "keydown"
-			});
-		},
-		keyup: function( event ) {
-			equal( that, this );
-			equal( that.element[0], event.currentTarget );
-			equal( "keyup", event.type );
-		},
-		keydown: function( event ) {
-			equal( that, this );
-			equal( that.element[0], event.currentTarget );
-			equal( "keydown", event.type );
-		}
-	});
-	widget = $( "<div></div>" )
-		.testWidget()
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	widget
-		.testWidget( "disable" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	widget
-		.testWidget( "enable" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	widget
-		.testWidget( "destroy" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-});
-
-test( "._on() to element with suppressDisabledCheck", function() {
-	expect( 18 );
-	var that, widget;
-	$.widget( "ui.testWidget", {
-		_create: function() {
-			that = this;
-			this._on( true, {
-				keyup: this.keyup,
-				keydown: "keydown"
-			});
-		},
-		keyup: function( event ) {
-			equal( that, this );
-			equal( that.element[0], event.currentTarget );
-			equal( "keyup", event.type );
-		},
-		keydown: function( event ) {
-			equal( that, this );
-			equal( that.element[0], event.currentTarget );
-			equal( "keydown", event.type );
-		}
-	});
-	widget = $( "<div></div>" )
-		.testWidget()
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	widget
-		.testWidget( "disable" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	widget
-		.testWidget( "enable" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	widget
-		.testWidget( "destroy" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-});
-
-test( "._on() to descendent", function() {
-	expect( 12 );
-	var that, widget, descendant;
-	$.widget( "ui.testWidget", {
-		_create: function() {
-			that = this;
-			this._on( this.element.find( "strong" ), {
-				keyup: this.keyup,
-				keydown: "keydown"
-			});
-		},
-		keyup: function( event ) {
-			equal( that, this );
-			equal( that.element.find( "strong" )[0], event.currentTarget );
-			equal( "keyup", event.type );
-		},
-		keydown: function(event) {
-			equal( that, this );
-			equal( that.element.find( "strong" )[0], event.currentTarget );
-			equal( "keydown", event.type );
-		}
-	});
-	// trigger events on both widget and descendent to ensure that only descendent receives them
-	widget = $( "<div><p><strong>hello</strong> world</p></div>" )
-		.testWidget()
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	descendant = widget.find( "strong" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	widget
-		.testWidget( "disable" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	descendant
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	widget
-		.testWidget( "enable" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	descendant
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	descendant
-		.addClass( "ui-state-disabled" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	widget
-		.testWidget( "destroy" )
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-	descendant
-		.trigger( "keyup" )
-		.trigger( "keydown" );
-});
-
-test( "_on() with delegate", function() {
-	expect( 8 );
-	$.widget( "ui.testWidget", {
-		_create: function() {
-			var uuid = this.uuid;
-			this.element = {
-				bind: function( event, handler ) {
-					equal( event, "click.testWidget" + uuid );
-					ok( $.isFunction(handler) );
-				},
-				trigger: $.noop
-			};
-			this.widget = function() {
-				return {
-					delegate: function( selector, event, handler ) {
-						equal( selector, "a" );
-						equal( event, "click.testWidget" + uuid );
-						ok( $.isFunction(handler) );
-					}
-				};
-			};
-			this._on({
-				"click": "handler",
-				"click a": "handler"
-			});
-			this.widget = function() {
-				return {
-					delegate: function( selector, event, handler ) {
-						equal( selector, "form fieldset > input" );
-						equal( event, "change.testWidget" + uuid );
-						ok( $.isFunction(handler) );
-					}
-				};
-			};
-			this._on({
-				"change form fieldset > input": "handler"
-			});
-		}
-	});
-	$.ui.testWidget();
-});
-
-test( "_on() with delegate to descendent", function() {
-	expect( 4 );
-	$.widget( "ui.testWidget", {
-		_create: function() {
-			this.target = $( "<p><strong>hello</strong> world</p>" );
-			this.child = this.target.children();
-			this._on( this.target, {
-				"keyup": "handlerDirect",
-				"keyup strong": "handlerDelegated"
-			});
-			this.child.trigger( "keyup" );
-		},
-		handlerDirect: function( event ) {
-			deepEqual( event.currentTarget, this.target[ 0 ] );
-			deepEqual( event.target, this.child[ 0 ] );
-		},
-		handlerDelegated: function( event ) {
-			deepEqual( event.currentTarget, this.child[ 0 ] );
-			deepEqual( event.target, this.child[ 0 ] );
-		}
-	});
-	$.ui.testWidget();
-});
-
-test( "_on() to common element", function() {
-	expect( 4 );
-	$.widget( "ui.testWidget", {
-		_create: function() {
-			this._on( this.document, {
-				"customevent": "_handler",
-				"with:colons": "_colonHandler",
-				"with-dashes": "_dashHandler",
-				"with-dashes:and-colons": "_commbinedHandler"
-			});
-		},
-		_handler: function() {
-			ok( true, "handler triggered" );
-		},
-		_colonHandler: function() {
-			ok( true, "colon handler triggered" );
-		},
-		_dashHandler: function() {
-			ok( true, "dash handler triggered" );
-		},
-		_commbinedHandler: function() {
-			ok( true, "combined handler triggered" );
-		}
-	});
-	var widget = $( "#widget" ).testWidget().testWidget( "instance" );
-	$( "#widget-wrapper" ).testWidget();
-	widget.destroy();
-	$( document ).trigger( "customevent" );
-	$( document ).trigger( "with:colons" );
-	$( document ).trigger( "with-dashes" );
-	$( document ).trigger( "with-dashes:and-colons" );
-});
-
-test( "_off() - single event", function() {
-	expect( 3 );
-
-	$.widget( "ui.testWidget", {} );
-	var shouldTriggerWidget, shouldTriggerOther,
-		element = $( "#widget" ),
-		widget = element.testWidget().testWidget( "instance" );
-	widget._on( element, { foo: function() {
-		ok( shouldTriggerWidget, "foo called from _on" );
-	}});
-	element.bind( "foo", function() {
-		ok( shouldTriggerOther, "foo called from bind" );
-	});
-	shouldTriggerWidget = true;
-	shouldTriggerOther = true;
-	element.trigger( "foo" );
-	shouldTriggerWidget = false;
-	widget._off( element, "foo" );
-	element.trigger( "foo" );
-});
-
-test( "_off() - multiple events", function() {
-	expect( 6 );
-
-	$.widget( "ui.testWidget", {} );
-	var shouldTriggerWidget, shouldTriggerOther,
-		element = $( "#widget" ),
-		widget = element.testWidget().testWidget( "instance" );
-	widget._on( element, {
-		foo: function() {
-			ok( shouldTriggerWidget, "foo called from _on" );
-		},
-		bar: function() {
-			ok( shouldTriggerWidget, "bar called from _on" );
-		}
-	});
-	element.bind( "foo bar", function( event ) {
-		ok( shouldTriggerOther, event.type + " called from bind" );
-	});
-	shouldTriggerWidget = true;
-	shouldTriggerOther = true;
-	element.trigger( "foo" );
-	element.trigger( "bar" );
-	shouldTriggerWidget = false;
-	widget._off( element, "foo bar" );
-	element.trigger( "foo" );
-	element.trigger( "bar" );
-});
-
-test( "_off() - all events", function() {
-	expect( 6 );
-
-	$.widget( "ui.testWidget", {} );
-	var shouldTriggerWidget, shouldTriggerOther,
-		element = $( "#widget" ),
-		widget = element.testWidget().testWidget( "instance" );
-	widget._on( element, {
-		foo: function() {
-			ok( shouldTriggerWidget, "foo called from _on" );
-		},
-		bar: function() {
-			ok( shouldTriggerWidget, "bar called from _on" );
-		}
-	});
-	element.bind( "foo bar", function( event ) {
-		ok( shouldTriggerOther, event.type + " called from bind" );
-	});
-	shouldTriggerWidget = true;
-	shouldTriggerOther = true;
-	element.trigger( "foo" );
-	element.trigger( "bar" );
-	shouldTriggerWidget = false;
-	widget._off( element );
-	element.trigger( "foo" );
-	element.trigger( "bar" );
-});
-
-test( "._hoverable()", function( assert ) {
-	expect( 10 );
-	$.widget( "ui.testWidget", {
-		_create: function() {
-			this._hoverable( this.element.children() );
-		}
-	});
-
-	var div = $( "#widget" ).testWidget().children();
-	assert.lacksClasses( div, "ui-state-hover", "not hovered on init" );
-	div.trigger( "mouseenter" );
-	assert.hasClasses( div, "ui-state-hover", "hovered after mouseenter" );
-	div.trigger( "mouseleave" );
-	assert.lacksClasses( div, "ui-state-hover", "not hovered after mouseleave" );
-
-	div.trigger( "mouseenter" );
-	assert.hasClasses( div, "ui-state-hover", "hovered after mouseenter" );
-	$( "#widget" ).testWidget( "disable" );
-	assert.lacksClasses( div, "ui-state-hover", "not hovered while disabled" );
-	div.trigger( "mouseenter" );
-	assert.lacksClasses( div, "ui-state-hover", "can't hover while disabled" );
-	$( "#widget" ).testWidget( "enable" );
-	assert.lacksClasses( div, "ui-state-hover", "enabling doesn't reset hover" );
-
-	div.trigger( "mouseenter" );
-	assert.hasClasses( div, "ui-state-hover", "hovered after mouseenter" );
-	$( "#widget" ).testWidget( "destroy" );
-	assert.lacksClasses( div, "ui-state-hover", "not hovered after destroy" );
-	div.trigger( "mouseenter" );
-	assert.lacksClasses( div, "ui-state-hover", "event handler removed on destroy" );
-});
-
-test( "._focusable()", function( assert ) {
-	expect( 10 );
-	$.widget( "ui.testWidget", {
-		_create: function() {
-			this._focusable( this.element.children() );
-		}
-	});
-
-	var div = $( "#widget" ).testWidget().children();
-	assert.lacksClasses( div, "ui-state-focus", "not focused on init" );
-	div.trigger( "focusin" );
-	assert.hasClasses( div, "ui-state-focus", "focused after explicit focus" );
-	div.trigger( "focusout" );
-	assert.lacksClasses( div, "ui-state-focus", "not focused after blur" );
-
-	div.trigger( "focusin" );
-	assert.hasClasses( div, "ui-state-focus", "focused after explicit focus" );
-	$( "#widget" ).testWidget( "disable" );
-	assert.lacksClasses( div, "ui-state-focus", "not focused while disabled" );
-	div.trigger( "focusin" );
-	assert.lacksClasses( div, "ui-state-focus", "can't focus while disabled" );
-	$( "#widget" ).testWidget( "enable" );
-	assert.lacksClasses( div, "ui-state-focus", "enabling doesn't reset focus" );
-
-	div.trigger( "focusin" );
-	assert.hasClasses( div, "ui-state-focus", "focused after explicit focus" );
-	$( "#widget" ).testWidget( "destroy" );
-	assert.lacksClasses( div, "ui-state-focus", "not focused after destroy" );
-	div.trigger( "focusin" );
-	assert.lacksClasses( div, "ui-state-focus", "event handler removed on destroy" );
-});
-
-test( "._trigger() - no event, no ui", function() {
-	expect( 7 );
-	var handlers = [];
-
-	$.widget( "ui.testWidget", {
-		_create: function() {}
-	});
-
-	$( "#widget" ).testWidget({
-		foo: function( event, ui ) {
-			deepEqual( event.type, "testwidgetfoo", "correct event type in callback" );
-			deepEqual( ui, {}, "empty ui hash passed" );
-			handlers.push( "callback" );
-		}
-	});
-	$( document ).add( "#widget-wrapper" ).add( "#widget" )
-		.bind( "testwidgetfoo", function( event, ui ) {
-			deepEqual( ui, {}, "empty ui hash passed" );
-			handlers.push( this );
-		});
-	deepEqual( $( "#widget" ).testWidget( "instance" )._trigger( "foo" ), true,
-		"_trigger returns true when event is not cancelled" );
-	deepEqual( handlers, [
-		$( "#widget" )[ 0 ],
-		$( "#widget-wrapper" )[ 0 ],
-		document,
-		"callback"
-	], "event bubbles and then invokes callback" );
-
-	$( document ).unbind( "testwidgetfoo" );
-});
-
-test( "._trigger() - cancelled event", function() {
-	expect( 3 );
-
-	$.widget( "ui.testWidget", {
-		_create: function() {}
-	});
-
-	$( "#widget" ).testWidget({
-		foo: function() {
-			ok( true, "callback invoked even if event is cancelled" );
-		}
-	})
-	.bind( "testwidgetfoo", function() {
-		ok( true, "event was triggered" );
-		return false;
-	});
-	deepEqual( $( "#widget" ).testWidget( "instance" )._trigger( "foo" ), false,
-		"_trigger returns false when event is cancelled" );
-});
-
-test( "._trigger() - cancelled callback", function() {
-	expect( 1 );
-	$.widget( "ui.testWidget", {
-		_create: function() {}
-	});
-
-	$( "#widget" ).testWidget({
-		foo: function() {
-			return false;
-		}
-	});
-	deepEqual( $( "#widget" ).testWidget( "instance" )._trigger( "foo" ), false,
-		"_trigger returns false when callback returns false" );
-});
-
-test( "._trigger() - provide event and ui", function() {
-	expect( 7 );
-
-	var originalEvent = $.Event( "originalTest" );
-	$.widget( "ui.testWidget", {
-		_create: function() {},
-		testEvent: function() {
-			var ui = {
-					foo: "bar",
-					baz: {
-						qux: 5,
-						quux: 20
-					}
-				};
-			this._trigger( "foo", originalEvent, ui );
-			deepEqual( ui, {
-				foo: "notbar",
-				baz: {
-					qux: 10,
-					quux: "jQuery"
-				}
-			}, "ui object modified" );
-		}
-	});
-	$( "#widget" ).bind( "testwidgetfoo", function( event, ui ) {
-		equal( event.originalEvent, originalEvent, "original event object passed" );
-		deepEqual( ui, {
-			foo: "bar",
-			baz: {
-				qux: 5,
-				quux: 20
-			}
-		}, "ui hash passed" );
-		ui.foo = "notbar";
-	});
-	$( "#widget-wrapper" ).bind( "testwidgetfoo", function( event, ui ) {
-		equal( event.originalEvent, originalEvent, "original event object passed" );
-		deepEqual( ui, {
-			foo: "notbar",
-			baz: {
-				qux: 5,
-				quux: 20
-			}
-		}, "modified ui hash passed" );
-		ui.baz.qux = 10;
-	});
-	$( "#widget" ).testWidget({
-		foo: function( event, ui ) {
-			equal( event.originalEvent, originalEvent, "original event object passed" );
-			deepEqual( ui, {
-				foo: "notbar",
-				baz: {
-					qux: 10,
-					quux: 20
-				}
-			}, "modified ui hash passed" );
-			ui.baz.quux = "jQuery";
-		}
-	})
-	.testWidget( "testEvent" );
-});
-
-test( "._trigger() - array as ui", function() {
-	// #6795 - Widget: handle array arguments to _trigger consistently
-	expect( 4 );
-
-	$.widget( "ui.testWidget", {
-		_create: function() {},
-		testEvent: function() {
-			var ui = {
-					foo: "bar",
-					baz: {
-						qux: 5,
-						quux: 20
-					}
-				},
-				extra = {
-					bar: 5
-				};
-			this._trigger( "foo", null, [ ui, extra ] );
-		}
-	});
-	$( "#widget" ).bind( "testwidgetfoo", function( event, ui, extra ) {
-		deepEqual( ui, {
-			foo: "bar",
-			baz: {
-				qux: 5,
-				quux: 20
-			}
-		}, "event: ui hash passed" );
-		deepEqual( extra, {
-			bar: 5
-		}, "event: extra argument passed" );
-	});
-	$( "#widget" ).testWidget({
-		foo: function( event, ui, extra ) {
-			deepEqual( ui, {
-				foo: "bar",
-				baz: {
-					qux: 5,
-					quux: 20
-				}
-			}, "callback: ui hash passed" );
-			deepEqual( extra, {
-				bar: 5
-			}, "callback: extra argument passed" );
-		}
-	})
-	.testWidget( "testEvent" );
-});
-
-test( "._trigger() - instance as element", function() {
-	expect( 4 );
-	$.widget( "ui.testWidget", {
-		defaultElement: null,
-		testEvent: function() {
-			this._trigger( "foo", null, { foo: "bar" } );
-		}
-	});
-	var instance = $.ui.testWidget({
-		foo: function( event, ui ) {
-			equal( event.type, "testwidgetfoo", "event object passed to callback" );
-			deepEqual( ui, { foo: "bar" }, "ui object passed to callback" );
-		}
-	});
-	$( instance ).bind( "testwidgetfoo", function( event, ui ) {
-		equal( event.type, "testwidgetfoo", "event object passed to event handler" );
-		deepEqual( ui, { foo: "bar" }, "ui object passed to event handler" );
-	});
-	instance.testEvent();
-});
-
-(function() {
-	function shouldDestroy( expected, callback ) {
-		expect( 1 );
-		var destroyed = false;
-		$.widget( "ui.testWidget", {
-			_create: function() {},
-			destroy: function() {
-				destroyed = true;
-			}
-		});
-		callback();
-		equal( destroyed, expected );
-	}
-
-	test( "auto-destroy - .remove()", function() {
-		shouldDestroy( true, function() {
-			$( "#widget" ).testWidget().remove();
-		});
-	});
-
-	test( "auto-destroy - .remove() when disabled", function() {
-		shouldDestroy( true, function() {
-			$( "#widget" ).testWidget({ disabled: true }).remove();
-		});
-	});
-
-	test( "auto-destroy - .remove() on parent", function() {
-		shouldDestroy( true, function() {
-			$( "#widget" ).testWidget().parent().remove();
-		});
-	});
-
-	test( "auto-destroy - .remove() on child", function() {
-		shouldDestroy( false, function() {
-			$( "#widget" ).testWidget().children().remove();
-		});
-	});
-
-	test( "auto-destroy - .empty()", function() {
-		shouldDestroy( false, function() {
-			$( "#widget" ).testWidget().empty();
-		});
-	});
-
-	test( "auto-destroy - .empty() on parent", function() {
-		shouldDestroy( true, function() {
-			$( "#widget" ).testWidget().parent().empty();
-		});
-	});
-
-	test( "auto-destroy - .detach()", function() {
-		shouldDestroy( false, function() {
-			$( "#widget" ).testWidget().detach();
-		});
-	});
-
-	test( "destroy - remove event bubbling", function() {
-		shouldDestroy( false, function() {
-			$( "<div>child</div>" ).appendTo( $( "#widget" ).testWidget() )
-				.trigger( "remove" );
-		});
-	});
-}());
-
-test( "redefine", function() {
-	expect( 4 );
-	$.widget( "ui.testWidget", {
-		method: function( str ) {
-			strictEqual( this, instance, "original invoked with correct this" );
-			equal( str, "bar", "original invoked with correct parameter" );
-		}
-	});
-	$.ui.testWidget.foo = "bar";
-	$.widget( "ui.testWidget", $.ui.testWidget, {
-		method: function( str ) {
-			equal( str, "foo", "new invoked with correct parameter" );
-			this._super( "bar" );
-		}
-	});
-
-	var instance = new $.ui.testWidget({});
-	instance.method( "foo" );
-	equal( $.ui.testWidget.foo, "bar", "static properties remain" );
-});
-
-test( "redefine deep prototype chain", function() {
-	expect( 8 );
-	$.widget( "ui.testWidget", {
-		method: function( str ) {
-			strictEqual( this, instance, "original invoked with correct this" );
-			equal( str, "level 4", "original invoked with correct parameter" );
-		}
-	});
-	$.widget( "ui.testWidget2", $.ui.testWidget, {
-		method: function( str ) {
-			strictEqual( this, instance, "testWidget2 invoked with correct this" );
-			equal( str, "level 2", "testWidget2 invoked with correct parameter" );
-			this._super( "level 3" );
-		}
-	});
-	$.widget( "ui.testWidget3", $.ui.testWidget2, {
-		method: function( str ) {
-			strictEqual( this, instance, "testWidget3 invoked with correct this" );
-			equal( str, "level 1", "testWidget3 invoked with correct parameter" );
-			this._super( "level 2" );
-		}
-	});
-	// redefine testWidget after other widgets have inherited from it
-	// this tests whether the inheriting widgets get updated prototype chains
-	$.widget( "ui.testWidget", $.ui.testWidget, {
-		method: function( str ) {
-			strictEqual( this, instance, "new invoked with correct this" );
-			equal( str, "level 3", "new invoked with correct parameter" );
-			this._super( "level 4" );
-		}
-	});
-	// redefine testWidget3 after it has been automatically redefined
-	// this tests whether we properly handle _super() when the topmost prototype
-	// doesn't have the method defined
-	$.widget( "ui.testWidget3", $.ui.testWidget3, {} );
-
-	var instance = new $.ui.testWidget3({});
-	instance.method( "level 1" );
-
-	delete $.ui.testWidget3;
-	delete $.ui.testWidget2;
-});
-
-test( "redefine - widgetEventPrefix", function() {
-	expect( 2 );
-
-	$.widget( "ui.testWidget", {
-		widgetEventPrefix: "test"
-	});
-	equal( $.ui.testWidget.prototype.widgetEventPrefix, "test",
-		"cusotm prefix in original" );
-
-	$.widget( "ui.testWidget", $.ui.testWidget, {} );
-	equal( $.ui.testWidget.prototype.widgetEventPrefix, "test",
-		"cusotm prefix in extension" );
-
-});
-
-test( "mixins", function() {
-	expect( 2 );
-
-	var mixin = {
-		method: function() {
-			return "mixed " + this._super();
-		}
-	};
-
-	$.widget( "ui.testWidget1", {
-		method: function() {
-			return "testWidget1";
-		}
-	});
-	$.widget( "ui.testWidget2", {
-		method: function() {
-			return "testWidget2";
-		}
-	});
-	$.widget( "ui.testWidget1", $.ui.testWidget1, mixin );
-	$.widget( "ui.testWidget2", $.ui.testWidget2, mixin );
-
-	equal( $( "<div>" ).testWidget1().testWidget1( "method" ),
-		"mixed testWidget1", "testWidget1 mixin successful" );
-	equal( $( "<div>" ).testWidget2().testWidget2( "method" ),
-		"mixed testWidget2", "testWidget2 mixin successful" );
-});
-
-asyncTest( "_delay", function() {
-	expect( 6 );
-	var order = 0,
-		that;
-	$.widget( "ui.testWidget", {
-		defaultElement: null,
-		_create: function() {
-			that = this;
-			var timer = this._delay(function() {
-				strictEqual( this, that );
-				equal( order, 1 );
-				start();
-			}, 500);
-			ok( timer !== undefined );
-			timer = this._delay("callback");
-			ok( timer !== undefined );
-		},
-		callback: function() {
-			strictEqual( this, that );
-			equal( order, 0 );
-			order += 1;
-		}
-	});
-	$( "#widget" ).testWidget();
-});
-
-test( "$.widget.bridge()", function() {
-	expect( 14 );
-
-	var instance, ret,
-		elem = $( "<div>" );
-
-	function TestWidget( options, element ) {
-		deepEqual( options, { foo: "bar" }, "options passed" );
-		strictEqual( element, elem[ 0 ], "element passed" );
-	}
-
-	$.extend( TestWidget.prototype, {
-		method: function( param ) {
-			ok( true, "method called via .pluginName(methodName)" );
-			equal( param, "value1",
-				"parameter passed via .pluginName(methodName, param)" );
-		},
-		getter: function() {
-			return "qux";
-		},
-		option: function( options ) {
-			deepEqual( options, {} );
-		}
-	});
-
-	$.widget.bridge( "testWidget", TestWidget );
-
-	ok( $.isFunction( $.fn.testWidget ), "jQuery plugin was created" );
-
-	strictEqual( elem.testWidget({ foo: "bar" }), elem, "plugin returns original jQuery object" );
-	instance = elem.data( "testWidget" );
-	equal( typeof instance, "object", "instance stored in .data(pluginName)" );
-	equal( typeof elem.testWidget( "instance" ), "object", "also retrievable via instance method" );
-
-	ret = elem.testWidget( "method", "value1" );
-	equal( ret, elem, "jQuery object returned from method call" );
-
-	ret = elem.testWidget( "getter" );
-	equal( ret, "qux", "getter returns value" );
-
-	elem.testWidget();
-	ok( true, "_init is optional" );
-
-	TestWidget.prototype._init = function() {
-		ok( "_init", "_init now exists, so its called" );
-	};
-	elem.testWidget();
-});
-
-test( "$.widget.bridge() - widgetFullName", function() {
-	expect( 1 );
-
-	var instance,
-		elem = $( "<div>" );
-
-	function TestWidget() {}
-	TestWidget.prototype.widgetFullName = "custom-widget";
-	$.widget.bridge( "testWidget", TestWidget );
-
-	elem.testWidget();
-	instance = elem.data( "custom-widget" );
-	equal( typeof instance, "object", "instance stored in .data(widgetFullName)" );
-});
-
-} );
diff --git a/tests/unit/widget/widget_extend.js b/tests/unit/widget/widget_extend.js
deleted file mode 100644
index a5a8cccaa..000000000
--- a/tests/unit/widget/widget_extend.js
+++ /dev/null
@@ -1,112 +0,0 @@
-define( [
-	"jquery",
-	"ui/widget"
-], function( $ ) {
-
-test( "$.widget.extend()", function() {
-	expect( 27 );
-
-	var ret, empty, optionsWithLength, optionsWithDate, myKlass, customObject, optionsWithCustomObject, nullUndef,
-		target, recursive, obj, input, output,
-		settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-		options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
-		optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
-		merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
-		deep1 = { foo: { bar: true } },
-		deep2 = { foo: { baz: true }, foo2: document },
-		deep2copy = { foo: { baz: true }, foo2: document },
-		deepmerged = { foo: { bar: true, baz: true }, foo2: document },
-		arr = [1, 2, 3],
-		nestedarray = { arr: arr },
-		defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-		options1 = { xnumber2: 1, xstring2: "x" },
-		options1Copy = { xnumber2: 1, xstring2: "x" },
-		options2 = { xstring2: "xx", xxx: "newstringx" },
-		options2Copy = { xstring2: "xx", xxx: "newstringx" },
-		merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
-
-	$.widget.extend( settings, options );
-	deepEqual( settings, merged, "Check if extended: settings must be extended" );
-	deepEqual( options, optionsCopy, "Check if not modified: options must not be modified" );
-
-	$.widget.extend( deep1, deep2 );
-	deepEqual( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );
-	deepEqual( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
-	equal( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
-
-	strictEqual( $.widget.extend({}, nestedarray).arr, arr, "Don't clone arrays" );
-	ok( $.isPlainObject( $.widget.extend({ arr: arr }, { arr: {} }).arr ), "Cloned object heve to be an plain object" );
-
-	empty = {};
-	optionsWithLength = { foo: { length: -1 } };
-	$.widget.extend( empty, optionsWithLength );
-	deepEqual( empty.foo, optionsWithLength.foo, "The length property must copy correctly" );
-
-	empty = {};
-	optionsWithDate = { foo: { date: new Date() } };
-	$.widget.extend( empty, optionsWithDate );
-	deepEqual( empty.foo, optionsWithDate.foo, "Dates copy correctly" );
-
-	myKlass = function() {};
-	customObject = new myKlass();
-	optionsWithCustomObject = { foo: { date: customObject } };
-	empty = {};
-	$.widget.extend( empty, optionsWithCustomObject );
-	strictEqual( empty.foo.date, customObject, "Custom objects copy correctly (no methods)" );
-
-	// Makes the class a little more realistic
-	myKlass.prototype = { someMethod: function(){} };
-	empty = {};
-	$.widget.extend( empty, optionsWithCustomObject );
-	strictEqual( empty.foo.date, customObject, "Custom objects copy correctly" );
-
-	ret = $.widget.extend({ foo: 4 }, { foo: Number(5) } );
-	equal( ret.foo, 5, "Wrapped numbers copy correctly" );
-
-	nullUndef = $.widget.extend( {}, options, { xnumber2: null } );
-	strictEqual( nullUndef.xnumber2, null, "Check to make sure null values are copied");
-
-	nullUndef = $.widget.extend( {}, options, { xnumber2: undefined } );
-	strictEqual( nullUndef.xnumber2, options.xnumber2, "Check to make sure undefined values are not copied");
-
-	nullUndef = $.widget.extend( {}, options, { xnumber0: null } );
-	strictEqual( nullUndef.xnumber0, null, "Check to make sure null values are inserted");
-
-	target = {};
-	recursive = { foo:target, bar:5 };
-	$.widget.extend( target, recursive );
-	deepEqual( target, { foo: {}, bar: 5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" );
-
-	ret = $.widget.extend( { foo: [] }, { foo: [0] } ); // 1907
-	equal( ret.foo.length, 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" );
-
-	ret = $.widget.extend( { foo: "1,2,3" }, { foo: [ 1, 2, 3 ] } );
-	deepEqual( ret.foo, [ 1, 2, 3 ], "Properly extend a string to array." );
-
-	ret = $.widget.extend( { foo: "1,2,3" }, { foo: { to: "object" } } );
-	deepEqual( ret.foo, { to: "object" }, "Properly extend a string to object." );
-
-	ret = $.widget.extend( { foo: "bar" }, { foo: null } );
-	strictEqual( ret.foo, null, "Make sure a null value doesn't crash with deep extend, for #1908" );
-
-	obj = { foo: null };
-	$.widget.extend( obj, { foo:"notnull" } );
-	equal( obj.foo, "notnull", "Make sure a null value can be overwritten" );
-
-	settings = $.widget.extend( {}, defaults, options1, options2 );
-	deepEqual( settings, merged2, "Check if extended: settings must be extended" );
-	deepEqual( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );
-	deepEqual( options1, options1Copy, "Check if not modified: options1 must not be modified" );
-	deepEqual( options2, options2Copy, "Check if not modified: options2 must not be modified" );
-
-	input = {
-		key: [ 1, 2, 3 ]
-	};
-	output = $.widget.extend( {}, input );
-	deepEqual( input, output, "don't clone arrays" );
-	input.key[0] = 10;
-	deepEqual( input, output, "don't clone arrays" );
-});
-
-} );
-- 
cgit v1.2.3