diff --git a/css/structure/jquery.mobile.button.css b/css/structure/jquery.mobile.button.css
index 71b9480..ea49e4a 100644
--- a/css/structure/jquery.mobile.button.css
+++ b/css/structure/jquery.mobile.button.css
@@ -1,10 +1,11 @@
 .ui-btn { display: block; text-align: center; cursor:pointer; position: relative; margin: .5em 0; padding: 0; }
 .ui-mini { margin-top: .25em; margin-bottom: .25em; }
 .ui-btn-left, .ui-btn-right, .ui-input-clear, .ui-btn-inline,
-.ui-block-a > .ui-btn, .ui-block-b > .ui-btn, .ui-block-c > .ui-btn, .ui-block-d > .ui-btn, .ui-block-e > .ui-btn { margin-right: 5px; margin-left: 5px; }
+.ui-grid-a .ui-btn, .ui-grid-b .ui-btn, .ui-grid-c .ui-btn, .ui-grid-d .ui-btn, .ui-grid-e .ui-btn, .ui-grid-solo .ui-btn { margin-right: 5px; margin-left: 5px; }
 .ui-btn-inner { font-size: 16px; padding: .6em 20px; min-width: .75em; display: block; position: relative; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; zoom: 1; }
 .ui-btn input, .ui-btn button { z-index: 2; }
 .ui-btn-left, .ui-btn-right, .ui-btn-inline { display: inline-block; vertical-align: middle; }
+.ui-mobile .ui-btn-left, .ui-mobile .ui-btn-right { margin: 0; } /* .ui-mobile to increase specificity level */
 .ui-btn-block { display: block; }
 
 .ui-header > .ui-btn,
diff --git a/css/structure/jquery.mobile.controlgroup.css b/css/structure/jquery.mobile.controlgroup.css
index 6d02319..3d355ae 100644
--- a/css/structure/jquery.mobile.controlgroup.css
+++ b/css/structure/jquery.mobile.controlgroup.css
@@ -4,7 +4,6 @@
 .ui-bar .ui-controlgroup { margin: 0 5px; }
 
 .ui-controlgroup-label { font-size: 16px; line-height: 1.4; font-weight: normal; margin: 0 0 .4em; }
-.ui-controlgroup-controls { display: block; width: 100%;}
 .ui-controlgroup li { list-style: none; }
 .ui-controlgroup-vertical .ui-btn,
 .ui-controlgroup-vertical .ui-checkbox, .ui-controlgroup-vertical .ui-radio { margin: 0; border-bottom-width: 0; }
@@ -14,13 +13,15 @@
 .ui-controlgroup .ui-btn-icon-notext { width: auto; height: auto; top: auto; }
 .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner { height: 20px; padding: .6em 20px .6em 20px }
 .ui-controlgroup-horizontal .ui-btn-icon-notext .ui-btn-inner { width: 18px; }
-.ui-controlgroup.ui-mini .ui-btn-icon-notext .ui-btn-inner { height: 16px; padding: .55em 11px .5em 11px; }
+.ui-controlgroup.ui-mini .ui-btn-icon-notext .ui-btn-inner,
+.ui-header .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner,
+.ui-footer .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner { height: 16px; padding: .55em 11px .5em 11px; }
 .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner .ui-icon { position: absolute; top: 50%; right: 50%; margin: -9px -9px 0 0; }
 
 .ui-controlgroup-horizontal .ui-controlgroup-controls:before,
 .ui-controlgroup-horizontal .ui-controlgroup-controls:after { content: ""; display: table; }
 .ui-controlgroup-horizontal .ui-controlgroup-controls:after { clear: both; }
-.ui-controlgroup-horizontal .ui-controlgroup-controls { zoom: 1; }
+.ui-controlgroup-horizontal .ui-controlgroup-controls { display: inline-block; vertical-align: middle; zoom: 1; }
 .ui-controlgroup-horizontal .ui-btn-inner { text-align: center; }
 .ui-controlgroup-horizontal.ui-mini .ui-btn-inner { height: 16px; line-height: 16px; }
 .ui-controlgroup-horizontal .ui-btn, .ui-controlgroup-horizontal .ui-select,
diff --git a/css/structure/jquery.mobile.core.css b/css/structure/jquery.mobile.core.css
index 197a5bf..dc37d84 100644
--- a/css/structure/jquery.mobile.core.css
+++ b/css/structure/jquery.mobile.core.css
@@ -4,7 +4,7 @@
 .ui-mobile a img, .ui-mobile fieldset { border-width: 0; }
 
 /* responsive page widths */
-.ui-mobile-viewport { margin: 0; overflow-x: visible; -webkit-text-size-adjust: none; -ms-text-size-adjust:none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
+.ui-mobile-viewport { margin: 0; overflow-x: visible; -webkit-text-size-adjust: 100%; -ms-text-size-adjust:none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
 /* Issue #2066 */
 body.ui-mobile-viewport,
 div.ui-mobile-viewport { overflow-x: hidden; }
diff --git a/css/structure/jquery.mobile.forms.slider.css b/css/structure/jquery.mobile.forms.slider.css
index 4c92457..9661654 100644
--- a/css/structure/jquery.mobile.forms.slider.css
+++ b/css/structure/jquery.mobile.forms.slider.css
@@ -4,8 +4,9 @@ input.ui-slider-input,
 input.ui-slider-input.ui-mini,
 .ui-field-contain input.ui-slider-input.ui-mini { width: 45px; margin: .25em 0; font-size: 14px; }
 .ui-field-contain input.ui-slider-input { margin: 0; }
-/* To do: Exclude ui-slider-input from textinput widget initSelector. The class ui-input-text is added to the slider input and label. When this is fixed, the rule below can be deleted. */
 input.ui-slider-input, .ui-field-contain input.ui-slider-input { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; -ms-box-sizing: content-box; box-sizing: content-box; }
+/* Fixes input fields being to small on Safari/Mac because of the up and down arrows. */
+.ui-slider-input::-webkit-outer-spin-button { margin: 0; }
 select.ui-slider-switch { display: none; }
 div.ui-slider { position: relative; display: inline-block; overflow: visible; height: 15px; padding: 0; margin: 0 2% 0 20px; top: 4px; width: 65%; }
 div.ui-slider-mini { height: 12px; margin-left: 10px; top: 2px; }
diff --git a/docs/_assets/css/jqm-docs.css b/docs/_assets/css/jqm-docs.css
index c2eb5ea..2dd55ec 100644
--- a/docs/_assets/css/jqm-docs.css
+++ b/docs/_assets/css/jqm-docs.css
@@ -145,7 +145,6 @@ dd h4 { margin:15px 0 0 0; }
 		
 .localnav {
 	margin:0 0 20px 0;
-	overflow:hidden;
 }
 .localnav li {
 	float:left;
diff --git a/docs/lists/docs-lists.html b/docs/lists/docs-lists.html
index 99d37d5..6abe2f9 100644
--- a/docs/lists/docs-lists.html
+++ b/docs/lists/docs-lists.html
@@ -81,7 +81,7 @@ <h2>Autodividers</h2>
 
 			<p>Une liste peut être configurée pour générer automatiquement des séparateurs pour ces éléments. Cela est possible en ajoutant un attribut <code>data-autodividers="true"</code> à n'importe quelle liste.</p>
 
-			<p>Par défaut, le texte utilisé pour créer des séparations est la première lettre en majuscule du texte du lien de l'élément (pour les listes de liens) ou le texte de l'élément (pour les listes en lecture seule). Alternativement, si vous utilisez des éléments de liste  formatée, vous pouvez spécifier le texte diviseur en définissant l'option <code>autodividersSelector</code>  sur la liste par programmation. Par exemple, pour ajouter un sélecteur personnalisé à l'élément avec <code>id="mylistview"</code> :</p>
+			<p>Par défaut, le texte utilisé pour créer des séparations est la première lettre en majuscule du texte de l'élément. Alternativement, vous pouvez spécifier un texte de séparation en paramétrant l'option <code>autodividersSelector</code>  sur la liste par programmation. Par exemple, pour ajouter un sélecteur personnalisé à l'élément avec <code>id="mylistview"</code> :</p>
 
 <pre><code>
 $("#mylistview").listview({
@@ -97,6 +97,8 @@ <h2>Autodividers</h2>
 });
 </code></pre>
 
+			<p>Notez que si vous utilisez des éléments de liste formatés qui contiennent un élément flottant (par exemple <code>ui-li-aside</code>), cet élément précède ses frères et sœurs quelle que soit l'ordre dans votre balisage HTML. De ce fait, le premier caractère de l'élément flottant est utilisé comme texte de séparation. Par conséquent, il est recommandé de spécifier le texte de séparation dans ce cas.</p>
+			
 			<p>Si de nouveaux éléments sont ajoutés ou retirés de la liste, les séparateurs  <em>ne sont pas</em> automatiquement mis à jour : vous devez appeler <code>refresh()</code> sur la liste pour redessiner les séparateurs.</p>
 
 			<a href="lists-autodividers.html" data-role="button" data-icon="arrow-r" data-iconpos="right">Exemple Autodividers</a>
diff --git a/docs/lists/lists-autodividers.html b/docs/lists/lists-autodividers.html
index aa8634b..ff282a4 100644
--- a/docs/lists/lists-autodividers.html
+++ b/docs/lists/lists-autodividers.html
@@ -59,7 +59,7 @@ <h3>Aussi dans cette rubrique</h3>
 						<ul data-role="listview" data-theme="c" data-dividertheme="d">
 
 							<li data-role="list-divider">Listes</li>
-							<li><a href="docs-lists.html">Conventions balisage des listes</a></li>
+							<li><a href="docs-lists.html">Listes de bases &amp; API</a></li>
 							<li><a href="lists-ul.html">Liste chainée de base</a></li>
 							<li><a href="lists-nested.html">Liste imbriquée</a></li>
 							<li><a href="lists-ol.html">Liste numérotée</a></li>
@@ -76,6 +76,7 @@ <h3>Aussi dans cette rubrique</h3>
 							<li><a href="lists-search.html">Barre de filtre de recherche</a></li>
 							<li><a href="lists-search-inset.html">Encart barre de filtre de recherche</a></li>
 							<li><a href="lists-search-with-dividers.html">Barre de filtre de recherche avec séparateurs</a></li>
+							<li><a href="lists-search-filtertext.html">Filtre de recherche des données cachées</a></li>
 
 							<li><a href="lists-readonly.html">Listes en lecture seule</a></li>
 							<li><a href="lists-readonly-inset.html">Encart listes en lecture seule</a></li>
diff --git a/docs/lists/lists-search-filtertext.html b/docs/lists/lists-search-filtertext.html
index 009c134..35fa6e6 100644
--- a/docs/lists/lists-search-filtertext.html
+++ b/docs/lists/lists-search-filtertext.html
@@ -60,6 +60,7 @@ <h3>Aussi dans cette rubrique</h3>
 
 							<li><a href="lists-split.html">Liste de bouton séparé</a></li>	
 							<li><a href="lists-divider.html">Séparateurs de liste</a></li>
+							<li><a href="lists-autodividers.html">Autodividers</a></li>
 							<li><a href="lists-count.html">Bulle compteur</a></li>
 							<li><a href="lists-thumbnails.html">Miniatures</a></li>
 							<li><a href="lists-icons.html">Icônes</a></li>
diff --git a/docs/pages/popup/index.html b/docs/pages/popup/index.html
index 343d786..6ab6fc0 100644
--- a/docs/pages/popup/index.html
+++ b/docs/pages/popup/index.html
@@ -154,7 +154,7 @@ <h2>Appel du plugin popup</h2>
 		<p>Ce plugin sera auto-initialiser sur n'importe quelle page qui contient un div avec l'attribut <code>data-role="popup"</code>. Cependant, si nécessaire, vous pouvez appeler directement le plugin <code>popup</code> sur n'importe quel sélecteur, comme n'importe quel plugin jQuery et travailler par programmation avec l'API du popup via les <a href="options.html">options</a>, les <a href="methods.html">méthodes</a> et les <a href="events.html">événements</a> :</p>
 		
 <pre><code>
-$('#myPopupDiv').popup();
+$( "#myPopupDiv" ).popup();
 </code></pre>
 
 		<h2>Ouverture des popups</h2>
@@ -162,14 +162,14 @@ <h2>Ouverture des popups</h2>
 		<p>En utilisant la configuration basée sur le balisage, lorsqu'un lien avec <code>data-rel="popup"</code> est touché, le conteneur du popup correspondant à l'id référencé dans le <code>href</code> du lien sera affiché. Pour ouvrir un popup par programmation, appelez le popup avec la méthode <code>open</code> sur le conteneur du popup :</p>
 		
 <pre><code>
-$('#myPopupDiv').popup("open")
+$( "#myPopupDiv" ).popup( "open" )
 </code></pre>
 
 		<h2>Fermeture des popups</h2>
 		<p>Les popups peuvent être fermés soit en cliquant en dehors du widget popup, soit en pressant la touche <code>Esc</code>. Les popups peuvent aussi être fermés via la méthode <code>close</code> :
 			
 <pre><code>
-$('#myPopupDiv').popup("close")
+$( "#myPopupDiv" ).popup( "close" )
 </code></pre>
 			
 			<p>Pour ajouter un bouton fermer explicite au popup, ajoutez un lien avec le rôle button dans le conteneur du popup avec un attribut <code>data-rel="back"</code> qui fermera le popup lorsqu'il sera touché. Nous avons créer des classes d'aide pour positionner les boutons dans le coin supérieur gauche (<code>ui-btn-left</code>) ou le coin supérieur droit (<code>ui-btn-right</code>) du popup, mais vous devrez peut-être modifier ou ajouter ces styles de positionnement selon votre conception. Nous recommandons de'ajouter un espacement de contenu standard pour la popup pour faire de la place pour les boutons (voir la section suivante).</p>
@@ -280,7 +280,7 @@ <h2>Paramétrage des transitions</h2>
 			<p>Je suis une simple popup.</p>
 		</div>
 											
-		<p>Lorsque vous lancez le popup depuis l'un des boutons, la <code>data-transition</code> donnée pour ce bouton sera utilisée. Toutefois, si vous lancez la popup par par programmation, comme <code>$("#transitionExample").popup("open")</code>, l'attribut <code>data-transition</code> spécifié dans la définition de la popup sera utilisé si elle est définie.</p>
+		<p>Lorsque vous lancez le popup depuis l'un des boutons, la <code>data-transition</code> donnée pour ce bouton sera utilisée. Toutefois, si vous lancez la popup par par programmation, comme <code>$("#transitionExample").popup("open")</code>, l'attribut <code>data-transition</code> spécifié dans la définition de la popup sera utilisé si elle est présente.</p>
 		
 
 		<h2>Thématisation du popup et de son fond</h2>
@@ -321,8 +321,8 @@ <h2>Remarque : Le chainage des popups n'est pas permis</h2>
 		<p>Le framework ne prend pas en charge le chaînage des popups car il n'est pas possible d'intégrer un lien d'un popup à l'intérieur d'un autre popup. Tous les liens avec <code>data-rel="popup"</code> à l'intérieur d'un popup ne fera rien du tout.</p>
 		<p>Cela signifie également que des menus de sélection ne fonctionneront pas à l'intérieur des popups, car ils sont eux-mêmes implémentés en utilisant des popups. Si vous placez un menu de sélection dans une popup, il sera rendu sous la forme d'un menu natif de sélection, même si vous spécifiez <code>data-native-menu="false"</code>.</p>
 		
-		<div align="right"><a href="popup-images.html" data-ajax="false" data-role="button" data-icon="arrow-r" data-iconpos="right" data-inline="false" align="right">Exemples avancés de popup</a>
-		</div>
+		<br>
+		<a href="popup-images.html" data-ajax="false" data-role="button" data-inline="true" data-icon="arrow-r" data-iconpos="right">Mise à l'échelle des images</a> <a href="popup-iframes.html" data-ajax="false" data-role="button" data-inline="true" data-icon="arrow-r" data-iconpos="right">iframes de carte + vidéo</a> <a href="popup-panels.html" data-ajax="false" data-role="button" data-inline="true" data-icon="arrow-r" data-iconpos="right">Panneaux de recouvrement</a>
 
 	</div><!--/content-primary -->
 
diff --git a/docs/pages/popup/map.html b/docs/pages/popup/map.html
index 068a676..5c947aa 100644
--- a/docs/pages/popup/map.html
+++ b/docs/pages/popup/map.html
@@ -19,6 +19,7 @@
 	<style>
 		html {
 			height: 100%;
+			overflow: hidden;
 		}
 		body {
 			margin: 0;
diff --git a/docs/pages/popup/methods.html b/docs/pages/popup/methods.html
index ced6f37..487b554 100644
--- a/docs/pages/popup/methods.html
+++ b/docs/pages/popup/methods.html
@@ -42,7 +42,7 @@ <h2>Popup</h2>
 			<dt><code>open( options )</code> affiche la popup en utilisant les options spécifiées</dt>
 			<dd>
 				<pre><code>
-$('.selector').popup('open', options);
+$( ".selector" ).popup( "open", options);
 				</code></pre>
 				<p><code>options</code> est un objet littéral qui peut avoir les propriétés suivantes :</p>
 				<table>
@@ -67,7 +67,7 @@ <h2>Popup</h2>
 			<dt><code>close</code> ferme un popup ouvert</dt>
 			<dd>
 				<pre><code>
-$('.selector').popup('close');
+$( ".selector" ).popup( "close" );
 				</code></pre>
 			</dd>
 		</dl>
diff --git a/docs/pages/popup/options.html b/docs/pages/popup/options.html
index 2a5a933..7662852 100644
--- a/docs/pages/popup/options.html
+++ b/docs/pages/popup/options.html
@@ -44,7 +44,7 @@ <h2>Popup</h2>
 			<dd>
 				<p class="default">Par défaut : true</p>
 				<p>Définit s'il faut dessiner un popup avec des coins arrondis. Cette option est également définie comme un attribut de données : <code>data-corners="true"</code></p>
-				<pre><code>$('.selector').popup(<strong>{ corners: true }</strong>);</code></pre>
+				<pre><code>$( ".selector" ).popup(<strong>{ corners: true }</strong>);</code></pre>
 			</dd>
 			
 			<dt><code>initSelector</code> <em>CSS selector string</em></dt>
@@ -61,7 +61,7 @@ <h2>Popup</h2>
 			<dd>
 				<p class="default">par défaut : null</p>
 				<p>Définit le jeu de couleurs (nuancier) pour le fond du popup, qui recouvre entièrement la fenêtre. S'il n'est pas explicitement définie, le fond sera transparent.</p>
-				<pre><code>$('.selector').popup(<strong>{ overlayTheme: "a" }</strong>);</code></pre>
+				<pre><code>$( ".selector" ).popup(<strong>{ overlayTheme: "a" }</strong>);</code></pre>
 				 <p>Cette option est également définie comme un attribut de données : <code>data-overlay-theme="a"</code></p>
 			</dd>
 
@@ -87,14 +87,14 @@ <h2>Popup</h2>
 			<dd>
 				<p class="default">Par défaut : true</p>
 				<p>Définit s'il faut dessiner une ombre autour du popup. Cette option est également définie comme un attribut de données : <code>data-shadow="true"</code></p>
-				<pre><code>$('.selector').popup(<strong>{ shadow: true }</strong>);</code></pre>
+				<pre><code>$( ".selector" ).popup(<strong>{ shadow: true }</strong>);</code></pre>
 			</dd>
 			
 			<dt><code>theme</code> <em>string</em></dt>
 			<dd>
 				<p class="default">par défaut : null</p>
 				<p>Définit le jeu de couleurs (nuancier) pour le contenu du popup. Sauf si il est explicitement défini à <code>'none'</code>, le thème pour le popup sera défini la première fois par l'héritage du thème de la page ou en cas d'échec par la valeur <code>'c'</code> codé en dur. Si vous le définissez à 'none', le popup n'aura pas de thème du tout, et sera transparente.</p>
-				<pre><code>$('.selector').popup(<strong>{ theme: "a" }</strong>);</code></pre>
+				<pre><code>$( ".selector" ).popup(<strong>{ theme: "a" }</strong>);</code></pre>
 				 <p>Cette option est également définie comme un attribut de données : <code>data-theme="a"</code></p>
 			</dd>
 
diff --git a/docs/pages/popup/popup-examples.css b/docs/pages/popup/popup-examples.css
index bbb5ded..40b89a8 100644
--- a/docs/pages/popup/popup-examples.css
+++ b/docs/pages/popup/popup-examples.css
@@ -1,3 +1,5 @@
+iframe { border: none; }
+
 #popupPanel-popup {
 	right: 0 !important;
 	left: auto !important;
diff --git a/docs/pages/popup/popup-examples.js b/docs/pages/popup/popup-examples.js
index df48408..73c6b03 100644
--- a/docs/pages/popup/popup-examples.js
+++ b/docs/pages/popup/popup-examples.js
@@ -92,7 +92,7 @@ $( document ).on( "pageinit", function() {
 	});
 		 
 	$( "#popupPanel button" ).on( "click", function() {	
-		$( this ).closest( ".ui-popup" ).popup('close');
+		$( "#popupPanel" ).popup('close');
 	});
 
 });
\ No newline at end of file
diff --git a/docs/pages/popup/popup-iframes.html b/docs/pages/popup/popup-iframes.html
index 37d4b05..32c7eda 100644
--- a/docs/pages/popup/popup-iframes.html
+++ b/docs/pages/popup/popup-iframes.html
@@ -159,20 +159,13 @@ <h3><code>map.html</code></h3>
                 mapTypeId: google.maps.MapTypeId.ROADMAP
             }
             var map = new google.maps.Map( document.getElementById( "map_canvas" ), myOptions );
-            var marker = new google.maps.Marker({
-                position: myLatlng, 
-                map: map,
-                title: "Université de Westminster"
-            }); 
-            google.maps.event.addListener( map, 'bounds_changed', function() {
-                map.panTo( myLatlng );
-            }); 
         }
     &lt;/script&gt;
     &lt;script src="http://maps.google.com/maps/api/js?sensor=false"&gt;&lt;/script&gt;
     &lt;style&gt;
         html {
             height: 100%;
+            overflow: hidden;
         }
         body {
             margin: 0;
diff --git a/external/qunit.css b/external/qunit.css
index 705ec9c..fcb435f 100644
--- a/external/qunit.css
+++ b/external/qunit.css
@@ -1,9 +1,9 @@
 /**
- * QUnit - A JavaScript Unit Testing Framework
+ * QUnit v1.9.0 - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
@@ -38,10 +38,10 @@
 	line-height: 1em;
 	font-weight: normal;
 
-	border-radius: 15px 15px 0 0;
-	-moz-border-radius: 15px 15px 0 0;
-	-webkit-border-top-right-radius: 15px;
-	-webkit-border-top-left-radius: 15px;
+	border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-top-right-radius: 5px;
+	-webkit-border-top-left-radius: 5px;
 }
 
 #qunit-header a {
@@ -54,6 +54,11 @@
 	color: #fff;
 }
 
+#qunit-testrunner-toolbar label {
+	display: inline-block;
+	padding: 0 .5em 0 .1em;
+}
+
 #qunit-banner {
 	height: 5px;
 }
@@ -108,13 +113,9 @@
 
 	background-color: #fff;
 
-	border-radius: 15px;
-	-moz-border-radius: 15px;
-	-webkit-border-radius: 15px;
-
-	box-shadow: inset 0px 2px 13px #999;
-	-moz-box-shadow: inset 0px 2px 13px #999;
-	-webkit-box-shadow: inset 0px 2px 13px #999;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 }
 
 #qunit-tests table {
@@ -157,8 +158,7 @@
 #qunit-tests b.failed                       { color: #710909; }
 
 #qunit-tests li li {
-	margin: 0.5em;
-	padding: 0.4em 0.5em 0.4em 0.5em;
+	padding: 5px;
 	background-color: #fff;
 	border-bottom: none;
 	list-style-position: inside;
@@ -167,9 +167,9 @@
 /*** Passing Styles */
 
 #qunit-tests li li.pass {
-	color: #5E740B;
+	color: #3c510c;
 	background-color: #fff;
-	border-left: 26px solid #C6E746;
+	border-left: 10px solid #C6E746;
 }
 
 #qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
@@ -185,15 +185,15 @@
 #qunit-tests li li.fail {
 	color: #710909;
 	background-color: #fff;
-	border-left: 26px solid #EE5757;
+	border-left: 10px solid #EE5757;
 	white-space: pre;
 }
 
 #qunit-tests > li:last-child {
-	border-radius: 0 0 15px 15px;
-	-moz-border-radius: 0 0 15px 15px;
-	-webkit-border-bottom-right-radius: 15px;
-	-webkit-border-bottom-left-radius: 15px;
+	border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
 }
 
 #qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
@@ -216,6 +216,9 @@
 
 	border-bottom: 1px solid white;
 }
+#qunit-testresult .module-name {
+	font-weight: bold;
+}
 
 /** Fixture */
 
@@ -223,9 +226,11 @@
 	position: absolute;
 	top: -10000px;
 	left: -10000px;
+	width: 1000px;
+	height: 1000px;
 }
 
 [data-nstest-role='page'], [data-nstest-role='dialog'] {
   position: absolute !important;
   top: -10000px !important;
-}
+}
\ No newline at end of file
diff --git a/external/qunit.js b/external/qunit.js
index b065db8..458425c 100644
--- a/external/qunit.js
+++ b/external/qunit.js
@@ -1,77 +1,96 @@
 /**
- * QUnit - A JavaScript Unit Testing Framework
+ * QUnit v1.9.0 - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
 
-(function(window) {
+(function( window ) {
 
-var defined = {
+var QUnit,
+	config,
+	onErrorFnPrev,
+	testId = 0,
+	fileName = (sourceFromStacktrace( 0 ) || "" ).replace(/(:\d+)+\)?/, "").replace(/.+\//, ""),
+	toString = Object.prototype.toString,
+	hasOwn = Object.prototype.hasOwnProperty,
+	defined = {
 	setTimeout: typeof window.setTimeout !== "undefined",
 	sessionStorage: (function() {
+		var x = "qunit-test-string";
 		try {
-			return !!sessionStorage.getItem;
-		} catch(e) {
+			sessionStorage.setItem( x, x );
+			sessionStorage.removeItem( x );
+			return true;
+		} catch( e ) {
 			return false;
 		}
-	})()
+	}())
 };
 
-var testId = 0;
-
-var Test = function(name, testName, expected, testEnvironmentArg, async, callback) {
-	this.name = name;
-	this.testName = testName;
-	this.expected = expected;
-	this.testEnvironmentArg = testEnvironmentArg;
-	this.async = async;
-	this.callback = callback;
+function Test( settings ) {
+	extend( this, settings );
 	this.assertions = [];
-};
+	this.testNumber = ++Test.count;
+}
+
+Test.count = 0;
+
 Test.prototype = {
 	init: function() {
-		var tests = id("qunit-tests");
-		if (tests) {
-			var b = document.createElement("strong");
-				b.innerHTML = "Running " + this.name;
-			var li = document.createElement("li");
-				li.appendChild( b );
-				li.className = "running";
-				li.id = this.id = "test-output" + testId++;
+		var a, b, li,
+        tests = id( "qunit-tests" );
+
+		if ( tests ) {
+			b = document.createElement( "strong" );
+			b.innerHTML = this.name;
+
+			// `a` initialized at top of scope
+			a = document.createElement( "a" );
+			a.innerHTML = "Rerun";
+			a.href = QUnit.url({ testNumber: this.testNumber });
+
+			li = document.createElement( "li" );
+			li.appendChild( b );
+			li.appendChild( a );
+			li.className = "running";
+			li.id = this.id = "qunit-test-output" + testId++;
+
 			tests.appendChild( li );
 		}
 	},
 	setup: function() {
-		if (this.module != config.previousModule) {
+		if ( this.module !== config.previousModule ) {
 			if ( config.previousModule ) {
-				runLoggingCallbacks('moduleDone', QUnit, {
+				runLoggingCallbacks( "moduleDone", QUnit, {
 					name: config.previousModule,
 					failed: config.moduleStats.bad,
 					passed: config.moduleStats.all - config.moduleStats.bad,
 					total: config.moduleStats.all
-				} );
+				});
 			}
 			config.previousModule = this.module;
 			config.moduleStats = { all: 0, bad: 0 };
-			runLoggingCallbacks( 'moduleStart', QUnit, {
+			runLoggingCallbacks( "moduleStart", QUnit, {
+				name: this.module
+			});
+		} else if ( config.autorun ) {
+			runLoggingCallbacks( "moduleStart", QUnit, {
 				name: this.module
-			} );
+			});
 		}
 
 		config.current = this;
+
 		this.testEnvironment = extend({
 			setup: function() {},
 			teardown: function() {}
-		}, this.moduleTestEnvironment);
-		if (this.testEnvironmentArg) {
-			extend(this.testEnvironment, this.testEnvironmentArg);
-		}
+		}, this.moduleTestEnvironment );
 
-		runLoggingCallbacks( 'testStart', QUnit, {
+		runLoggingCallbacks( "testStart", QUnit, {
 			name: this.testName,
 			module: this.module
 		});
@@ -80,67 +99,92 @@ Test.prototype = {
 		// TODO why??
 		QUnit.current_testEnvironment = this.testEnvironment;
 
+		if ( !config.pollution ) {
+			saveGlobal();
+		}
+		if ( config.notrycatch ) {
+			this.testEnvironment.setup.call( this.testEnvironment );
+			return;
+		}
 		try {
-			if ( !config.pollution ) {
-				saveGlobal();
-			}
-
-			this.testEnvironment.setup.call(this.testEnvironment);
-		} catch(e) {
-			QUnit.ok( false, "Setup failed on " + this.testName + ": " + e.message );
+			this.testEnvironment.setup.call( this.testEnvironment );
+		} catch( e ) {
+			QUnit.pushFailure( "Setup failed on " + this.testName + ": " + e.message, extractStacktrace( e, 1 ) );
 		}
 	},
 	run: function() {
+		config.current = this;
+
+		var running = id( "qunit-testresult" );
+
+		if ( running ) {
+			running.innerHTML = "Running: <br/>" + this.name;
+		}
+
 		if ( this.async ) {
 			QUnit.stop();
 		}
 
 		if ( config.notrycatch ) {
-			this.callback.call(this.testEnvironment);
+			this.callback.call( this.testEnvironment, QUnit.assert );
 			return;
 		}
+
 		try {
-			this.callback.call(this.testEnvironment);
-		} catch(e) {
-			fail("Test " + this.testName + " died, exception and test follows", e, this.callback);
-			QUnit.ok( false, "Died on test #" + (this.assertions.length + 1) + ": " + e.message + " - " + QUnit.jsDump.parse(e) );
+			this.callback.call( this.testEnvironment, QUnit.assert );
+		} catch( e ) {
+			QUnit.pushFailure( "Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + e.message, extractStacktrace( e, 0 ) );
 			// else next test will carry the responsibility
 			saveGlobal();
 
 			// Restart the tests if they're blocking
 			if ( config.blocking ) {
-				start();
+				QUnit.start();
 			}
 		}
 	},
 	teardown: function() {
-		try {
-			this.testEnvironment.teardown.call(this.testEnvironment);
-			checkPollution();
-		} catch(e) {
-			QUnit.ok( false, "Teardown failed on " + this.testName + ": " + e.message );
+		config.current = this;
+		if ( config.notrycatch ) {
+			this.testEnvironment.teardown.call( this.testEnvironment );
+			return;
+		} else {
+			try {
+				this.testEnvironment.teardown.call( this.testEnvironment );
+			} catch( e ) {
+				QUnit.pushFailure( "Teardown failed on " + this.testName + ": " + e.message, extractStacktrace( e, 1 ) );
+			}
 		}
+		checkPollution();
 	},
 	finish: function() {
-		if ( this.expected && this.expected != this.assertions.length ) {
-			QUnit.ok( false, "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run" );
+		config.current = this;
+		if ( config.requireExpects && this.expected == null ) {
+			QUnit.pushFailure( "Expected number of assertions to be defined, but expect() was not called.", this.stack );
+		} else if ( this.expected != null && this.expected != this.assertions.length ) {
+			QUnit.pushFailure( "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack );
+		} else if ( this.expected == null && !this.assertions.length ) {
+			QUnit.pushFailure( "Expected at least one assertion, but none were run - call expect(0) to accept zero assertions.", this.stack );
 		}
 
-		var good = 0, bad = 0,
-			tests = id("qunit-tests");
+		var assertion, a, b, i, li, ol,
+			test = this,
+			good = 0,
+			bad = 0,
+			tests = id( "qunit-tests" );
 
 		config.stats.all += this.assertions.length;
 		config.moduleStats.all += this.assertions.length;
 
 		if ( tests ) {
-			var ol = document.createElement("ol");
+			ol = document.createElement( "ol" );
 
-			for ( var i = 0; i < this.assertions.length; i++ ) {
-				var assertion = this.assertions[i];
+			for ( i = 0; i < this.assertions.length; i++ ) {
+				assertion = this.assertions[i];
 
-				var li = document.createElement("li");
+				li = document.createElement( "li" );
 				li.className = assertion.result ? "pass" : "fail";
-				li.innerHTML = assertion.message || (assertion.result ? "okay" : "failed");
+				li.innerHTML = assertion.message || ( assertion.result ? "okay" : "failed" );
 				ol.appendChild( li );
 
 				if ( assertion.result ) {
@@ -154,49 +198,48 @@ Test.prototype = {
 
 			// store result when possible
 			if ( QUnit.config.reorder && defined.sessionStorage ) {
-				if (bad) {
-					sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad);
+				if ( bad ) {
+					sessionStorage.setItem( "qunit-test-" + this.module + "-" + this.testName, bad );
 				} else {
-					sessionStorage.removeItem("qunit-" + this.module + "-" + this.testName);
+					sessionStorage.removeItem( "qunit-test-" + this.module + "-" + this.testName );
 				}
 			}
 
-			if (bad == 0) {
+			if ( bad === 0 ) {
 				ol.style.display = "none";
 			}
 
-			var b = document.createElement("strong");
+			// `b` initialized at top of scope
+			b = document.createElement( "strong" );
 			b.innerHTML = this.name + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
 
-			var a = document.createElement("a");
-			a.innerHTML = "Rerun";
-			a.href = QUnit.url({ filter: getText([b]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
-
 			addEvent(b, "click", function() {
 				var next = b.nextSibling.nextSibling,
 					display = next.style.display;
 				next.style.display = display === "none" ? "block" : "none";
 			});
 
-			addEvent(b, "dblclick", function(e) {
+			addEvent(b, "dblclick", function( e ) {
 				var target = e && e.target ? e.target : window.event.srcElement;
 				if ( target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b" ) {
 					target = target.parentNode;
 				}
 				if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
-					window.location = QUnit.url({ filter: getText([target]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+					window.location = QUnit.url({ testNumber: test.testNumber });
 				}
 			});
 
-			var li = id(this.id);
+			// `li` initialized at top of scope
+			li = id( this.id );
 			li.className = bad ? "fail" : "pass";
 			li.removeChild( li.firstChild );
+			a = li.firstChild;
 			li.appendChild( b );
-			li.appendChild( a );
+			li.appendChild ( a );
 			li.appendChild( ol );
 
 		} else {
-			for ( var i = 0; i < this.assertions.length; i++ ) {
+			for ( i = 0; i < this.assertions.length; i++ ) {
 				if ( !this.assertions[i].result ) {
 					bad++;
 					config.stats.bad++;
@@ -205,23 +248,23 @@ Test.prototype = {
 			}
 		}
 
-		try {
-			QUnit.reset();
-		} catch(e) {
-			fail("reset() failed, following Test " + this.testName + ", exception and reset fn follows", e, QUnit.reset);
-		}
-
-		runLoggingCallbacks( 'testDone', QUnit, {
+		runLoggingCallbacks( "testDone", QUnit, {
 			name: this.testName,
 			module: this.module,
 			failed: bad,
 			passed: this.assertions.length - bad,
 			total: this.assertions.length
-		} );
+		});
+
+		QUnit.reset();
+
+		config.current = undefined;
 	},
 
 	queue: function() {
-		var test = this;
+		var bad,
+			test = this;
+
 		synchronize(function() {
 			test.init();
 		});
@@ -240,214 +283,288 @@ Test.prototype = {
 				test.finish();
 			});
 		}
+
+		// `bad` initialized at top of scope
 		// defer when previous test run passed, if storage is available
-		var bad = QUnit.config.reorder && defined.sessionStorage && +sessionStorage.getItem("qunit-" + this.module + "-" + this.testName);
-		if (bad) {
+		bad = QUnit.config.reorder && defined.sessionStorage &&
+						+sessionStorage.getItem( "qunit-test-" + this.module + "-" + this.testName );
+
+		if ( bad ) {
 			run();
 		} else {
-			synchronize(run);
-		};
+			synchronize( run, true );
+		}
 	}
-
 };
 
-var QUnit = {
+// Root QUnit object.
+// `QUnit` initialized at top of scope
+QUnit = {
 
 	// call on start of module test to prepend name to all tests
-	module: function(name, testEnvironment) {
+	module: function( name, testEnvironment ) {
 		config.currentModule = name;
 		config.currentModuleTestEnviroment = testEnvironment;
 	},
 
-	asyncTest: function(testName, expected, callback) {
+	asyncTest: function( testName, expected, callback ) {
 		if ( arguments.length === 2 ) {
 			callback = expected;
-			expected = 0;
+			expected = null;
 		}
 
-		QUnit.test(testName, expected, callback, true);
+		QUnit.test( testName, expected, callback, true );
 	},
 
-	test: function(testName, expected, callback, async) {
-		var name = '<span class="test-name">' + testName + '</span>', testEnvironmentArg;
+	test: function( testName, expected, callback, async ) {
+		var test,
+			name = "<span class='test-name'>" + escapeInnerText( testName ) + "</span>";
 
 		if ( arguments.length === 2 ) {
 			callback = expected;
 			expected = null;
 		}
-		// is 2nd argument a testEnvironment?
-		if ( expected && typeof expected === 'object') {
-			testEnvironmentArg = expected;
-			expected = null;
-		}
 
 		if ( config.currentModule ) {
-			name = '<span class="module-name">' + config.currentModule + "</span>: " + name;
+			name = "<span class='module-name'>" + config.currentModule + "</span>: " + name;
 		}
 
-		if ( !validTest(config.currentModule + ": " + testName) ) {
+		test = new Test({
+			name: name,
+			testName: testName,
+			expected: expected,
+			async: async,
+			callback: callback,
+			module: config.currentModule,
+			moduleTestEnvironment: config.currentModuleTestEnviroment,
+			stack: sourceFromStacktrace( 2 )
+		});
+
+		if ( !validTest( test ) ) {
 			return;
 		}
 
-		var test = new Test(name, testName, expected, testEnvironmentArg, async, callback);
-		test.module = config.currentModule;
-		test.moduleTestEnvironment = config.currentModuleTestEnviroment;
 		test.queue();
 	},
 
-	/**
-	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
-	 */
-	expect: function(asserts) {
+	// Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	expect: function( asserts ) {
 		config.current.expected = asserts;
 	},
 
+	start: function( count ) {
+		config.semaphore -= count || 1;
+		// don't start until equal number of stop-calls
+		if ( config.semaphore > 0 ) {
+			return;
+		}
+		// ignore if start is called more often then stop
+		if ( config.semaphore < 0 ) {
+			config.semaphore = 0;
+		}
+		// A slight delay, to avoid any current callbacks
+		if ( defined.setTimeout ) {
+			window.setTimeout(function() {
+				if ( config.semaphore > 0 ) {
+					return;
+				}
+				if ( config.timeout ) {
+					clearTimeout( config.timeout );
+				}
+
+				config.blocking = false;
+				process( true );
+			}, 13);
+		} else {
+			config.blocking = false;
+			process( true );
+		}
+	},
+
+	stop: function( count ) {
+		config.semaphore += count || 1;
+		config.blocking = true;
+
+		if ( config.testTimeout && defined.setTimeout ) {
+			clearTimeout( config.timeout );
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				config.semaphore = 1;
+				QUnit.start();
+			}, config.testTimeout );
+		}
+	}
+};
+
+// Asssert helpers
+// All of these must call either QUnit.push() or manually do:
+// - runLoggingCallbacks( "log", .. );
+// - config.current.assertions.push({ .. });
+QUnit.assert = {
 	/**
-	 * Asserts true.
+	 * Asserts rough true-ish result.
+	 * @name ok
+	 * @function
 	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
 	 */
-	ok: function(a, msg) {
-		a = !!a;
-		var details = {
-			result: a,
-			message: msg
-		};
-		msg = escapeInnerText(msg);
-		runLoggingCallbacks( 'log', QUnit, details );
+	ok: function( result, msg ) {
+		if ( !config.current ) {
+			throw new Error( "ok() assertion outside test context, was " + sourceFromStacktrace(2) );
+		}
+		result = !!result;
+
+		var source,
+			details = {
+				result: result,
+				message: msg
+			};
+
+		msg = escapeInnerText( msg || (result ? "okay" : "failed" ) );
+		msg = "<span class='test-message'>" + msg + "</span>";
+
+		if ( !result ) {
+			source = sourceFromStacktrace( 2 );
+			if ( source ) {
+				details.source = source;
+				msg += "<table><tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr></table>";
+			}
+		}
+		runLoggingCallbacks( "log", QUnit, details );
 		config.current.assertions.push({
-			result: a,
+			result: result,
 			message: msg
 		});
 	},
 
 	/**
-	 * Checks that the first two arguments are equal, with an optional message.
+	 * Assert that the first two arguments are equal, with an optional message.
 	 * Prints out both actual and expected values.
-	 *
-	 * Prefered to ok( actual == expected, message )
-	 *
-	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
-	 *
-	 * @param Object actual
-	 * @param Object expected
-	 * @param String message (optional)
+	 * @name equal
+	 * @function
+	 * @example equal( format( "Received {0} bytes.", 2), "Received 2 bytes.", "format() replaces {0} with next argument" );
 	 */
-	equal: function(actual, expected, message) {
-		QUnit.push(expected == actual, actual, expected, message);
+	equal: function( actual, expected, message ) {
+		QUnit.push( expected == actual, actual, expected, message );
 	},
 
-	notEqual: function(actual, expected, message) {
-		QUnit.push(expected != actual, actual, expected, message);
+	/**
+	 * @name notEqual
+	 * @function
+	 */
+	notEqual: function( actual, expected, message ) {
+		QUnit.push( expected != actual, actual, expected, message );
 	},
 
-	deepEqual: function(actual, expected, message) {
-		QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
+	/**
+	 * @name deepEqual
+	 * @function
+	 */
+	deepEqual: function( actual, expected, message ) {
+		QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
-	notDeepEqual: function(actual, expected, message) {
-		QUnit.push(!QUnit.equiv(actual, expected), actual, expected, message);
+	/**
+	 * @name notDeepEqual
+	 * @function
+	 */
+	notDeepEqual: function( actual, expected, message ) {
+		QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
-	strictEqual: function(actual, expected, message) {
-		QUnit.push(expected === actual, actual, expected, message);
+	/**
+	 * @name strictEqual
+	 * @function
+	 */
+	strictEqual: function( actual, expected, message ) {
+		QUnit.push( expected === actual, actual, expected, message );
 	},
 
-	notStrictEqual: function(actual, expected, message) {
-		QUnit.push(expected !== actual, actual, expected, message);
+	/**
+	 * @name notStrictEqual
+	 * @function
+	 */
+	notStrictEqual: function( actual, expected, message ) {
+		QUnit.push( expected !== actual, actual, expected, message );
 	},
 
-	raises: function(block, expected, message) {
-		var actual, ok = false;
+	throws: function( block, expected, message ) {
+		var actual,
+			ok = false;
 
-		if (typeof expected === 'string') {
+		// 'expected' is optional
+		if ( typeof expected === "string" ) {
 			message = expected;
 			expected = null;
 		}
 
+		config.current.ignoreGlobalErrors = true;
 		try {
-			block();
+			block.call( config.current.testEnvironment );
 		} catch (e) {
 			actual = e;
 		}
+		config.current.ignoreGlobalErrors = false;
 
-		if (actual) {
+		if ( actual ) {
 			// we don't want to validate thrown error
-			if (!expected) {
+			if ( !expected ) {
 				ok = true;
 			// expected is a regexp
-			} else if (QUnit.objectType(expected) === "regexp") {
-				ok = expected.test(actual);
+			} else if ( QUnit.objectType( expected ) === "regexp" ) {
+				ok = expected.test( actual );
 			// expected is a constructor
-			} else if (actual instanceof expected) {
+			} else if ( actual instanceof expected ) {
 				ok = true;
 			// expected is a validation function which returns true is validation passed
-			} else if (expected.call({}, actual) === true) {
+			} else if ( expected.call( {}, actual ) === true ) {
 				ok = true;
 			}
-		}
 
-		QUnit.ok(ok, message);
-	},
-
-	start: function(count) {
-		config.semaphore -= count || 1;
-		if (config.semaphore > 0) {
-			// don't start until equal number of stop-calls
-			return;
-		}
-		if (config.semaphore < 0) {
-			// ignore if start is called more often then stop
-			config.semaphore = 0;
-		}
-		// A slight delay, to avoid any current callbacks
-		if ( defined.setTimeout ) {
-			window.setTimeout(function() {
-				if (config.semaphore > 0) {
-					return;
-				}
-				if ( config.timeout ) {
-					clearTimeout(config.timeout);
-				}
-
-				config.blocking = false;
-				process();
-			}, 13);
+			QUnit.push( ok, actual, null, message );
 		} else {
-			config.blocking = false;
-			process();
+			QUnit.pushFailure( message, null, 'No exception was thrown.' );
 		}
-	},
+	}
+};
 
-	stop: function(count) {
-		config.semaphore += count || 1;
-		config.blocking = true;
+/**
+ * @deprecate since 1.8.0
+ * Kept assertion helpers in root for backwards compatibility
+ */
+extend( QUnit, QUnit.assert );
 
-		if ( config.testTimeout && defined.setTimeout ) {
-			clearTimeout(config.timeout);
-			config.timeout = window.setTimeout(function() {
-				QUnit.ok( false, "Test timed out" );
-				config.semaphore = 1;
-				QUnit.start();
-			}, config.testTimeout);
-		}
-	}
+/**
+ * @deprecated since 1.9.0
+ * Kept global "raises()" for backwards compatibility
+ */
+QUnit.raises = QUnit.assert.throws;
+
+/**
+ * @deprecated since 1.0.0, replaced with error pushes since 1.3.0
+ * Kept to avoid TypeErrors for undefined methods.
+ */
+QUnit.equals = function() {
+	QUnit.push( false, false, false, "QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead" );
+};
+QUnit.same = function() {
+	QUnit.push( false, false, false, "QUnit.same has been deprecated since 2009 (e88049a0), use QUnit.deepEqual instead" );
 };
 
-//We want access to the constructor's prototype
+// We want access to the constructor's prototype
 (function() {
-	function F(){};
+	function F() {}
 	F.prototype = QUnit;
 	QUnit = new F();
-	//Make F QUnit's constructor so that we can add to the prototype later
+	// Make F QUnit's constructor so that we can add to the prototype later
 	QUnit.constructor = F;
-})();
+}());
 
-// Backwards compatibility, deprecated
-QUnit.equals = QUnit.equal;
-QUnit.same = QUnit.deepEqual;
-
-// Maintain internal state
-var config = {
+/**
+ * Config object: Maintain internal state
+ * Later exposed as QUnit.config
+ * `config` initialized at top of scope
+ */
+config = {
 	// The queue of tests to run
 	queue: [],
 
@@ -465,9 +582,25 @@ var config = {
 	// by default, modify document.title when suite is done
 	altertitle: true,
 
-	urlConfig: ['noglobals', 'notrycatch'],
+	// when enabled, all tests must call expect()
+	requireExpects: false,
+
+	// add checkboxes that are persisted in the query-string
+	// when enabled, the id is set to `true` as a `QUnit.config` property
+	urlConfig: [
+		{
+			id: "noglobals",
+			label: "Check for Globals",
+			tooltip: "Enabling this will test if any test introduces new properties on the `window` object. Stored as query-strings."
+		},
+		{
+			id: "notrycatch",
+			label: "No try-catch",
+			tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging exceptions in IE reasonable. Stored as query-strings."
+		}
+	],
 
-	//logging callback queues
+	// logging callback queues
 	begin: [],
 	done: [],
 	log: [],
@@ -477,16 +610,17 @@ var config = {
 	moduleDone: []
 };
 
-// Load paramaters
+// Initialize more QUnit.config and QUnit.urlParams
 (function() {
-	var location = window.location || { search: "", protocol: "file:" },
+	var i,
+		location = window.location || { search: "", protocol: "file:" },
 		params = location.search.slice( 1 ).split( "&" ),
 		length = params.length,
 		urlParams = {},
 		current;
 
 	if ( params[ 0 ] ) {
-		for ( var i = 0; i < length; i++ ) {
+		for ( i = 0; i < length; i++ ) {
 			current = params[ i ].split( "=" );
 			current[ 0 ] = decodeURIComponent( current[ 0 ] );
 			// allow just a key to turn on a flag, e.g., test.html?noglobals
@@ -496,32 +630,39 @@ var config = {
 	}
 
 	QUnit.urlParams = urlParams;
+
+	// String search anywhere in moduleName+testName
 	config.filter = urlParams.filter;
 
+	// Exact match of the module name
+	config.module = urlParams.module;
+
+	config.testNumber = parseInt( urlParams.testNumber, 10 ) || null;
+
 	// Figure out if we're running the tests from a server or not
-	QUnit.isLocal = !!(location.protocol === 'file:');
-})();
+	QUnit.isLocal = location.protocol === "file:";
+}());
 
-// Expose the API as global variables, unless an 'exports'
-// object exists, in that case we assume we're in CommonJS
-if ( typeof exports === "undefined" || typeof require === "undefined" ) {
-	extend(window, QUnit);
+// Export global variables, unless an 'exports' object exists,
+// in that case we assume we're in CommonJS (dealt with on the bottom of the script)
+if ( typeof exports === "undefined" ) {
+	extend( window, QUnit );
+
+	// Expose QUnit object
 	window.QUnit = QUnit;
-} else {
-	extend(exports, QUnit);
-	exports.QUnit = QUnit;
 }
 
-// define these after exposing globals to keep them in these QUnit namespace only
-extend(QUnit, {
+// Extend QUnit object,
+// these after set here because they should not be exposed as global functions
+extend( QUnit, {
 	config: config,
 
 	// Initialize the configuration options
 	init: function() {
-		extend(config, {
+		extend( config, {
 			stats: { all: 0, bad: 0 },
 			moduleStats: { all: 0, bad: 0 },
-			started: +new Date,
+			started: +new Date(),
 			updateRate: 1000,
 			blocking: false,
 			autostart: true,
@@ -531,9 +672,21 @@ extend(QUnit, {
 			semaphore: 0
 		});
 
-		var tests = id( "qunit-tests" ),
-			banner = id( "qunit-banner" ),
-			result = id( "qunit-testresult" );
+		var tests, banner, result,
+			qunit = id( "qunit" );
+
+		if ( qunit ) {
+			qunit.innerHTML =
+				"<h1 id='qunit-header'>" + escapeInnerText( document.title ) + "</h1>" +
+				"<h2 id='qunit-banner'></h2>" +
+				"<div id='qunit-testrunner-toolbar'></div>" +
+				"<h2 id='qunit-userAgent'></h2>" +
+				"<ol id='qunit-tests'></ol>";
+		}
+
+		tests = id( "qunit-tests" );
+		banner = id( "qunit-banner" );
+		result = id( "qunit-testresult" );
 
 		if ( tests ) {
 			tests.innerHTML = "";
@@ -552,43 +705,36 @@ extend(QUnit, {
 			result.id = "qunit-testresult";
 			result.className = "result";
 			tests.parentNode.insertBefore( result, tests );
-			result.innerHTML = 'Running...<br/>&nbsp;';
+			result.innerHTML = "Running...<br/>&nbsp;";
 		}
 	},
 
-	/**
-	 * Resets the test setup. Useful for tests that modify the DOM.
-	 *
-	 * If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
-	 */
+	// Resets the test setup. Useful for tests that modify the DOM.
+	// If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
 	reset: function() {
+		var fixture;
+
 		if ( window.jQuery ) {
 			jQuery( "#qunit-fixture" ).html( config.fixture );
 		} else {
-			var main = id( 'qunit-fixture' );
-			if ( main ) {
-				main.innerHTML = config.fixture;
+			fixture = id( "qunit-fixture" );
+			if ( fixture ) {
+				fixture.innerHTML = config.fixture;
 			}
 		}
 	},
 
-	/**
-	 * Trigger an event on an element.
-	 *
-	 * @example triggerEvent( document.body, "click" );
-	 *
-	 * @param DOMElement elem
-	 * @param String type
-	 */
+	// Trigger an event on an element.
+	// @example triggerEvent( document.body, "click" );
 	triggerEvent: function( elem, type, event ) {
 		if ( document.createEvent ) {
-			event = document.createEvent("MouseEvents");
+			event = document.createEvent( "MouseEvents" );
 			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
 				0, 0, 0, 0, 0, false, false, false, false, 0, null);
-			elem.dispatchEvent( event );
 
+			elem.dispatchEvent( event );
 		} else if ( elem.fireEvent ) {
-			elem.fireEvent("on"+type);
+			elem.fireEvent( "on" + type );
 		}
 	},
 
@@ -598,66 +744,74 @@ extend(QUnit, {
 	},
 
 	objectType: function( obj ) {
-		if (typeof obj === "undefined") {
+		if ( typeof obj === "undefined" ) {
 				return "undefined";
-
 		// consider: typeof null === object
 		}
-		if (obj === null) {
+		if ( obj === null ) {
 				return "null";
 		}
 
-		var type = Object.prototype.toString.call( obj )
-			.match(/^\[object\s(.*)\]$/)[1] || '';
+		var type = toString.call( obj ).match(/^\[object\s(.*)\]$/)[1] || "";
 
-		switch (type) {
-				case 'Number':
-						if (isNaN(obj)) {
-								return "nan";
-						} else {
-								return "number";
-						}
-				case 'String':
-				case 'Boolean':
-				case 'Array':
-				case 'Date':
-				case 'RegExp':
-				case 'Function':
-						return type.toLowerCase();
+		switch ( type ) {
+			case "Number":
+				if ( isNaN(obj) ) {
+					return "nan";
+				}
+				return "number";
+			case "String":
+			case "Boolean":
+			case "Array":
+			case "Date":
+			case "RegExp":
+			case "Function":
+				return type.toLowerCase();
 		}
-		if (typeof obj === "object") {
-				return "object";
+		if ( typeof obj === "object" ) {
+			return "object";
 		}
 		return undefined;
 	},
 
-	push: function(result, actual, expected, message) {
-		var details = {
-			result: result,
-			message: message,
-			actual: actual,
-			expected: expected
-		};
+	push: function( result, actual, expected, message ) {
+		if ( !config.current ) {
+			throw new Error( "assertion outside test context, was " + sourceFromStacktrace() );
+		}
+
+		var output, source,
+			details = {
+				result: result,
+				message: message,
+				actual: actual,
+				expected: expected
+			};
+
+		message = escapeInnerText( message ) || ( result ? "okay" : "failed" );
+		message = "<span class='test-message'>" + message + "</span>";
+		output = message;
+
+		if ( !result ) {
+			expected = escapeInnerText( QUnit.jsDump.parse(expected) );
+			actual = escapeInnerText( QUnit.jsDump.parse(actual) );
+			output += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + expected + "</pre></td></tr>";
+
+			if ( actual != expected ) {
+				output += "<tr class='test-actual'><th>Result: </th><td><pre>" + actual + "</pre></td></tr>";
+				output += "<tr class='test-diff'><th>Diff: </th><td><pre>" + QUnit.diff( expected, actual ) + "</pre></td></tr>";
+			}
 
-		message = escapeInnerText(message) || (result ? "okay" : "failed");
-		message = '<span class="test-message">' + message + "</span>";
-		expected = escapeInnerText(QUnit.jsDump.parse(expected));
-		actual = escapeInnerText(QUnit.jsDump.parse(actual));
-		var output = message + '<table><tr class="test-expected"><th>Expected: </th><td><pre>' + expected + '</pre></td></tr>';
-		if (actual != expected) {
-			output += '<tr class="test-actual"><th>Result: </th><td><pre>' + actual + '</pre></td></tr>';
-			output += '<tr class="test-diff"><th>Diff: </th><td><pre>' + QUnit.diff(expected, actual) +'</pre></td></tr>';
-		}
-		if (!result) {
-			var source = sourceFromStacktrace();
-			if (source) {
+			source = sourceFromStacktrace();
+
+			if ( source ) {
 				details.source = source;
-				output += '<tr class="test-source"><th>Source: </th><td><pre>' + escapeInnerText(source) + '</pre></td></tr>';
+				output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr>";
 			}
+
+			output += "</table>";
 		}
-		output += "</table>";
 
-		runLoggingCallbacks( 'log', QUnit, details );
+		runLoggingCallbacks( "log", QUnit, details );
 
 		config.current.assertions.push({
 			result: !!result,
@@ -665,11 +819,51 @@ extend(QUnit, {
 		});
 	},
 
+	pushFailure: function( message, source, actual ) {
+		if ( !config.current ) {
+			throw new Error( "pushFailure() assertion outside test context, was " + sourceFromStacktrace(2) );
+		}
+
+		var output,
+			details = {
+				result: false,
+				message: message
+			};
+
+		message = escapeInnerText( message ) || "error";
+		message = "<span class='test-message'>" + message + "</span>";
+		output = message;
+
+		output += "<table>";
+
+		if ( actual ) {
+			output += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeInnerText( actual ) + "</pre></td></tr>";
+		}
+
+		if ( source ) {
+			details.source = source;
+			output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr>";
+		}
+
+		output += "</table>";
+
+		runLoggingCallbacks( "log", QUnit, details );
+
+		config.current.assertions.push({
+			result: false,
+			message: output
+		});
+	},
+
 	url: function( params ) {
 		params = extend( extend( {}, QUnit.urlParams ), params );
-		var querystring = "?",
-			key;
+		var key,
+			querystring = "?";
+
 		for ( key in params ) {
+			if ( !hasOwn.call( params, key ) ) {
+				continue;
+			}
 			querystring += encodeURIComponent( key ) + "=" +
 				encodeURIComponent( params[ key ] ) + "&";
 		}
@@ -679,27 +873,39 @@ extend(QUnit, {
 	extend: extend,
 	id: id,
 	addEvent: addEvent
+	// load, equiv, jsDump, diff: Attached later
 });
 
-//QUnit.constructor is set to the empty F() above so that we can add to it's prototype later
-//Doing this allows us to tell if the following methods have been overwritten on the actual
-//QUnit object, which is a deprecated way of using the callbacks.
-extend(QUnit.constructor.prototype, {
+/**
+ * @deprecated: Created for backwards compatibility with test runner that set the hook function
+ * into QUnit.{hook}, instead of invoking it and passing the hook function.
+ * QUnit.constructor is set to the empty F() above so that we can add to it's prototype here.
+ * Doing this allows us to tell if the following methods have been overwritten on the actual
+ * QUnit object.
+ */
+extend( QUnit.constructor.prototype, {
+
 	// Logging callbacks; all receive a single argument with the listed properties
 	// run test/logs.html for any related changes
-	begin: registerLoggingCallback('begin'),
+	begin: registerLoggingCallback( "begin" ),
+
 	// done: { failed, passed, total, runtime }
-	done: registerLoggingCallback('done'),
+	done: registerLoggingCallback( "done" ),
+
 	// log: { result, actual, expected, message }
-	log: registerLoggingCallback('log'),
+	log: registerLoggingCallback( "log" ),
+
 	// testStart: { name }
-	testStart: registerLoggingCallback('testStart'),
+	testStart: registerLoggingCallback( "testStart" ),
+
 	// testDone: { name, failed, passed, total }
-	testDone: registerLoggingCallback('testDone'),
+	testDone: registerLoggingCallback( "testDone" ),
+
 	// moduleStart: { name }
-	moduleStart: registerLoggingCallback('moduleStart'),
+	moduleStart: registerLoggingCallback( "moduleStart" ),
+
 	// moduleDone: { name, failed, passed, total }
-	moduleDone: registerLoggingCallback('moduleDone')
+	moduleDone: registerLoggingCallback( "moduleDone" )
 });
 
 if ( typeof document === "undefined" || document.readyState === "complete" ) {
@@ -707,113 +913,175 @@ if ( typeof document === "undefined" || document.readyState === "complete" ) {
 }
 
 QUnit.load = function() {
-	runLoggingCallbacks( 'begin', QUnit, {} );
+	runLoggingCallbacks( "begin", QUnit, {} );
 
 	// Initialize the config, saving the execution queue
-	var oldconfig = extend({}, config);
+	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val, urlConfigCheckboxes,
+		urlConfigHtml = "",
+		oldconfig = extend( {}, config );
+
 	QUnit.init();
 	extend(config, oldconfig);
 
 	config.blocking = false;
 
-	var urlConfigHtml = '', len = config.urlConfig.length;
-	for ( var i = 0, val; i < len, val = config.urlConfig[i]; i++ ) {
-		config[val] = QUnit.urlParams[val];
-		urlConfigHtml += '<label><input name="' + val + '" type="checkbox"' + ( config[val] ? ' checked="checked"' : '' ) + '>' + val + '</label>';
+	len = config.urlConfig.length;
+
+	for ( i = 0; i < len; i++ ) {
+		val = config.urlConfig[i];
+		if ( typeof val === "string" ) {
+			val = {
+				id: val,
+				label: val,
+				tooltip: "[no tooltip available]"
+			};
+		}
+		config[ val.id ] = QUnit.urlParams[ val.id ];
+		urlConfigHtml += "<input id='qunit-urlconfig-" + val.id + "' name='" + val.id + "' type='checkbox'" + ( config[ val.id ] ? " checked='checked'" : "" ) + " title='" + val.tooltip + "'><label for='qunit-urlconfig-" + val.id + "' title='" + val.tooltip + "'>" + val.label + "</label>";
 	}
 
-	var userAgent = id("qunit-userAgent");
+	// `userAgent` initialized at top of scope
+	userAgent = id( "qunit-userAgent" );
 	if ( userAgent ) {
 		userAgent.innerHTML = navigator.userAgent;
 	}
-	var banner = id("qunit-header");
+
+	// `banner` initialized at top of scope
+	banner = id( "qunit-header" );
 	if ( banner ) {
-		banner.innerHTML = '<a href="' + QUnit.url({ filter: undefined }) + '"> ' + banner.innerHTML + '</a> ' + urlConfigHtml;
-		addEvent( banner, "change", function( event ) {
-			var params = {};
-			params[ event.target.name ] = event.target.checked ? true : undefined;
-			window.location = QUnit.url( params );
-		});
+		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined, module: undefined, testNumber: undefined }) + "'>" + banner.innerHTML + "</a> ";
 	}
 
-	var toolbar = id("qunit-testrunner-toolbar");
+	// `toolbar` initialized at top of scope
+	toolbar = id( "qunit-testrunner-toolbar" );
 	if ( toolbar ) {
-		var filter = document.createElement("input");
+		// `filter` initialized at top of scope
+		filter = document.createElement( "input" );
 		filter.type = "checkbox";
 		filter.id = "qunit-filter-pass";
+
 		addEvent( filter, "click", function() {
-			var ol = document.getElementById("qunit-tests");
+			var tmp,
+				ol = document.getElementById( "qunit-tests" );
+
 			if ( filter.checked ) {
 				ol.className = ol.className + " hidepass";
 			} else {
-				var tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
-				ol.className = tmp.replace(/ hidepass /, " ");
+				tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
+				ol.className = tmp.replace( / hidepass /, " " );
 			}
 			if ( defined.sessionStorage ) {
 				if (filter.checked) {
-					sessionStorage.setItem("qunit-filter-passed-tests", "true");
+					sessionStorage.setItem( "qunit-filter-passed-tests", "true" );
 				} else {
-					sessionStorage.removeItem("qunit-filter-passed-tests");
+					sessionStorage.removeItem( "qunit-filter-passed-tests" );
 				}
 			}
 		});
-		if ( config.hidepassed || defined.sessionStorage && sessionStorage.getItem("qunit-filter-passed-tests") ) {
+
+		if ( config.hidepassed || defined.sessionStorage && sessionStorage.getItem( "qunit-filter-passed-tests" ) ) {
 			filter.checked = true;
-			var ol = document.getElementById("qunit-tests");
+			// `ol` initialized at top of scope
+			ol = document.getElementById( "qunit-tests" );
 			ol.className = ol.className + " hidepass";
 		}
 		toolbar.appendChild( filter );
 
-		var label = document.createElement("label");
-		label.setAttribute("for", "qunit-filter-pass");
+		// `label` initialized at top of scope
+		label = document.createElement( "label" );
+		label.setAttribute( "for", "qunit-filter-pass" );
+		label.setAttribute( "title", "Only show tests and assertons that fail. Stored in sessionStorage." );
 		label.innerHTML = "Hide passed tests";
 		toolbar.appendChild( label );
+
+		urlConfigCheckboxes = document.createElement( 'span' );
+		urlConfigCheckboxes.innerHTML = urlConfigHtml;
+		addEvent( urlConfigCheckboxes, "change", function( event ) {
+			var params = {};
+			params[ event.target.name ] = event.target.checked ? true : undefined;
+			window.location = QUnit.url( params );
+		});
+		toolbar.appendChild( urlConfigCheckboxes );
 	}
 
-	var main = id('qunit-fixture');
+	// `main` initialized at top of scope
+	main = id( "qunit-fixture" );
 	if ( main ) {
 		config.fixture = main.innerHTML;
 	}
 
-	if (config.autostart) {
+	if ( config.autostart ) {
 		QUnit.start();
 	}
 };
 
-addEvent(window, "load", QUnit.load);
+addEvent( window, "load", QUnit.load );
+
+// `onErrorFnPrev` initialized at top of scope
+// Preserve other handlers
+onErrorFnPrev = window.onerror;
+
+// Cover uncaught exceptions
+// Returning true will surpress the default browser handler,
+// returning false will let it run.
+window.onerror = function ( error, filePath, linerNr ) {
+	var ret = false;
+	if ( onErrorFnPrev ) {
+		ret = onErrorFnPrev( error, filePath, linerNr );
+	}
+
+	// Treat return value as window.onerror itself does,
+	// Only do our handling if not surpressed.
+	if ( ret !== true ) {
+		if ( QUnit.config.current ) {
+			if ( QUnit.config.current.ignoreGlobalErrors ) {
+				return true;
+			}
+			QUnit.pushFailure( error, filePath + ":" + linerNr );
+		} else {
+			QUnit.test( "global failure", function() {
+				QUnit.pushFailure( error, filePath + ":" + linerNr );
+			});
+		}
+		return false;
+	}
+
+	return ret;
+};
 
 function done() {
 	config.autorun = true;
 
 	// Log the last module results
 	if ( config.currentModule ) {
-		runLoggingCallbacks( 'moduleDone', QUnit, {
+		runLoggingCallbacks( "moduleDone", QUnit, {
 			name: config.currentModule,
 			failed: config.moduleStats.bad,
 			passed: config.moduleStats.all - config.moduleStats.bad,
 			total: config.moduleStats.all
-		} );
+		});
 	}
 
-	var banner = id("qunit-banner"),
-		tests = id("qunit-tests"),
-		runtime = +new Date - config.started,
+	var i, key,
+		banner = id( "qunit-banner" ),
+		tests = id( "qunit-tests" ),
+		runtime = +new Date() - config.started,
 		passed = config.stats.all - config.stats.bad,
 		html = [
-			'Tests completed in ',
+			"Tests completed in ",
 			runtime,
-			' milliseconds.<br/>',
-			'<span class="passed">',
+			" milliseconds.<br/>",
+			"<span class='passed'>",
 			passed,
-			'</span> tests of <span class="total">',
+			"</span> tests of <span class='total'>",
 			config.stats.all,
-			'</span> passed, <span class="failed">',
+			"</span> passed, <span class='failed'>",
 			config.stats.bad,
-			'</span> failed.'
-		].join('');
+			"</span> failed."
+		].join( "" );
 
 	if ( banner ) {
-		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+		banner.className = ( config.stats.bad ? "qunit-fail" : "qunit-pass" );
 	}
 
 	if ( tests ) {
@@ -824,70 +1092,119 @@ function done() {
 		// show ✖ for good, ✔ for bad suite result in title
 		// use escape sequences in case file gets loaded with non-utf-8-charset
 		document.title = [
-			(config.stats.bad ? "\u2716" : "\u2714"),
-			document.title.replace(/^[\u2714\u2716] /i, "")
-		].join(" ");
+			( config.stats.bad ? "\u2716" : "\u2714" ),
+			document.title.replace( /^[\u2714\u2716] /i, "" )
+		].join( " " );
 	}
 
-	runLoggingCallbacks( 'done', QUnit, {
+	// clear own sessionStorage items if all tests passed
+	if ( config.reorder && defined.sessionStorage && config.stats.bad === 0 ) {
+		// `key` & `i` initialized at top of scope
+		for ( i = 0; i < sessionStorage.length; i++ ) {
+			key = sessionStorage.key( i++ );
+			if ( key.indexOf( "qunit-test-" ) === 0 ) {
+				sessionStorage.removeItem( key );
+			}
+		}
+	}
+
+	runLoggingCallbacks( "done", QUnit, {
 		failed: config.stats.bad,
 		passed: passed,
 		total: config.stats.all,
 		runtime: runtime
-	} );
+	});
 }
 
-function validTest( name ) {
-	var filter = config.filter,
-		run = false;
+/** @return Boolean: true if this test should be ran */
+function validTest( test ) {
+	var include,
+		filter = config.filter && config.filter.toLowerCase(),
+		module = config.module && config.module.toLowerCase(),
+		fullName = (test.module + ": " + test.testName).toLowerCase();
+
+	if ( config.testNumber ) {
+		return test.testNumber === config.testNumber;
+	}
+
+	if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) {
+		return false;
+	}
 
 	if ( !filter ) {
 		return true;
 	}
 
-	var not = filter.charAt( 0 ) === "!";
-	if ( not ) {
+	include = filter.charAt( 0 ) !== "!";
+	if ( !include ) {
 		filter = filter.slice( 1 );
 	}
 
-	if ( name.indexOf( filter ) !== -1 ) {
-		return !not;
+	// If the filter matches, we need to honour include
+	if ( fullName.indexOf( filter ) !== -1 ) {
+		return include;
 	}
 
-	if ( not ) {
-		run = true;
-	}
-
-	return run;
+	// Otherwise, do the opposite
+	return !include;
 }
 
-// so far supports only Firefox, Chrome and Opera (buggy)
-// could be extended in the future to use something like https://github.com/csnover/TraceKit
-function sourceFromStacktrace() {
+// so far supports only Firefox, Chrome and Opera (buggy), Safari (for real exceptions)
+// Later Safari and IE10 are supposed to support error.stack as well
+// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
+function extractStacktrace( e, offset ) {
+	offset = offset === undefined ? 3 : offset;
+
+	var stack, include, i, regex;
+
+	if ( e.stacktrace ) {
+		// Opera
+		return e.stacktrace.split( "\n" )[ offset + 3 ];
+	} else if ( e.stack ) {
+		// Firefox, Chrome
+		stack = e.stack.split( "\n" );
+		if (/^error$/i.test( stack[0] ) ) {
+			stack.shift();
+		}
+		if ( fileName ) {
+			include = [];
+			for ( i = offset; i < stack.length; i++ ) {
+				if ( stack[ i ].indexOf( fileName ) != -1 ) {
+					break;
+				}
+				include.push( stack[ i ] );
+			}
+			if ( include.length ) {
+				return include.join( "\n" );
+			}
+		}
+		return stack[ offset ];
+	} else if ( e.sourceURL ) {
+		// Safari, PhantomJS
+		// hopefully one day Safari provides actual stacktraces
+		// exclude useless self-reference for generated Error objects
+		if ( /qunit.js$/.test( e.sourceURL ) ) {
+			return;
+		}
+		// for actual exceptions, this is useful
+		return e.sourceURL + ":" + e.line;
+	}
+}
+function sourceFromStacktrace( offset ) {
 	try {
 		throw new Error();
 	} catch ( e ) {
-		if (e.stacktrace) {
-			// Opera
-			return e.stacktrace.split("\n")[6];
-		} else if (e.stack) {
-			// Firefox, Chrome
-			return e.stack.split("\n")[4];
-		} else if (e.sourceURL) {
-			// Safari, PhantomJS
-			// TODO sourceURL points at the 'throw new Error' line above, useless
-			//return e.sourceURL + ":" + e.line;
-		}
+		return extractStacktrace( e, offset );
 	}
 }
 
-function escapeInnerText(s) {
-	if (!s) {
+function escapeInnerText( s ) {
+	if ( !s ) {
 		return "";
 	}
 	s = s + "";
-	return s.replace(/[\&<>]/g, function(s) {
-		switch(s) {
+	return s.replace( /[\&<>]/g, function( s ) {
+		switch( s ) {
 			case "&": return "&amp;";
 			case "<": return "&lt;";
 			case ">": return "&gt;";
@@ -896,26 +1213,31 @@ function escapeInnerText(s) {
 	});
 }
 
-function synchronize( callback ) {
+function synchronize( callback, last ) {
 	config.queue.push( callback );
 
 	if ( config.autorun && !config.blocking ) {
-		process();
+		process( last );
 	}
 }
 
-function process() {
-	var start = (new Date()).getTime();
+function process( last ) {
+	function next() {
+		process( last );
+	}
+	var start = new Date().getTime();
+	config.depth = config.depth ? config.depth + 1 : 1;
 
 	while ( config.queue.length && !config.blocking ) {
-		if ( config.updateRate <= 0 || (((new Date()).getTime() - start) < config.updateRate) ) {
+		if ( !defined.setTimeout || config.updateRate <= 0 || ( ( new Date().getTime() - start ) < config.updateRate ) ) {
 			config.queue.shift()();
 		} else {
-			window.setTimeout( process, 13 );
+			window.setTimeout( next, 13 );
 			break;
 		}
 	}
-	if (!config.blocking && !config.queue.length) {
+	config.depth--;
+	if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) {
 		done();
 	}
 }
@@ -925,33 +1247,42 @@ function saveGlobal() {
 
 	if ( config.noglobals ) {
 		for ( var key in window ) {
+			// in Opera sometimes DOM element ids show up here, ignore them
+			if ( !hasOwn.call( window, key ) || /^qunit-test-output/.test( key ) ) {
+				continue;
+			}
 			config.pollution.push( key );
 		}
 	}
 }
 
 function checkPollution( name ) {
-	var old = config.pollution;
+	var newGlobals,
+		deletedGlobals,
+		old = config.pollution;
+
 	saveGlobal();
 
-	var newGlobals = diff( config.pollution, old );
+	newGlobals = diff( config.pollution, old );
 	if ( newGlobals.length > 0 ) {
-		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+		QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join(", ") );
 	}
 
-	var deletedGlobals = diff( old, config.pollution );
+	deletedGlobals = diff( old, config.pollution );
 	if ( deletedGlobals.length > 0 ) {
-		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+		QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join(", ") );
 	}
 }
 
 // returns a new Array with the elements that are in a but not in b
 function diff( a, b ) {
-	var result = a.slice();
-	for ( var i = 0; i < result.length; i++ ) {
-		for ( var j = 0; j < b.length; j++ ) {
+	var i, j,
+		result = a.slice();
+
+	for ( i = 0; i < result.length; i++ ) {
+		for ( j = 0; j < b.length; j++ ) {
 			if ( result[i] === b[j] ) {
-				result.splice(i, 1);
+				result.splice( i, 1 );
 				i--;
 				break;
 			}
@@ -960,30 +1291,21 @@ function diff( a, b ) {
 	return result;
 }
 
-function fail(message, exception, callback) {
-	if ( typeof console !== "undefined" && console.error && console.warn ) {
-		console.error(message);
-		console.error(exception);
-		console.warn(callback.toString());
-
-	} else if ( window.opera && opera.postError ) {
-		opera.postError(message, exception, callback.toString);
-	}
-}
-
-function extend(a, b) {
+function extend( a, b ) {
 	for ( var prop in b ) {
-		if ( b[prop] === undefined ) {
-			delete a[prop];
-		} else {
-			a[prop] = b[prop];
+		if ( b[ prop ] === undefined ) {
+			delete a[ prop ];
+
+		// Avoid "Member not found" error in IE8 caused by setting window.constructor
+		} else if ( prop !== "constructor" || a !== window ) {
+			a[ prop ] = b[ prop ];
 		}
 	}
 
 	return a;
 }
 
-function addEvent(elem, type, fn) {
+function addEvent( elem, type, fn ) {
 	if ( elem.addEventListener ) {
 		elem.addEventListener( type, fn, false );
 	} else if ( elem.attachEvent ) {
@@ -993,205 +1315,213 @@ function addEvent(elem, type, fn) {
 	}
 }
 
-function id(name) {
-	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+function id( name ) {
+	return !!( typeof document !== "undefined" && document && document.getElementById ) &&
 		document.getElementById( name );
 }
 
-function registerLoggingCallback(key){
-	return function(callback){
+function registerLoggingCallback( key ) {
+	return function( callback ) {
 		config[key].push( callback );
 	};
 }
 
 // Supports deprecated method of completely overwriting logging callbacks
-function runLoggingCallbacks(key, scope, args) {
-	//debugger;
-	var callbacks;
-	if ( QUnit.hasOwnProperty(key) ) {
-		QUnit[key].call(scope, args);
+function runLoggingCallbacks( key, scope, args ) {
+	var i, callbacks;
+	if ( QUnit.hasOwnProperty( key ) ) {
+		QUnit[ key ].call(scope, args );
 	} else {
-		callbacks = config[key];
-		for( var i = 0; i < callbacks.length; i++ ) {
-			callbacks[i].call( scope, args );
+		callbacks = config[ key ];
+		for ( i = 0; i < callbacks.length; i++ ) {
+			callbacks[ i ].call( scope, args );
 		}
 	}
 }
 
 // Test for equality any JavaScript type.
 // Author: Philippe Rathé <prathe@gmail.com>
-QUnit.equiv = function () {
-
-	var innerEquiv; // the real equiv function
-	var callers = []; // stack to decide between skip/abort functions
-	var parents = []; // stack to avoiding loops from circular referencing
+QUnit.equiv = (function() {
 
 	// Call the o related callback with the given arguments.
-	function bindCallbacks(o, callbacks, args) {
-		var prop = QUnit.objectType(o);
-		if (prop) {
-			if (QUnit.objectType(callbacks[prop]) === "function") {
-				return callbacks[prop].apply(callbacks, args);
+	function bindCallbacks( o, callbacks, args ) {
+		var prop = QUnit.objectType( o );
+		if ( prop ) {
+			if ( QUnit.objectType( callbacks[ prop ] ) === "function" ) {
+				return callbacks[ prop ].apply( callbacks, args );
 			} else {
-				return callbacks[prop]; // or undefined
+				return callbacks[ prop ]; // or undefined
 			}
 		}
 	}
 
-	var callbacks = function () {
+	// the real equiv function
+	var innerEquiv,
+		// stack to decide between skip/abort functions
+		callers = [],
+		// stack to avoiding loops from circular referencing
+		parents = [],
 
-		// for string, boolean, number and null
-		function useStrictEquality(b, a) {
-			if (b instanceof a.constructor || a instanceof b.constructor) {
-				// to catch short annotaion VS 'new' annotation of a
-				// declaration
-				// e.g. var i = 1;
-				// var j = new Number(1);
-				return a == b;
-			} else {
-				return a === b;
+		getProto = Object.getPrototypeOf || function ( obj ) {
+			return obj.__proto__;
+		},
+		callbacks = (function () {
+
+			// for string, boolean, number and null
+			function useStrictEquality( b, a ) {
+				if ( b instanceof a.constructor || a instanceof b.constructor ) {
+					// to catch short annotaion VS 'new' annotation of a
+					// declaration
+					// e.g. var i = 1;
+					// var j = new Number(1);
+					return a == b;
+				} else {
+					return a === b;
+				}
 			}
-		}
 
-		return {
-			"string" : useStrictEquality,
-			"boolean" : useStrictEquality,
-			"number" : useStrictEquality,
-			"null" : useStrictEquality,
-			"undefined" : useStrictEquality,
-
-			"nan" : function(b) {
-				return isNaN(b);
-			},
-
-			"date" : function(b, a) {
-				return QUnit.objectType(b) === "date"
-						&& a.valueOf() === b.valueOf();
-			},
-
-			"regexp" : function(b, a) {
-				return QUnit.objectType(b) === "regexp"
-						&& a.source === b.source && // the regex itself
-						a.global === b.global && // and its modifers
-													// (gmi) ...
-						a.ignoreCase === b.ignoreCase
-						&& a.multiline === b.multiline;
-			},
-
-			// - skip when the property is a method of an instance (OOP)
-			// - abort otherwise,
-			// initial === would have catch identical references anyway
-			"function" : function() {
-				var caller = callers[callers.length - 1];
-				return caller !== Object && typeof caller !== "undefined";
-			},
-
-			"array" : function(b, a) {
-				var i, j, loop;
-				var len;
-
-				// b could be an object literal here
-				if (!(QUnit.objectType(b) === "array")) {
-					return false;
-				}
+			return {
+				"string": useStrictEquality,
+				"boolean": useStrictEquality,
+				"number": useStrictEquality,
+				"null": useStrictEquality,
+				"undefined": useStrictEquality,
+
+				"nan": function( b ) {
+					return isNaN( b );
+				},
+
+				"date": function( b, a ) {
+					return QUnit.objectType( b ) === "date" && a.valueOf() === b.valueOf();
+				},
+
+				"regexp": function( b, a ) {
+					return QUnit.objectType( b ) === "regexp" &&
+						// the regex itself
+						a.source === b.source &&
+						// and its modifers
+						a.global === b.global &&
+						// (gmi) ...
+						a.ignoreCase === b.ignoreCase &&
+						a.multiline === b.multiline;
+				},
+
+				// - skip when the property is a method of an instance (OOP)
+				// - abort otherwise,
+				// initial === would have catch identical references anyway
+				"function": function() {
+					var caller = callers[callers.length - 1];
+					return caller !== Object && typeof caller !== "undefined";
+				},
+
+				"array": function( b, a ) {
+					var i, j, len, loop;
+
+					// b could be an object literal here
+					if ( QUnit.objectType( b ) !== "array" ) {
+						return false;
+					}
 
-				len = a.length;
-				if (len !== b.length) { // safe and faster
-					return false;
-				}
+					len = a.length;
+					if ( len !== b.length ) {
+						// safe and faster
+						return false;
+					}
 
-				// track reference to avoid circular references
-				parents.push(a);
-				for (i = 0; i < len; i++) {
-					loop = false;
-					for (j = 0; j < parents.length; j++) {
-						if (parents[j] === a[i]) {
-							loop = true;// dont rewalk array
+					// track reference to avoid circular references
+					parents.push( a );
+					for ( i = 0; i < len; i++ ) {
+						loop = false;
+						for ( j = 0; j < parents.length; j++ ) {
+							if ( parents[j] === a[i] ) {
+								loop = true;// dont rewalk array
+							}
+						}
+						if ( !loop && !innerEquiv(a[i], b[i]) ) {
+							parents.pop();
+							return false;
 						}
 					}
-					if (!loop && !innerEquiv(a[i], b[i])) {
-						parents.pop();
-						return false;
+					parents.pop();
+					return true;
+				},
+
+				"object": function( b, a ) {
+					var i, j, loop,
+						// Default to true
+						eq = true,
+						aProperties = [],
+						bProperties = [];
+
+					// comparing constructors is more strict than using
+					// instanceof
+					if ( a.constructor !== b.constructor ) {
+						// Allow objects with no prototype to be equivalent to
+						// objects with Object as their constructor.
+						if ( !(( getProto(a) === null && getProto(b) === Object.prototype ) ||
+							( getProto(b) === null && getProto(a) === Object.prototype ) ) ) {
+								return false;
+						}
 					}
-				}
-				parents.pop();
-				return true;
-			},
-
-			"object" : function(b, a) {
-				var i, j, loop;
-				var eq = true; // unless we can proove it
-				var aProperties = [], bProperties = []; // collection of
-														// strings
 
-				// comparing constructors is more strict than using
-				// instanceof
-				if (a.constructor !== b.constructor) {
-					return false;
-				}
+					// stack constructor before traversing properties
+					callers.push( a.constructor );
+					// track reference to avoid circular references
+					parents.push( a );
+
+					for ( i in a ) { // be strict: don't ensures hasOwnProperty
+									// and go deep
+						loop = false;
+						for ( j = 0; j < parents.length; j++ ) {
+							if ( parents[j] === a[i] ) {
+								// don't go down the same path twice
+								loop = true;
+							}
+						}
+						aProperties.push(i); // collect a's properties
 
-				// stack constructor before traversing properties
-				callers.push(a.constructor);
-				// track reference to avoid circular references
-				parents.push(a);
-
-				for (i in a) { // be strict: don't ensures hasOwnProperty
-								// and go deep
-					loop = false;
-					for (j = 0; j < parents.length; j++) {
-						if (parents[j] === a[i])
-							loop = true; // don't go down the same path
-											// twice
+						if (!loop && !innerEquiv( a[i], b[i] ) ) {
+							eq = false;
+							break;
+						}
 					}
-					aProperties.push(i); // collect a's properties
 
-					if (!loop && !innerEquiv(a[i], b[i])) {
-						eq = false;
-						break;
-					}
-				}
+					callers.pop(); // unstack, we are done
+					parents.pop();
 
-				callers.pop(); // unstack, we are done
-				parents.pop();
+					for ( i in b ) {
+						bProperties.push( i ); // collect b's properties
+					}
 
-				for (i in b) {
-					bProperties.push(i); // collect b's properties
+					// Ensures identical properties name
+					return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
 				}
-
-				// Ensures identical properties name
-				return eq
-						&& innerEquiv(aProperties.sort(), bProperties
-								.sort());
-			}
-		};
-	}();
+			};
+		}());
 
 	innerEquiv = function() { // can take multiple arguments
-		var args = Array.prototype.slice.apply(arguments);
-		if (args.length < 2) {
+		var args = [].slice.apply( arguments );
+		if ( args.length < 2 ) {
 			return true; // end transition
 		}
 
-		return (function(a, b) {
-			if (a === b) {
+		return (function( a, b ) {
+			if ( a === b ) {
 				return true; // catch the most you can
-			} else if (a === null || b === null || typeof a === "undefined"
-					|| typeof b === "undefined"
-					|| QUnit.objectType(a) !== QUnit.objectType(b)) {
+			} else if ( a === null || b === null || typeof a === "undefined" ||
+					typeof b === "undefined" ||
+					QUnit.objectType(a) !== QUnit.objectType(b) ) {
 				return false; // don't lose time with error prone cases
 			} else {
 				return bindCallbacks(a, callbacks, [ b, a ]);
 			}
 
 			// apply transition with (1..n) arguments
-		})(args[0], args[1])
-				&& arguments.callee.apply(this, args.splice(1,
-						args.length - 1));
+		}( args[0], args[1] ) && arguments.callee.apply( this, args.splice(1, args.length - 1 )) );
 	};
 
 	return innerEquiv;
-
-}();
+}());
 
 /**
  * jsDump Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com |
@@ -1205,183 +1535,215 @@ QUnit.equiv = function () {
  */
 QUnit.jsDump = (function() {
 	function quote( str ) {
-		return '"' + str.toString().replace(/"/g, '\\"') + '"';
-	};
+		return '"' + str.toString().replace( /"/g, '\\"' ) + '"';
+	}
 	function literal( o ) {
-		return o + '';
-	};
+		return o + "";
+	}
 	function join( pre, arr, post ) {
 		var s = jsDump.separator(),
 			base = jsDump.indent(),
 			inner = jsDump.indent(1);
-		if ( arr.join )
-			arr = arr.join( ',' + s + inner );
-		if ( !arr )
+		if ( arr.join ) {
+			arr = arr.join( "," + s + inner );
+		}
+		if ( !arr ) {
 			return pre + post;
+		}
 		return [ pre, inner + arr, base + post ].join(s);
-	};
+	}
 	function array( arr, stack ) {
-		var i = arr.length, ret = Array(i);
+		var i = arr.length, ret = new Array(i);
 		this.up();
-		while ( i-- )
+		while ( i-- ) {
 			ret[i] = this.parse( arr[i] , undefined , stack);
+		}
 		this.down();
-		return join( '[', ret, ']' );
-	};
+		return join( "[", ret, "]" );
+	}
 
-	var reName = /^function (\w+)/;
+	var reName = /^function (\w+)/,
+		jsDump = {
+			parse: function( obj, type, stack ) { //type is used mostly internally, you can fix a (custom)type in advance
+				stack = stack || [ ];
+				var inStack, res,
+					parser = this.parsers[ type || this.typeOf(obj) ];
 
-	var jsDump = {
-		parse:function( obj, type, stack ) { //type is used mostly internally, you can fix a (custom)type in advance
-			stack = stack || [ ];
-			var parser = this.parsers[ type || this.typeOf(obj) ];
-			type = typeof parser;
-			var inStack = inArray(obj, stack);
-			if (inStack != -1) {
-				return 'recursion('+(inStack - stack.length)+')';
-			}
-			//else
-			if (type == 'function')  {
-					stack.push(obj);
-					var res = parser.call( this, obj, stack );
+				type = typeof parser;
+				inStack = inArray( obj, stack );
+
+				if ( inStack != -1 ) {
+					return "recursion(" + (inStack - stack.length) + ")";
+				}
+				//else
+				if ( type == "function" )  {
+					stack.push( obj );
+					res = parser.call( this, obj, stack );
 					stack.pop();
 					return res;
-			}
-			// else
-			return (type == 'string') ? parser : this.parsers.error;
-		},
-		typeOf:function( obj ) {
-			var type;
-			if ( obj === null ) {
-				type = "null";
-			} else if (typeof obj === "undefined") {
-				type = "undefined";
-			} else if (QUnit.is("RegExp", obj)) {
-				type = "regexp";
-			} else if (QUnit.is("Date", obj)) {
-				type = "date";
-			} else if (QUnit.is("Function", obj)) {
-				type = "function";
-			} else if (typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined") {
-				type = "window";
-			} else if (obj.nodeType === 9) {
-				type = "document";
-			} else if (obj.nodeType) {
-				type = "node";
-			} else if (typeof obj === "object" && typeof obj.length === "number" && obj.length >= 0) {
-				type = "array";
-			} else {
-				type = typeof obj;
-			}
-			return type;
-		},
-		separator:function() {
-			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
-		},
-		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
-			if ( !this.multiline )
-				return '';
-			var chr = this.indentChar;
-			if ( this.HTML )
-				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
-			return Array( this._depth_ + (extra||0) ).join(chr);
-		},
-		up:function( a ) {
-			this._depth_ += a || 1;
-		},
-		down:function( a ) {
-			this._depth_ -= a || 1;
-		},
-		setParser:function( name, parser ) {
-			this.parsers[name] = parser;
-		},
-		// The next 3 are exposed so you can use them
-		quote:quote,
-		literal:literal,
-		join:join,
-		//
-		_depth_: 1,
-		// This is the list of parsers, to modify them, use jsDump.setParser
-		parsers:{
-			window: '[Window]',
-			document: '[Document]',
-			error:'[ERROR]', //when no parser is found, shouldn't happen
-			unknown: '[Unknown]',
-			'null':'null',
-			'undefined':'undefined',
-			'function':function( fn ) {
-				var ret = 'function',
-					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
-				if ( name )
-					ret += ' ' + name;
-				ret += '(';
-
-				ret = [ ret, QUnit.jsDump.parse( fn, 'functionArgs' ), '){'].join('');
-				return join( ret, QUnit.jsDump.parse(fn,'functionCode'), '}' );
+				}
+				// else
+				return ( type == "string" ) ? parser : this.parsers.error;
 			},
-			array: array,
-			nodelist: array,
-			arguments: array,
-			object:function( map, stack ) {
-				var ret = [ ];
-				QUnit.jsDump.up();
-				for ( var key in map ) {
-				    var val = map[key];
-					ret.push( QUnit.jsDump.parse(key,'key') + ': ' + QUnit.jsDump.parse(val, undefined, stack));
-                }
-				QUnit.jsDump.down();
-				return join( '{', ret, '}' );
+			typeOf: function( obj ) {
+				var type;
+				if ( obj === null ) {
+					type = "null";
+				} else if ( typeof obj === "undefined" ) {
+					type = "undefined";
+				} else if ( QUnit.is( "regexp", obj) ) {
+					type = "regexp";
+				} else if ( QUnit.is( "date", obj) ) {
+					type = "date";
+				} else if ( QUnit.is( "function", obj) ) {
+					type = "function";
+				} else if ( typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined" ) {
+					type = "window";
+				} else if ( obj.nodeType === 9 ) {
+					type = "document";
+				} else if ( obj.nodeType ) {
+					type = "node";
+				} else if (
+					// native arrays
+					toString.call( obj ) === "[object Array]" ||
+					// NodeList objects
+					( typeof obj.length === "number" && typeof obj.item !== "undefined" && ( obj.length ? obj.item(0) === obj[0] : ( obj.item( 0 ) === null && typeof obj[0] === "undefined" ) ) )
+				) {
+					type = "array";
+				} else {
+					type = typeof obj;
+				}
+				return type;
 			},
-			node:function( node ) {
-				var open = QUnit.jsDump.HTML ? '&lt;' : '<',
-					close = QUnit.jsDump.HTML ? '&gt;' : '>';
-
-				var tag = node.nodeName.toLowerCase(),
-					ret = open + tag;
-
-				for ( var a in QUnit.jsDump.DOMAttrs ) {
-					var val = node[QUnit.jsDump.DOMAttrs[a]];
-					if ( val )
-						ret += ' ' + a + '=' + QUnit.jsDump.parse( val, 'attribute' );
+			separator: function() {
+				return this.multiline ?	this.HTML ? "<br />" : "\n" : this.HTML ? "&nbsp;" : " ";
+			},
+			indent: function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+				if ( !this.multiline ) {
+					return "";
+				}
+				var chr = this.indentChar;
+				if ( this.HTML ) {
+					chr = chr.replace( /\t/g, "   " ).replace( / /g, "&nbsp;" );
 				}
-				return ret + close + open + '/' + tag + close;
+				return new Array( this._depth_ + (extra||0) ).join(chr);
 			},
-			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
-				var l = fn.length;
-				if ( !l ) return '';
-
-				var args = Array(l);
-				while ( l-- )
-					args[l] = String.fromCharCode(97+l);//97 is 'a'
-				return ' ' + args.join(', ') + ' ';
+			up: function( a ) {
+				this._depth_ += a || 1;
 			},
-			key:quote, //object calls it internally, the key part of an item in a map
-			functionCode:'[code]', //function calls it internally, it's the content of the function
-			attribute:quote, //node calls it internally, it's an html attribute value
-			string:quote,
-			date:quote,
-			regexp:literal, //regex
-			number:literal,
-			'boolean':literal
-		},
-		DOMAttrs:{//attributes to dump from nodes, name=>realName
-			id:'id',
-			name:'name',
-			'class':'className'
-		},
-		HTML:false,//if true, entities are escaped ( <, >, \t, space and \n )
-		indentChar:'  ',//indentation unit
-		multiline:true //if true, items in a collection, are separated by a \n, else just a space.
-	};
+			down: function( a ) {
+				this._depth_ -= a || 1;
+			},
+			setParser: function( name, parser ) {
+				this.parsers[name] = parser;
+			},
+			// The next 3 are exposed so you can use them
+			quote: quote,
+			literal: literal,
+			join: join,
+			//
+			_depth_: 1,
+			// This is the list of parsers, to modify them, use jsDump.setParser
+			parsers: {
+				window: "[Window]",
+				document: "[Document]",
+				error: "[ERROR]", //when no parser is found, shouldn"t happen
+				unknown: "[Unknown]",
+				"null": "null",
+				"undefined": "undefined",
+				"function": function( fn ) {
+					var ret = "function",
+						name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1];//functions never have name in IE
+
+					if ( name ) {
+						ret += " " + name;
+					}
+					ret += "( ";
+
+					ret = [ ret, QUnit.jsDump.parse( fn, "functionArgs" ), "){" ].join( "" );
+					return join( ret, QUnit.jsDump.parse(fn,"functionCode" ), "}" );
+				},
+				array: array,
+				nodelist: array,
+				"arguments": array,
+				object: function( map, stack ) {
+					var ret = [ ], keys, key, val, i;
+					QUnit.jsDump.up();
+					if ( Object.keys ) {
+						keys = Object.keys( map );
+					} else {
+						keys = [];
+						for ( key in map ) {
+							keys.push( key );
+						}
+					}
+					keys.sort();
+					for ( i = 0; i < keys.length; i++ ) {
+						key = keys[ i ];
+						val = map[ key ];
+						ret.push( QUnit.jsDump.parse( key, "key" ) + ": " + QUnit.jsDump.parse( val, undefined, stack ) );
+					}
+					QUnit.jsDump.down();
+					return join( "{", ret, "}" );
+				},
+				node: function( node ) {
+					var a, val,
+						open = QUnit.jsDump.HTML ? "&lt;" : "<",
+						close = QUnit.jsDump.HTML ? "&gt;" : ">",
+						tag = node.nodeName.toLowerCase(),
+						ret = open + tag;
+
+					for ( a in QUnit.jsDump.DOMAttrs ) {
+						val = node[ QUnit.jsDump.DOMAttrs[a] ];
+						if ( val ) {
+							ret += " " + a + "=" + QUnit.jsDump.parse( val, "attribute" );
+						}
+					}
+					return ret + close + open + "/" + tag + close;
+				},
+				functionArgs: function( fn ) {//function calls it internally, it's the arguments part of the function
+					var args,
+						l = fn.length;
+
+					if ( !l ) {
+						return "";
+					}
+
+					args = new Array(l);
+					while ( l-- ) {
+						args[l] = String.fromCharCode(97+l);//97 is 'a'
+					}
+					return " " + args.join( ", " ) + " ";
+				},
+				key: quote, //object calls it internally, the key part of an item in a map
+				functionCode: "[code]", //function calls it internally, it's the content of the function
+				attribute: quote, //node calls it internally, it's an html attribute value
+				string: quote,
+				date: quote,
+				regexp: literal, //regex
+				number: literal,
+				"boolean": literal
+			},
+			DOMAttrs: {
+				//attributes to dump from nodes, name=>realName
+				id: "id",
+				name: "name",
+				"class": "className"
+			},
+			HTML: false,//if true, entities are escaped ( <, >, \t, space and \n )
+			indentChar: "  ",//indentation unit
+			multiline: true //if true, items in a collection, are separated by a \n, else just a space.
+		};
 
 	return jsDump;
-})();
+}());
 
 // from Sizzle.js
 function getText( elems ) {
-	var ret = "", elem;
+	var i, elem,
+		ret = "";
 
-	for ( var i = 0; elems[i]; i++ ) {
+	for ( i = 0; elems[i]; i++ ) {
 		elem = elems[i];
 
 		// Get the text from text nodes and CDATA nodes
@@ -1395,9 +1757,9 @@ function getText( elems ) {
 	}
 
 	return ret;
-};
+}
 
-//from jquery.js
+// from jquery.js
 function inArray( elem, array ) {
 	if ( array.indexOf ) {
 		return array.indexOf( elem );
@@ -1424,67 +1786,75 @@ function inArray( elem, array ) {
  *
  * Usage: QUnit.diff(expected, actual)
  *
- * QUnit.diff("the quick brown fox jumped over", "the quick fox jumps over") == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
+ * QUnit.diff( "the quick brown fox jumped over", "the quick fox jumps over" ) == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
  */
 QUnit.diff = (function() {
-	function diff(o, n) {
-		var ns = {};
-		var os = {};
-
-		for (var i = 0; i < n.length; i++) {
-			if (ns[n[i]] == null)
-				ns[n[i]] = {
+	function diff( o, n ) {
+		var i,
+			ns = {},
+			os = {};
+
+		for ( i = 0; i < n.length; i++ ) {
+			if ( ns[ n[i] ] == null ) {
+				ns[ n[i] ] = {
 					rows: [],
 					o: null
 				};
-			ns[n[i]].rows.push(i);
+			}
+			ns[ n[i] ].rows.push( i );
 		}
 
-		for (var i = 0; i < o.length; i++) {
-			if (os[o[i]] == null)
-				os[o[i]] = {
+		for ( i = 0; i < o.length; i++ ) {
+			if ( os[ o[i] ] == null ) {
+				os[ o[i] ] = {
 					rows: [],
 					n: null
 				};
-			os[o[i]].rows.push(i);
+			}
+			os[ o[i] ].rows.push( i );
 		}
 
-		for (var i in ns) {
-			if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
-				n[ns[i].rows[0]] = {
-					text: n[ns[i].rows[0]],
+		for ( i in ns ) {
+			if ( !hasOwn.call( ns, i ) ) {
+				continue;
+			}
+			if ( ns[i].rows.length == 1 && typeof os[i] != "undefined" && os[i].rows.length == 1 ) {
+				n[ ns[i].rows[0] ] = {
+					text: n[ ns[i].rows[0] ],
 					row: os[i].rows[0]
 				};
-				o[os[i].rows[0]] = {
-					text: o[os[i].rows[0]],
+				o[ os[i].rows[0] ] = {
+					text: o[ os[i].rows[0] ],
 					row: ns[i].rows[0]
 				};
 			}
 		}
 
-		for (var i = 0; i < n.length - 1; i++) {
-			if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
-			n[i + 1] == o[n[i].row + 1]) {
-				n[i + 1] = {
-					text: n[i + 1],
+		for ( i = 0; i < n.length - 1; i++ ) {
+			if ( n[i].text != null && n[ i + 1 ].text == null && n[i].row + 1 < o.length && o[ n[i].row + 1 ].text == null &&
+						n[ i + 1 ] == o[ n[i].row + 1 ] ) {
+
+				n[ i + 1 ] = {
+					text: n[ i + 1 ],
 					row: n[i].row + 1
 				};
-				o[n[i].row + 1] = {
-					text: o[n[i].row + 1],
+				o[ n[i].row + 1 ] = {
+					text: o[ n[i].row + 1 ],
 					row: i + 1
 				};
 			}
 		}
 
-		for (var i = n.length - 1; i > 0; i--) {
-			if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
-			n[i - 1] == o[n[i].row - 1]) {
-				n[i - 1] = {
-					text: n[i - 1],
+		for ( i = n.length - 1; i > 0; i-- ) {
+			if ( n[i].text != null && n[ i - 1 ].text == null && n[i].row > 0 && o[ n[i].row - 1 ].text == null &&
+						n[ i - 1 ] == o[ n[i].row - 1 ]) {
+
+				n[ i - 1 ] = {
+					text: n[ i - 1 ],
 					row: n[i].row - 1
 				};
-				o[n[i].row - 1] = {
-					text: o[n[i].row - 1],
+				o[ n[i].row - 1 ] = {
+					text: o[ n[i].row - 1 ],
 					row: i - 1
 				};
 			}
@@ -1496,49 +1866,52 @@ QUnit.diff = (function() {
 		};
 	}
 
-	return function(o, n) {
-		o = o.replace(/\s+$/, '');
-		n = n.replace(/\s+$/, '');
-		var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
+	return function( o, n ) {
+		o = o.replace( /\s+$/, "" );
+		n = n.replace( /\s+$/, "" );
 
-		var str = "";
+		var i, pre,
+			str = "",
+			out = diff( o === "" ? [] : o.split(/\s+/), n === "" ? [] : n.split(/\s+/) ),
+			oSpace = o.match(/\s+/g),
+			nSpace = n.match(/\s+/g);
 
-		var oSpace = o.match(/\s+/g);
-		if (oSpace == null) {
-			oSpace = [" "];
+		if ( oSpace == null ) {
+			oSpace = [ " " ];
 		}
 		else {
-			oSpace.push(" ");
+			oSpace.push( " " );
 		}
-		var nSpace = n.match(/\s+/g);
-		if (nSpace == null) {
-			nSpace = [" "];
+
+		if ( nSpace == null ) {
+			nSpace = [ " " ];
 		}
 		else {
-			nSpace.push(" ");
+			nSpace.push( " " );
 		}
 
-		if (out.n.length == 0) {
-			for (var i = 0; i < out.o.length; i++) {
-				str += '<del>' + out.o[i] + oSpace[i] + "</del>";
+		if ( out.n.length === 0 ) {
+			for ( i = 0; i < out.o.length; i++ ) {
+				str += "<del>" + out.o[i] + oSpace[i] + "</del>";
 			}
 		}
 		else {
-			if (out.n[0].text == null) {
-				for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
-					str += '<del>' + out.o[n] + oSpace[n] + "</del>";
+			if ( out.n[0].text == null ) {
+				for ( n = 0; n < out.o.length && out.o[n].text == null; n++ ) {
+					str += "<del>" + out.o[n] + oSpace[n] + "</del>";
 				}
 			}
 
-			for (var i = 0; i < out.n.length; i++) {
+			for ( i = 0; i < out.n.length; i++ ) {
 				if (out.n[i].text == null) {
-					str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
+					str += "<ins>" + out.n[i] + nSpace[i] + "</ins>";
 				}
 				else {
-					var pre = "";
+					// `pre` initialized at top of scope
+					pre = "";
 
-					for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
-						pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
+					for ( n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++ ) {
+						pre += "<del>" + out.o[n] + oSpace[n] + "</del>";
 					}
 					str += " " + out.n[i].text + nSpace[i] + pre;
 				}
@@ -1547,6 +1920,12 @@ QUnit.diff = (function() {
 
 		return str;
 	};
-})();
+}());
+
+// for CommonJS enviroments, export everything
+if ( typeof exports !== "undefined" ) {
+	extend(exports, QUnit);
+}
 
-})(this);
+// get at whatever the global object is, like window in browsers
+}( (function() {return this;}.call()) ));
diff --git a/js/jquery.mobile.controlGroup.js b/js/jquery.mobile.controlGroup.js
index 4d14ff6..9e72818 100644
--- a/js/jquery.mobile.controlGroup.js
+++ b/js/jquery.mobile.controlGroup.js
@@ -25,16 +25,25 @@ $.fn.controlgroup = function( options ) {
 						excludeInvisible: true,
 						mini: $el.jqmData( "mini" )
 					}, options ),
-			groupheading = $el.children( "legend" ),
+			grouplegend = $el.children( "legend" ),
+			groupheading = $el.children( ".ui-controlgroup-label" ),
+			groupcontrols = $el.children( ".ui-controlgroup-controls" ),
 			flCorners = o.direction === "horizontal" ? [ "ui-corner-left", "ui-corner-right" ] : [ "ui-corner-top", "ui-corner-bottom" ],
 			type = $el.find( "input" ).first().attr( "type" );
 
+		// First unwrap the controls if the controlgroup was already enhanced
+		if ( groupcontrols.length ) {
+			groupcontrols.contents().unwrap();
+		}
 		$el.wrapInner( "<div class='ui-controlgroup-controls'></div>" );
 
-		// Replace legend with more stylable replacement div
-		if ( groupheading.length ) {
-			$( "<div role='heading' class='ui-controlgroup-label'>" + groupheading.html() + "</div>" ).insertBefore( $el.children( 0 ) );
-			groupheading.remove();
+		if ( grouplegend.length ) {
+			// Replace legend with more stylable replacement div
+			$( "<div role='heading' class='ui-controlgroup-label'>" + grouplegend.html() + "</div>" ).insertBefore( $el.children( 0 ) );
+			grouplegend.remove();
+		} else if ( groupheading.length ) {
+			// Just move the heading if the controlgroup was already enhanced
+			$el.prepend( groupheading );
 		}
 
 		$el.addClass( "ui-corner-all ui-controlgroup ui-controlgroup-" + o.direction );
diff --git a/js/transitions/flip.js b/js/transitions/flip.js
index df7a154..551fc9f 100644
--- a/js/transitions/flip.js
+++ b/js/transitions/flip.js
@@ -6,7 +6,7 @@
 //>>description: Animation styles and fallback transitions definition for non-3D supporting browsers
 //>>label: Flip Transition
 //>>group: Transitions
-//>>css.structure: ../../css/structure/jquery.mobile.transitions.flip.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.flip.css
 
 define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) {
 //>>excludeEnd("jqmBuildExclude");
diff --git a/js/transitions/flow.js b/js/transitions/flow.js
index 435f22b..be1ce79 100644
--- a/js/transitions/flow.js
+++ b/js/transitions/flow.js
@@ -6,7 +6,7 @@
 //>>description: Animation styles and fallback transitions definition for non-3D supporting browsers
 //>>label: Flow Transition
 //>>group: Transitions
-//>>css.structure: ../../css/structure/jquery.mobile.transitions.flow.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.flow.css
 
 define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) {
 //>>excludeEnd("jqmBuildExclude");
diff --git a/js/transitions/pop.js b/js/transitions/pop.js
index 648c789..2ade187 100644
--- a/js/transitions/pop.js
+++ b/js/transitions/pop.js
@@ -6,7 +6,7 @@
 //>>description: Animation styles and fallback transitions definition for non-3D supporting browsers
 //>>label: Pop Transition
 //>>group: Transitions
-//>>css.structure: ../../css/structure/jquery.mobile.transitions.pop.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.pop.css
 
 define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) {
 //>>excludeEnd("jqmBuildExclude");
diff --git a/js/transitions/slide.js b/js/transitions/slide.js
index f9c6bfc..d45d55c 100644
--- a/js/transitions/slide.js
+++ b/js/transitions/slide.js
@@ -6,7 +6,7 @@
 //>>description: Animation styles and fallback transitions definition for non-3D supporting browsers
 //>>label: Slide Transition
 //>>group: Transitions
-//>>css.structure: ../../css/structure/jquery.mobile.transitions.slide.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.slide.css
 
 define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) {
 //>>excludeEnd("jqmBuildExclude");
diff --git a/js/transitions/slidedown.js b/js/transitions/slidedown.js
index 0edaef8..94d191e 100644
--- a/js/transitions/slidedown.js
+++ b/js/transitions/slidedown.js
@@ -6,7 +6,7 @@
 //>>description: Animation styles and fallback transitions definition for non-3D supporting browsers
 //>>label: Slidedown Transition
 //>>group: Transitions
-//>>css.structure: ../../css/structure/jquery.mobile.transitions.slidedown.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.slidedown.css
 
 define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) {
 //>>excludeEnd("jqmBuildExclude");
diff --git a/js/transitions/slidefade.js b/js/transitions/slidefade.js
index 83edea0..d2b33db 100644
--- a/js/transitions/slidefade.js
+++ b/js/transitions/slidefade.js
@@ -6,7 +6,7 @@
 //>>description: Animation styles and fallback transitions definition for non-3D supporting browsers
 //>>label: Slidefade Transition
 //>>group: Transitions
-//>>css.structure: ../../css/structure/jquery.mobile.transitions.slidefade.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.slidefade.css
 
 define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) {
 //>>excludeEnd("jqmBuildExclude");
diff --git a/js/transitions/slideup.js b/js/transitions/slideup.js
index e945f76..881ca3d 100644
--- a/js/transitions/slideup.js
+++ b/js/transitions/slideup.js
@@ -6,7 +6,7 @@
 //>>description: Animation styles and fallback transitions definition for non-3D supporting browsers
 //>>label: Slideup Transition
 //>>group: Transitions
-//>>css.structure: ../../css/structure/jquery.mobile.transitions.slideup.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.slideup.css
 
 define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) {
 //>>excludeEnd("jqmBuildExclude");
diff --git a/js/transitions/turn.js b/js/transitions/turn.js
index c1e6d99..40ada94 100644
--- a/js/transitions/turn.js
+++ b/js/transitions/turn.js
@@ -6,7 +6,7 @@
 //>>description: Animation styles and fallback transitions definition for non-3D supporting browsers
 //>>label: Turn Transition
 //>>group: Transitions
-//>>css.structure: ../../css/structure/jquery.mobile.transitions.turn.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.turn.css
 
 define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) {
 //>>excludeEnd("jqmBuildExclude");
diff --git a/js/widgets/listview.autodividers.js b/js/widgets/listview.autodividers.js
index aff4451..5e2dc02 100644
--- a/js/widgets/listview.autodividers.js
+++ b/js/widgets/listview.autodividers.js
@@ -7,8 +7,8 @@ define( [ "jquery", "./listview" ], function( $ ) {
 
 $.mobile.listview.prototype.options.autodividers = false;
 $.mobile.listview.prototype.options.autodividersSelector = function( elt ) {
-	// look for the first anchor in the item
-	var text = elt.find( 'a' ).text() || elt.text() || null;
+	// look for the text in the given element
+	var text = elt.text() || null;
 
 	if ( !text ) {
 		return null;
diff --git a/js/widgets/listview.filter.js b/js/widgets/listview.filter.js
index 6cecb38..447d354 100644
--- a/js/widgets/listview.filter.js
+++ b/js/widgets/listview.filter.js
@@ -12,9 +12,11 @@ $.mobile.listview.prototype.options.filter = false;
 $.mobile.listview.prototype.options.filterPlaceholder = "Filter items...";
 $.mobile.listview.prototype.options.filterTheme = "c";
 // TODO rename callback/deprecate and default to the item itself as the first argument
-$.mobile.listview.prototype.options.filterCallback = function( text, searchValue, item ) {
-	return text.toString().toLowerCase().indexOf( searchValue ) === -1;
-};
+var defaultFilterCallback = function( text, searchValue, item ) {
+		return text.toString().toLowerCase().indexOf( searchValue ) === -1;
+	};
+
+$.mobile.listview.prototype.options.filterCallback = defaultFilterCallback;
 
 $( document ).delegate( ":jqmData(role='listview')", "listviewcreate", function() {
 
@@ -42,13 +44,17 @@ $( document ).delegate( ":jqmData(role='listview')", "listviewcreate", function(
 				lastval = $this.jqmData( "lastval" ) + "",
 				childItems = false,
 				itemtext = "",
-				item;
+				item,
+				// Check if a custom filter callback applies
+				isCustomFilterCallback = listview.options.filterCallback !== defaultFilterCallback;
+
+			listview._trigger( "beforefilter", "beforefilter", { input: this } );
 
 			// Change val as lastval for next execution
 			$this.jqmData( "lastval" , val );
-			if ( val.length < lastval.length || val.indexOf( lastval ) !== 0 ) {
+			if ( isCustomFilterCallback || val.length < lastval.length || val.indexOf( lastval ) !== 0 ) {
 
-				// Removed chars or pasted something totally different, check all items
+				// Custom filter callback applies or removed chars or pasted something totally different, check all items
 				listItems = list.children();
 			} else {
 
diff --git a/js/widgets/popup.js b/js/widgets/popup.js
index 84e4130..9a6bcf2 100644
--- a/js/widgets/popup.js
+++ b/js/widgets/popup.js
@@ -88,7 +88,7 @@ define( [ "jquery",
 		_resizeTimeout: function() {
 			if ( !this._maybeRefreshTimeout() ) {
 				// effectively rapid-open the popup while leaving the screen intact
-				this.element.trigger( "popupbeforeposition" );
+				this._trigger( "beforeposition" );
 				this._ui.container
 					.removeClass( "ui-selectmenu-hidden" )
 					.offset( this._placementCoords( this._desiredCoords( undefined, undefined, "window" ) ) )
@@ -476,7 +476,7 @@ define( [ "jquery",
 			this._ui.container.addClass( "ui-popup-active" );
 			this._isOpen = true;
 			this._ui.container.attr( "tabindex", "0" ).focus();
-			this.element.trigger( "popupafteropen" );
+			this._trigger( "afteropen" );
 		},
 
 		_open: function( options ) {
@@ -489,7 +489,7 @@ define( [ "jquery",
 			transition = options.transition;
 
 			// Give applications a chance to modify the contents of the container before it appears
-			this.element.trigger( "popupbeforeposition" );
+			this._trigger( "beforeposition" );
 
 			coords = this._placementCoords( this._desiredCoords( options.x, options.y, options.positionTo || this.options.positionTo || "origin" ) );
 
@@ -544,7 +544,7 @@ define( [ "jquery",
 
 		_closePrereqsDone: function() {
 			this._ui.container.removeAttr( "tabindex" );
-			this.element.trigger( "popupafterclose" );
+			this._trigger( "afterclose" );
 		},
 
 		_close: function() {
diff --git a/tests/jquery.testHelper.js b/tests/jquery.testHelper.js
index 7dceff6..e22641b 100644
--- a/tests/jquery.testHelper.js
+++ b/tests/jquery.testHelper.js
@@ -253,9 +253,9 @@
 				pathnameOnward = location.href.replace( parts.domain, "" );
 
 			if( $.support.pushState ) {
-				same( pathnameOnward, args.hashOrPush || args.push, args.report );
+				deepEqual( pathnameOnward, args.hashOrPush || args.push, args.report );
 			} else {
-				same( parts.hash, "#" + (args.hashOrPush || args.hash), args.report );
+				deepEqual( parts.hash, "#" + (args.hashOrPush || args.hash), args.report );
 			}
 		},
 
diff --git a/tests/unit/button-markup/buttonMarkup_core.js b/tests/unit/button-markup/buttonMarkup_core.js
index b690bdc..66ce47c 100644
--- a/tests/unit/button-markup/buttonMarkup_core.js
+++ b/tests/unit/button-markup/buttonMarkup_core.js
@@ -18,10 +18,10 @@
 		group = $("#control-group-footer");
 		linkCount = group.find( "a" ).length;
 
-		same( group.find("a.ui-btn").length, linkCount, "all 4 links should be buttons");
-		same( group.find("a > span.ui-corner-left").length, 1, "only 1 left cornered button");
-		same( group.find("a > span.ui-corner-right").length, 1, "only 1 right cornered button");
-		same( group.find("a > span:not(.ui-corner-left):not(.ui-corner-right)").length, linkCount - 2, "only 2 buttons are cornered");
+		deepEqual( group.find("a.ui-btn").length, linkCount, "all 4 links should be buttons");
+		deepEqual( group.find("a > span.ui-corner-left").length, 1, "only 1 left cornered button");
+		deepEqual( group.find("a > span.ui-corner-right").length, 1, "only 1 right cornered button");
+		deepEqual( group.find("a > span:not(.ui-corner-left):not(.ui-corner-right)").length, linkCount - 2, "only 2 buttons are cornered");
 	});
 
 	test( "control group buttons should respect theme-related data attributes", function(){
diff --git a/tests/unit/button/button_core.js b/tests/unit/button/button_core.js
index a7b3e2e..c10e3e5 100644
--- a/tests/unit/button/button_core.js
+++ b/tests/unit/button/button_core.js
@@ -5,7 +5,7 @@
 	$.mobile.page.prototype.options.keepNative = "button.should-be-native";
 
 	test( "button elements in the keepNative set shouldn't be enhanced", function() {
-		same( $("button.should-be-native").siblings("div.ui-slider").length, 0 );
+		deepEqual( $("button.should-be-native").siblings("div.ui-slider").length, 0 );
 	});
 
 	test( "button elements should be enhanced", function() {
@@ -17,21 +17,21 @@
 
 		// the value shouldn't change unless it's been altered
 		textValueButton.button( 'refresh' );
-		same( textValueButton.siblings().text(), "foo" );
+		deepEqual( textValueButton.siblings().text(), "foo" );
 
 		// use the text where it's provided
-		same( textValueButton.siblings().text(), "foo" );
+		deepEqual( textValueButton.siblings().text(), "foo" );
 		textValueButton.text( "bar" ).button( 'refresh' );
-		same( textValueButton.siblings().text(), "bar" );
+		deepEqual( textValueButton.siblings().text(), "bar" );
 
 		// use the val if it's provided where the text isn't
-		same( valueButton.siblings().text(), "foo" );
+		deepEqual( valueButton.siblings().text(), "foo" );
 		valueButton.val( "bar" ).button( 'refresh' );
-		same( valueButton.siblings().text(), "bar" );
+		deepEqual( valueButton.siblings().text(), "bar" );
 
 		// prefer the text to the value
 		textValueButton.text( "bar" ).val( "baz" ).button( 'refresh' );
-		same( textValueButton.siblings().text(), "bar" );
+		deepEqual( textValueButton.siblings().text(), "bar" );
 	});
 
 	// Issue 2877
@@ -41,10 +41,10 @@
 
 		for( var x = 0; x < count; x++ ) {
 			$( "#hidden-element-addition" ).trigger( "vclick" );
-			same( $form.find( "input[type='hidden']" ).length, 1, "hidden form input should be added" );
+			deepEqual( $form.find( "input[type='hidden']" ).length, 1, "hidden form input should be added" );
 
 			$form.trigger( "submit" );
-			same( $form.find( "[type='hidden']" ).length, 0, "hidden form input is removed" );
+			deepEqual( $form.find( "[type='hidden']" ).length, 0, "hidden form input is removed" );
 		}
 	});
 
diff --git a/tests/unit/checkboxradio/checkboxradio_core.js b/tests/unit/checkboxradio/checkboxradio_core.js
index 8114d58..a09a988 100644
--- a/tests/unit/checkboxradio/checkboxradio_core.js
+++ b/tests/unit/checkboxradio/checkboxradio_core.js
@@ -70,7 +70,7 @@
 	asyncTest( "radio button labels should update the active button class to last clicked and clear checked", function(){
 		var $radioBtns = $( '#radio-active-btn-test input' ),
 			singleActiveAndChecked = function(){
-				same( $( "#radio-active-btn-test .ui-radio-on" ).length, 1, "there should be only one active button" );
+				deepEqual( $( "#radio-active-btn-test .ui-radio-on" ).length, 1, "there should be only one active button" );
 				// Use the .checked property, not the checked attribute which is not dynamic
 				var numChecked = 0;
 				$( "#radio-active-btn-test input" ).each(function(i, e) {
@@ -78,7 +78,7 @@
 						numChecked++;
 					}
 				});
-				same( numChecked, 1, "there should be only one checked" );
+				deepEqual( numChecked, 1, "there should be only one checked" );
 			};
 
 		$.testHelper.sequence([
diff --git a/tests/unit/collapsible/collapsible_core.js b/tests/unit/collapsible/collapsible_core.js
index 6a61554..0e1f426 100644
--- a/tests/unit/collapsible/collapsible_core.js
+++ b/tests/unit/collapsible/collapsible_core.js
@@ -92,7 +92,7 @@
 			},
 
 			function() {
-				equals($( "#basic-collapsible-set-test .ui-content >:eq(0) .ui-collapsible-collapsed" ).length, 2, "There should be 2 section collapsed" );
+				equal($( "#basic-collapsible-set-test .ui-content >:eq(0) .ui-collapsible-collapsed" ).length, 2, "There should be 2 section collapsed" );
 				ok(!$( "#basic-collapsible-set-test .ui-content >:eq(0) >:eq(1)" ).hasClass( "ui-collapsible-collapsed" ), "Section B should be expanded" );
 				start();
 			}
diff --git a/tests/unit/controlgroup/controlgroup_core.js b/tests/unit/controlgroup/controlgroup_core.js
index eaf97fc..943fb42 100644
--- a/tests/unit/controlgroup/controlgroup_core.js
+++ b/tests/unit/controlgroup/controlgroup_core.js
@@ -133,13 +133,13 @@
 		// attempt to enhance the controlgroup
 		$unenhancedFieldSet.parent().trigger("create");
 
-		same( $unenhancedFieldSet.length, 1, "the fieldset test fixtures exist" );
+		deepEqual( $unenhancedFieldSet.length, 1, "the fieldset test fixtures exist" );
 		ok( !$unenhancedFieldSet.is(".ui-controlgroup"), "there is no control group" );
 
 		// attempt to enhance the controlgroup
 		$enhancedFieldSet.parent().trigger("create");
 
-		same( $enhancedFieldSet.length, 1, "the fieldset test fixtures exist" );
+		deepEqual( $enhancedFieldSet.length, 1, "the fieldset test fixtures exist" );
 		ok( $enhancedFieldSet.is(".ui-controlgroup"), "there is a control group" );
 
 		$.mobile.ignoreContentEnabled = false;
diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index 1b60562..b733f67 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -94,95 +94,95 @@
 	test( "$.fn.jqmData and $.fn.jqmRemoveData methods are working properly", function(){
 		var data;
 
-		same( $("body").jqmData("foo", true), $("body"), "setting data returns the element" );
+		deepEqual( $("body").jqmData("foo", true), $("body"), "setting data returns the element" );
 
-		same( $("body").jqmData("foo"), true, "getting data returns the right value" );
+		deepEqual( $("body").jqmData("foo"), true, "getting data returns the right value" );
 
-		same( $("body").data($.mobile.nsNormalize("foo")), true, "data was set using namespace" );
+		deepEqual( $("body").data($.mobile.nsNormalize("foo")), true, "data was set using namespace" );
 
-		same( $("body").jqmData("foo", undefined), true, "getting data still returns the value if there's an undefined second arg" );
+		deepEqual( $("body").jqmData("foo", undefined), true, "getting data still returns the value if there's an undefined second arg" );
 
 		data = $.extend( {}, $("body").data() );
 		delete data[ $.expando ]; //discard the expando for that test
-		same( data , { "nstestFoo": true }, "passing .data() no arguments returns a hash with all set properties" );
+		deepEqual( data , { "nstestFoo": true }, "passing .data() no arguments returns a hash with all set properties" );
 
-		same( $("body").jqmData(), undefined, "passing no arguments returns undefined" );
+		deepEqual( $("body").jqmData(), undefined, "passing no arguments returns undefined" );
 
-		same( $("body").jqmData(undefined), undefined, "passing a single undefined argument returns undefined" );
+		deepEqual( $("body").jqmData(undefined), undefined, "passing a single undefined argument returns undefined" );
 
-		same( $("body").jqmData(undefined, undefined), undefined, "passing 2 undefined arguments returns undefined" );
+		deepEqual( $("body").jqmData(undefined, undefined), undefined, "passing 2 undefined arguments returns undefined" );
 
-		same( $("body").jqmRemoveData("foo"), $("body"), "jqmRemoveData returns the element" );
+		deepEqual( $("body").jqmRemoveData("foo"), $("body"), "jqmRemoveData returns the element" );
 
-		same( $("body").jqmData("foo"), undefined, "jqmRemoveData properly removes namespaced data" );
+		deepEqual( $("body").jqmData("foo"), undefined, "jqmRemoveData properly removes namespaced data" );
 
 	});
 
 
 	test( "$.jqmData and $.jqmRemoveData methods are working properly", function(){
-		same( $.jqmData(document.body, "foo", true), true, "setting data returns the value" );
+		deepEqual( $.jqmData(document.body, "foo", true), true, "setting data returns the value" );
 
-		same( $.jqmData(document.body, "foo"), true, "getting data returns the right value" );
+		deepEqual( $.jqmData(document.body, "foo"), true, "getting data returns the right value" );
 
-		same( $.data(document.body, $.mobile.nsNormalize("foo")), true, "data was set using namespace" );
+		deepEqual( $.data(document.body, $.mobile.nsNormalize("foo")), true, "data was set using namespace" );
 
-		same( $.jqmData(document.body, "foo", undefined), true, "getting data still returns the value if there's an undefined second arg" );
+		deepEqual( $.jqmData(document.body, "foo", undefined), true, "getting data still returns the value if there's an undefined second arg" );
 
-		same( $.jqmData(document.body), undefined, "passing no arguments returns undefined" );
+		deepEqual( $.jqmData(document.body), undefined, "passing no arguments returns undefined" );
 
-		same( $.jqmData(document.body, undefined), undefined, "passing a single undefined argument returns undefined" );
+		deepEqual( $.jqmData(document.body, undefined), undefined, "passing a single undefined argument returns undefined" );
 
-		same( $.jqmData(document.body, undefined, undefined), undefined, "passing 2 undefined arguments returns undefined" );
+		deepEqual( $.jqmData(document.body, undefined, undefined), undefined, "passing 2 undefined arguments returns undefined" );
 
-		same( $.jqmRemoveData(document.body, "foo"), undefined, "jqmRemoveData returns the undefined value" );
+		deepEqual( $.jqmRemoveData(document.body, "foo"), undefined, "jqmRemoveData returns the undefined value" );
 
-		same( $("body").jqmData("foo"), undefined, "jqmRemoveData properly removes namespaced data" );
+		deepEqual( $("body").jqmData("foo"), undefined, "jqmRemoveData properly removes namespaced data" );
 
 	});
 
 	test( "addDependents works properly", function() {
-		same( $("#parent").jqmData('dependents'), undefined );
+		deepEqual( $("#parent").jqmData('dependents'), undefined );
 		$( "#parent" ).addDependents( $("#dependent") );
-		same( $("#parent").jqmData('dependents').length, 1 );
+		deepEqual( $("#parent").jqmData('dependents').length, 1 );
 	});
 
 	test( "removeWithDependents removes the parent element and ", function(){
 		$( "#parent" ).addDependents( $("#dependent") );
-		same($( "#parent, #dependent" ).length, 2);
+		deepEqual($( "#parent, #dependent" ).length, 2);
 		$( "#parent" ).removeWithDependents();
-		same($( "#parent, #dependent" ).length, 0);
+		deepEqual($( "#parent, #dependent" ).length, 0);
 	});
 
 	test( "$.fn.getEncodedText should return the encoded value where $.fn.text doesn't", function() {
-		same( $("#encoded").text(), "foo>");
-		same( $("#encoded").getEncodedText(), "foo&gt;");
-		same( $("#unencoded").getEncodedText(), "var foo;");
+		deepEqual( $("#encoded").text(), "foo>");
+		deepEqual( $("#encoded").getEncodedText(), "foo&gt;");
+		deepEqual( $("#unencoded").getEncodedText(), "var foo;");
 	});
 
 	test( "closestPageData returns the parent's page data", function() {
 		var pageChild = $( "#page-child" );
 
 		$( "#parent-page" ).data( "page", { foo: "bar" } );
-		same( $.mobile.closestPageData( pageChild ).foo, "bar" );
+		deepEqual( $.mobile.closestPageData( pageChild ).foo, "bar" );
 	});
 
 	test( "closestPageData returns the parent dialog's page data", function() {
 		var dialogChild = $( "#dialog-child" );
 
 		$( "#parent-dialog" ).data( "page", { foo: "bar" } );
-		same( $.mobile.closestPageData(dialogChild).foo, "bar" );
+		deepEqual( $.mobile.closestPageData(dialogChild).foo, "bar" );
 	});
 
 	test( "test that $.fn.jqmHijackable works", function() {
 		$.mobile.ignoreContentEnabled = true;
 
-		same( $( "#hijacked-link" ).jqmHijackable().length, 1,
+		deepEqual( $( "#hijacked-link" ).jqmHijackable().length, 1,
 					"a link without any association to data-ajax=false should be included");
 
-		same( $( "#unhijacked-link-by-parent" ).jqmHijackable().length, 0,
+		deepEqual( $( "#unhijacked-link-by-parent" ).jqmHijackable().length, 0,
 					"a link with a data-ajax=false parent should be excluded");
 
-		same( $( "#unhijacked-link-by-attr" ).jqmHijackable().length, 0,
+		deepEqual( $( "#unhijacked-link-by-attr" ).jqmHijackable().length, 0,
 					"a link with data-ajax=false should be excluded");
 
 		$.mobile.ignoreContentEnabled = false;
diff --git a/tests/unit/core/core_scroll.js b/tests/unit/core/core_scroll.js
index d1b8ef0..8bf5c9e 100644
--- a/tests/unit/core/core_scroll.js
+++ b/tests/unit/core/core_scroll.js
@@ -27,7 +27,7 @@
 		scrollUp();
 
 		setTimeout(function(){
-			same($(window).scrollTop(), 0);
+			deepEqual($(window).scrollTop(), 0);
 			start();
 		}, scrollTimeout);
 	});
@@ -37,7 +37,7 @@
 		scrollUp(pos);
 
 		setTimeout(function(){
-			same($(window).scrollTop(), pos);
+			deepEqual($(window).scrollTop(), pos);
 			start();
 		}, scrollTimeout);
 	});
diff --git a/tests/unit/degrade-inputs/degradeInputs.js b/tests/unit/degrade-inputs/degradeInputs.js
index 98659a9..ae76f71 100644
--- a/tests/unit/degrade-inputs/degradeInputs.js
+++ b/tests/unit/degrade-inputs/degradeInputs.js
@@ -6,7 +6,7 @@
 	module('jquery.mobile.degradeInputs.js');
 
 	test('keepNative elements should not be degraded', function() {
-		same($('input#not-to-be-degraded').attr("type"), "range");
+		deepEqual($('input#not-to-be-degraded').attr("type"), "range");
 	});
 
 	asyncTest('should degrade input type to a different type, as specified in page options', function(){
@@ -29,11 +29,11 @@
 
 					$('#page-test-container').html('<input type="' + oldType + '" />').trigger("create");
 
-					same($('#page-test-container input').attr("type"), newType, "type attr on page is: " + newType);
+					deepEqual($('#page-test-container input').attr("type"), newType, "type attr on page is: " + newType);
 
 					$('#dialog-test-container').html('<input type="' + oldType + '" />').trigger("create");
 
-					same($('#dialog-test-container input').attr("type"), newType, "type attr on dialog is: " + newType);
+					deepEqual($('#dialog-test-container input').attr("type"), newType, "type attr on dialog is: " + newType);
 				});
 
 				start();
diff --git a/tests/unit/event/event_core.js b/tests/unit/event/event_core.js
index 128e70f..56c5f63 100644
--- a/tests/unit/event/event_core.js
+++ b/tests/unit/event/event_core.js
@@ -36,7 +36,7 @@
 		test( "new events defined on the jquery object", function(){
 			$.each(events, function( i, name ) {
 				delete $.fn[name];
-				same($.fn[name], undefined);
+				deepEqual($.fn[name], undefined);
 			});
 
 			$.each( components, function( index, value ) { $.testHelper.reloadLib( value ); });
@@ -151,7 +151,7 @@
 
 		setTimeout(function(){
 			ok( !taphold, "taphold not fired" );
-			same( target, undefined, "taphold target should be #qunit-fixture" );
+			deepEqual( target, undefined, "taphold target should be #qunit-fixture" );
 		}, $.event.special.tap.tapholdThreshold - 10);
 
 
@@ -254,11 +254,11 @@
 			$qf = $( "#qunit-fixture" ),
 			$doc = $( document ),
 			docTapCB = function(){
-				same(++tap, 2, "document tap callback called once after #qunit-fixture callback");
+				deepEqual(++tap, 2, "document tap callback called once after #qunit-fixture callback");
 			};
 
 		$qf.bind( "tap", function() {
-			same(++tap, 1, "#qunit-fixture tap callback called once");
+			deepEqual(++tap, 1, "#qunit-fixture tap callback called once");
 		});
 
 		$doc.bind( "tap", docTapCB );
@@ -269,7 +269,7 @@
 
 		// tap binding should be triggered twice, once for
 		// #qunit-fixture, and a second time for document.
-		same( tap, 2, "final tap callback count is 2" );
+		deepEqual( tap, 2, "final tap callback count is 2" );
 
 		$doc.unbind( "tap", docTapCB );
 
@@ -285,11 +285,11 @@
 			};
 
 		$qf.bind( "tap", function(e) {
-			same(++tap, 1, "tap callback 1 triggered once on #qunit-fixture");
+			deepEqual(++tap, 1, "tap callback 1 triggered once on #qunit-fixture");
 			e.stopPropagation();
 		})
 		.bind( "tap", function(e) {
-			same(++tap, 2, "tap callback 2 triggered once on #qunit-fixture");
+			deepEqual(++tap, 2, "tap callback 2 triggered once on #qunit-fixture");
 		});
 
 		$doc.bind( "tap", docTapCB);
@@ -299,7 +299,7 @@
 			.trigger( "vclick" );
 
 		// tap binding should be triggered twice.
-		same( tap, 2, "final tap count is 2" );
+		deepEqual( tap, 2, "final tap count is 2" );
 
 		$doc.unbind( "tap", docTapCB );
 
@@ -317,7 +317,7 @@
 		// Bind 2 tap callbacks on qunit-fixture. Only the first
 		// one should ever be called.
 		$cf.bind( "tap", function(e) {
-			same(++tap, 1, "tap callback 1 triggered once on #qunit-fixture");
+			deepEqual(++tap, 1, "tap callback 1 triggered once on #qunit-fixture");
 			e.stopImmediatePropagation();
 		})
 		.bind( "tap", function(e) {
@@ -331,7 +331,7 @@
 			.trigger( "vclick" );
 
 		// tap binding should be triggered once.
-		same( tap, 1, "final tap count is 1" );
+		deepEqual( tap, 1, "final tap count is 1" );
 
 		$doc.unbind( "tap", docTapCB );
 
@@ -367,7 +367,7 @@
 		}, opts.timeout + 100);
 
 		setTimeout(function(){
-			same(swipe, opts.expected, "swipe expected");
+			deepEqual(swipe, opts.expected, "swipe expected");
 			start();
 		}, opts.timeout + 200);
 
@@ -454,7 +454,7 @@
 
 	var nativeSupportTest = function(opts){
 		$.support.orientation = opts.orientationSupport;
-		same($.event.special.orientationchange[opts.method](), opts.returnValue);
+		deepEqual($.event.special.orientationchange[opts.method](), opts.returnValue);
 	};
 
 	test( "orientation change setup should do nothing when natively supported", function(){
@@ -515,7 +515,7 @@
 			},
 
 			// verify that only one throttled resize was called after 250ms
-			function(){ same( called, 1 ); },
+			function(){ deepEqual( called, 1 ); },
 
 			function(){
 				start();
@@ -550,7 +550,7 @@
 
 	asyncTest( "mousedown mouseup and click events should add a which when its not defined", function() {
 		var whichDefined = function( event ){
-			same(event.which, 1);
+			deepEqual(event.which, 1);
 		};
 
 		$( document ).bind( "vclick", whichDefined);
@@ -560,7 +560,7 @@
 		$( document ).trigger( "mousedown" );
 
 		$( document ).bind( "vmouseup", function( event ){
-			same(event.which, 1);
+			deepEqual(event.which, 1);
 			start();
 		});
 
diff --git a/tests/unit/field-contain/fieldContain_events.js b/tests/unit/field-contain/fieldContain_events.js
index 75066bf..10c710e 100644
--- a/tests/unit/field-contain/fieldContain_events.js
+++ b/tests/unit/field-contain/fieldContain_events.js
@@ -20,7 +20,7 @@
 
 		$( "#ignore-container-tests" ).trigger( "create" );
 
-		same( $ignored.attr( "class" ), undefined, "ignored div does not have field contain class" );
+		deepEqual( $ignored.attr( "class" ), undefined, "ignored div does not have field contain class" );
 		ok( $enhanced.hasClass( "ui-field-contain" ), "enhanced div has field contain class" );
 
 		$.mobile.ignoreContentEnabled = false;
diff --git a/tests/unit/fixed-toolbar/fixedToolbar.js b/tests/unit/fixed-toolbar/fixedToolbar.js
index f5cf750..fcb6cc1 100644
--- a/tests/unit/fixed-toolbar/fixedToolbar.js
+++ b/tests/unit/fixed-toolbar/fixedToolbar.js
@@ -274,14 +274,14 @@
 			function(){
 				$( "#persist-test-d" )
 					.one( "pagebeforeshow", function(){
-						same( nextpageheader.parent()[0], $.mobile.pageContainer[0], "fixed header is now a child of page container" );
+						deepEqual( nextpageheader.parent()[0], $.mobile.pageContainer[0], "fixed header is now a child of page container" );
 					});
 
 				$.mobile.changePage( "#persist-test-d" );
 			},
 
 			function() {
-				same( nextpageheader.parent()[0], $.mobile.activePage[0], "fixed header is now a child of page again" );
+				deepEqual( nextpageheader.parent()[0], $.mobile.activePage[0], "fixed header is now a child of page again" );
 				$.mobile.changePage( "#default" );
 			},
 
@@ -306,14 +306,14 @@
 			function(){
 				$( "#persist-test-f" )
 					.one( "pagebeforeshow", function(){
-						same( nextpagefooter.parent()[0], $.mobile.pageContainer[0], "fixed footer is now a child of page container" );
+						deepEqual( nextpagefooter.parent()[0], $.mobile.pageContainer[0], "fixed footer is now a child of page container" );
 					});
 
 				$.mobile.changePage( "#persist-test-f" );
 			},
 
 			function() {
-				same( nextpagefooter.parent()[0], $.mobile.activePage[0], "fixed footer is now a child of page again" );
+				deepEqual( nextpagefooter.parent()[0], $.mobile.activePage[0], "fixed footer is now a child of page again" );
 				$.mobile.changePage( "#default" );
 			},
 
diff --git a/tests/unit/init/init_core.js b/tests/unit/init/init_core.js
index fd3a671..ddf7678 100644
--- a/tests/unit/init/init_core.js
+++ b/tests/unit/init/init_core.js
@@ -82,7 +82,7 @@
 
 			$.testHelper.reloadLib(libName);
 
-			same( $.mobile.useFastClick, false , "fast click is set to false after init" );
+			deepEqual( $.mobile.useFastClick, false , "fast click is set to false after init" );
 			$.mobile.useFastClick = true;
 		});
 
@@ -95,8 +95,8 @@
 			$.testHelper.reloadLib(libName);
 			var firstPage = findFirstPage();
 
-			same($.mobile.firstPage[0], firstPage[0]);
-			same($.mobile.activePage[0], firstPage[0]);
+			deepEqual($.mobile.firstPage[0], firstPage[0]);
+			deepEqual($.mobile.activePage[0], firstPage[0]);
 		});
 
 		test( "mobile viewport class is defined on the first page's parent", function(){
@@ -112,7 +112,7 @@
 			$.testHelper.reloadLib(libName);
 			var firstPage = findFirstPage();
 
-			same($.mobile.pageContainer[0], firstPage.parent()[0]);
+			deepEqual($.mobile.pageContainer[0], firstPage.parent()[0]);
 		});
 
 		asyncTest( "hashchange triggered on document ready with single argument: true", function(){
@@ -124,7 +124,7 @@
 				// delay the bind until the first hashchange
 				function(){
 					$(window).one("hashchange", function(ev, arg){
-						same(arg, true);
+						deepEqual(arg, true);
 						start();
 					});
 				},
@@ -136,11 +136,11 @@
 		});
 
 		test( "pages without a data-url attribute have it set to their id", function(){
-			same($("#foo").jqmData('url'), "foo");
+			deepEqual($("#foo").jqmData('url'), "foo");
 		});
 
 		test( "pages with a data-url attribute are left with the original value", function(){
-			same($("#bar").jqmData('url'), "bak");
+			deepEqual($("#bar").jqmData('url'), "bak");
 		});
 
 		// NOTE the next two tests work on timeouts that assume a page will be
@@ -159,7 +159,7 @@
 			reloadCoreNSandInit();
 
 			setTimeout(function(){
-				same( $( "#autoinit-on.ui-page" ).length, 1 );
+				deepEqual( $( "#autoinit-on.ui-page" ).length, 1 );
 
 				start();
 			}, 2000);
@@ -179,7 +179,7 @@
 			reloadCoreNSandInit();
 
 			setTimeout(function(){
-				same( $( "#autoinit-off.ui-page" ).length, 0 );
+				deepEqual( $( "#autoinit-off.ui-page" ).length, 0 );
 
 				$(document).bind("mobileinit", function(){
 					$.mobile.autoInitializePage = true;
diff --git a/tests/unit/listview/index.html b/tests/unit/listview/index.html
index df12044..48a66fa 100644
--- a/tests/unit/listview/index.html
+++ b/tests/unit/listview/index.html
@@ -258,10 +258,10 @@ <h1>Autodivider Selector Test</h1>
 	</div>
 	<div data-nstest-role="content">
 		<ul id="autodividers-selector-test-list1" data-nstest-role="listview" data-nstest-autodividers="true">
-			<li><a href="">a is for aquaman</a></li>
-			<li><a href="">b is for batman</a></li>
-			<li><a href="">c is for catwoman</a></li>
-			<li><a href="">d is for darkwing</a></li>
+			<li><a href="#">a is for aquaman</a></li>
+			<li>b is for batman</li>
+			<li><img><a href="">c is for catwoman</a><a href="">split</a></li>
+			<li><a href="#"><h2>d is for darkwing</h2></a><p>Some text</p></a></li>
 		</ul>
 
 		<ul id="autodividers-selector-test-list2" data-nstest-role="listview" data-nstest-autodividers="true">
@@ -286,6 +286,21 @@ <h1>Split List View</h1>
 			<li>d is for darkwing</li>
 		</ul>
 	</div>
+</div><!-- Search bar filter -->
+
+
+<div data-nstest-role="page" id='search-customfilter-test'>
+	<div data-nstest-role="header" data-nstest-position="inline">
+		<h1>Filtered List View</h1>
+	</div>
+	<div data-nstest-role="content">
+		<ul data-nstest-role="listview" data-nstest-filter="true">
+			<li>a is for aquaman</li>
+			<li>b is for batman</li>
+			<li>c is for catwoman</li>
+			<li>d is for darkwing</li>
+		</ul>
+	</div>
 </div><!-- Search bar filter with list-dividers -->
 
 
diff --git a/tests/unit/listview/listview_core.js b/tests/unit/listview/listview_core.js
index 51ff0c6..cd65eeb 100644
--- a/tests/unit/listview/listview_core.js
+++ b/tests/unit/listview/listview_core.js
@@ -353,7 +353,7 @@
 
 	module( "Autodividers Selector" );
 
-	asyncTest( "Adds divider text from links.", function() {
+	asyncTest( "Adds right divider text.", function() {
 		$.testHelper.pageSequence([
 			function() {
 				$.testHelper.openPage( '#autodividers-selector-test' );
@@ -363,7 +363,7 @@
 				var $new_page = $( '#autodividers-selector-test' );
 				ok($new_page.hasClass( 'ui-page-active' ));
 
-				// check we have the right dividers based on link text
+				// check we have the right dividers
 				var $list = $( '#autodividers-selector-test-list1' );
 				ok( $list.find( '.ui-li-divider' ).length === 4 );
 				ok( $list.find( '.ui-li-divider:eq(0):contains(A)' ).length === 1 );
@@ -371,8 +371,8 @@
 				ok( $list.find( '.ui-li-divider:eq(2):contains(C)' ).length === 1 );
 				ok( $list.find( '.ui-li-divider:eq(3):contains(D)' ).length === 1 );
 
-				// check that adding a new item with link creates the right divider
-				$list.append( '<li><a href="">e is for ethel</a></li>' );
+				// check that adding a new item creates the right divider
+				$list.append( '<li><a href="#">e is for ethel</a></li>' );
 				$list.listview('refresh');
 				ok( $list.find( '.ui-li-divider:eq(4):contains(E)' ).length === 1 );
 
@@ -417,11 +417,10 @@
 		]);
 	});
 
-	module( "Search Filter");
+	module( "Search Filter" );
 
 	var searchFilterId = "#search-filter-test";
 
-
 	asyncTest( "Filter downs results when the user enters information", function() {
 		var $searchPage = $(searchFilterId);
 		$.testHelper.pageSequence([
@@ -433,7 +432,7 @@
 				$searchPage.find('input').val('at');
 				$searchPage.find('input').trigger('change');
 
-				same($searchPage.find('li.ui-screen-hidden').length, 2);
+				deepEqual($searchPage.find('li.ui-screen-hidden').length, 2);
 				start();
 			}
 		]);
@@ -450,7 +449,7 @@
 				$searchPage.find('input').val('a');
 				$searchPage.find('input').trigger('change');
 
-				same($searchPage.find("li[style^='display: none;']").length, 0);
+				deepEqual($searchPage.find("li[style^='display: none;']").length, 0);
 				start();
 			}
 		]);
@@ -467,7 +466,7 @@
                 $searchPage.find('input').val('*');
                 $searchPage.find('input').trigger('change');
 
-                same($searchPage.find('li.ui-screen-hidden').length, 4);
+                deepEqual($searchPage.find('li.ui-screen-hidden').length, 4);
                 start();
             }
         ]);
@@ -495,13 +494,13 @@
 				$searchPage.find('input').trigger('change');
 				setTimeout(function() {
 					//there should be four hidden list entries
-					same($searchPage.find('li.ui-screen-hidden').length, 4);
+					deepEqual($searchPage.find('li.ui-screen-hidden').length, 4);
 
 					//there should be two list entries that are list dividers and hidden
-					same($searchPage.find('li.ui-screen-hidden:jqmData(role=list-divider)').length, 2);
+					deepEqual($searchPage.find('li.ui-screen-hidden:jqmData(role=list-divider)').length, 2);
 
 					//there should be two list entries that are not list dividers and hidden
-					same($searchPage.find('li.ui-screen-hidden:not(:jqmData(role=list-divider))').length, 2);
+					deepEqual($searchPage.find('li.ui-screen-hidden:not(:jqmData(role=list-divider))').length, 2);
 					start();
 				}, 1000);
 			}
@@ -519,8 +518,8 @@
 				$('.ui-page-active input').trigger('change');
 
 				setTimeout(function() {
-					same($('.ui-page-active input').val(), 'a');
-					same($('.ui-page-active li[style^="display: none;"]').length, 0);
+					deepEqual($('.ui-page-active input').val(), 'a');
+					deepEqual($('.ui-page-active li[style^="display: none;"]').length, 0);
 					start();
 				}, 1000);
 			}
@@ -540,9 +539,9 @@
 				$page.find('input').trigger('change');
 
 				setTimeout(function() {
-					same($page.find('li:jqmData(role=list-divider):hidden').length, 2);
-					same($page.find('li:jqmData(role=list-divider):hidden + li:not(:jqmData(role=list-divider)):hidden').length, 2);
-					same($page.find('li:jqmData(role=list-divider):not(:hidden) + li:not(:jqmData(role=list-divider)):not([:hidden)').length, 2);
+					deepEqual($page.find('li:jqmData(role=list-divider):hidden').length, 2);
+					deepEqual($page.find('li:jqmData(role=list-divider):hidden + li:not(:jqmData(role=list-divider)):hidden').length, 2);
+					deepEqual($page.find('li:jqmData(role=list-divider):not(:hidden) + li:not(:jqmData(role=list-divider)):not([:hidden)').length, 2);
 					start();
 				}, 1000);
 			}
@@ -595,6 +594,96 @@
 		]);
 	});
 
+	module( "Custom search filter", {
+		setup: function() {
+			var self = this;
+			this._refreshCornersCount = 0;
+			this._refreshCornersFn = $.mobile.listview.prototype._refreshCorners;
+
+			this.startTest = function() {
+				return this._refreshCornersCount === 1;
+			};
+
+			// _refreshCorners is the last method called in the filter loop
+			// so we count the number of times _refreshCorners gets invoked to stop the test
+			$.mobile.listview.prototype._refreshCorners = function() {
+				self._refreshCornersCount += 1;
+				self._refreshCornersFn.apply( this, arguments );
+				if ( self.startTest() ) {
+					start();
+				}
+			}
+		},
+		teardown: function() {
+			$.mobile.listview.prototype._refreshCorners = this._refreshCornersFn;
+		}
+	});
+
+	asyncTest( "Custom filterCallback should cause iteration on all list elements", function(){
+		var listPage = $( "#search-customfilter-test" ),
+			filterCallbackCount = 0,
+			expectedCount = 2 * listPage.find("li").length;
+		expect( 1 );
+
+		this.startTest = function() {
+			if ( this._refreshCornersCount === 3 ) {
+				equal( filterCallbackCount, expectedCount, "filterCallback should be call exactly "+ expectedCount +" times" );
+			}
+			return this._refreshCornersCount === 3;
+		}
+
+		$.testHelper.pageSequence( [
+			function(){
+				//reset for relative url refs
+				$.mobile.changePage( home );
+			},
+
+			function() {
+				$.mobile.changePage( "#search-customfilter-test" );
+			},
+
+			function() {
+				// set the listview instance callback
+				listPage.find( "ul" ).listview( "option", "filterCallback", function( text, searchValue, item ) {
+					filterCallbackCount += 1;
+
+					return text.toString().toLowerCase().indexOf( searchValue ) === -1;
+				});
+
+				// trigger a change in the search filter
+				listPage.find( "input" ).val( "at" ).trigger( "change" );
+				listPage.find( "input" ).val( "atw" ).trigger( "change" );
+
+			}
+		]);
+	});
+
+	asyncTest( "filterCallback can be altered after widget creation", function(){
+		var listPage = $( "#search-customfilter-test" );
+		expect( listPage.find("li").length );
+
+		$.testHelper.pageSequence( [
+			function(){
+				//reset for relative url refs
+				$.mobile.changePage( home );
+			},
+
+			function() {
+				$.mobile.changePage( "#search-customfilter-test" );
+			},
+
+			function() {
+				// set the listview instance callback
+				listPage.find( "ul" ).listview( "option", "filterCallback", function() {
+					ok( true, "custom callback invoked" );
+				});
+
+				// trigger a change in the search filter
+				listPage.find( "input" ).val( "foo" ).trigger( "change" );
+			}
+		]);
+	});
+
 	module( "Programmatically generated list items", {
 		setup: function(){
 			var item,
@@ -680,19 +769,19 @@
 				for( var t = 0; t<3; t++){
 					ul.append("<li>Item " + t + "</li>");
 					ul.listview('refresh');
-					equals(ul.find(".ui-corner-top").length, 1, "There should be only one element with class ui-corner-top");
-					equals(ul.find("li:visible").first()[0], ul.find(".ui-corner-top")[0], "First list item should have class ui-corner-top in list with " + ul.find("li").length + " item(s)");
-					equals(ul.find(".ui-corner-bottom").length, 1, "There should be only one element with class ui-corner-bottom");
-					equals(ul.find("li:visible").last()[0], ul.find(".ui-corner-bottom")[0], "Last list item should have class ui-corner-bottom in list with " + ul.find("li").length + " item(s)");
+					equal(ul.find(".ui-corner-top").length, 1, "There should be only one element with class ui-corner-top");
+					equal(ul.find("li:visible").first()[0], ul.find(".ui-corner-top")[0], "First list item should have class ui-corner-top in list with " + ul.find("li").length + " item(s)");
+					equal(ul.find(".ui-corner-bottom").length, 1, "There should be only one element with class ui-corner-bottom");
+					equal(ul.find("li:visible").last()[0], ul.find(".ui-corner-bottom")[0], "Last list item should have class ui-corner-bottom in list with " + ul.find("li").length + " item(s)");
 				}
 
 				ul.find( "li" ).first().hide();
 				ul.listview( "refresh" );
-				equals(ul.find("li:visible").first()[0], ul.find(".ui-corner-top")[0], "First visible list item should have class ui-corner-top");
+				equal(ul.find("li:visible").first()[0], ul.find(".ui-corner-top")[0], "First visible list item should have class ui-corner-top");
 
 				ul.find( "li" ).last().hide();
 				ul.listview( "refresh" );
-				equals(ul.find("li:visible").last()[0], ul.find(".ui-corner-bottom")[0], "Last visible list item should have class ui-corner-bottom");
+				equal(ul.find("li:visible").last()[0], ul.find(".ui-corner-bottom")[0], "Last visible list item should have class ui-corner-bottom");
 
 				start();
 			}
@@ -731,7 +820,7 @@
 			},
 
 			function(){
-				same( findNestedPages( "#uncached-nested-list" ).length, 0 );
+				deepEqual( findNestedPages( "#uncached-nested-list" ).length, 0 );
 				start();
 			}
 		]);
@@ -777,7 +866,7 @@
 			},
 
 			function(){
-				same( $("#cached-nested-list").length, 1 );
+				deepEqual( $("#cached-nested-list").length, 1 );
 				$.mobile.changePage( home );
 			},
 
@@ -786,36 +875,7 @@
 			},
 
 			function(){
-				same( $("#cached-nested-list").length, 1 );
-				start();
-			}
-		]);
-	});
-
-	asyncTest( "filterCallback can be altered after widget creation", function(){
-		var listPage = $( "#search-filter-test" );
-		expect( listPage.find("li").length );
-
-		$.testHelper.pageSequence( [
-			function(){
-				//reset for relative url refs
-				$.mobile.changePage( home );
-			},
-
-			function() {
-				$.mobile.changePage( "#search-filter-test" );
-			},
-
-			function() {
-				// set the listview instance callback
-				listPage.find( "ul" ).listview( "option", "filterCallback", function() {
-					ok(true, "custom callback invoked");
-				});
-
-				// trigger a change in the search filter
-				listPage.find( "input" ).val( "foo" ).trigger( "change" );
-
-				//NOTE beware a poossible issue with timing here
+				deepEqual( $("#cached-nested-list").length, 1 );
 				start();
 			}
 		]);
@@ -849,7 +909,7 @@
 		$.testHelper.pageSequence([
 			function() {
 				// open the nested list page
-				same( $("div#nested-list-test").length, 1 );
+				deepEqual( $("div#nested-list-test").length, 1 );
 				$( "a#nested-list-test-anchor" ).click();
 			},
 
@@ -860,7 +920,7 @@
 
 			function() {
 				// make sure the page is still in place
-				same( $("div#nested-list-test").length, 1 );
+				deepEqual( $("div#nested-list-test").length, 1 );
 				start();
 			}
 		]);
@@ -894,7 +954,7 @@
 
 			function( timedOut) {
 				ok( !timedOut );
-				same( $.mobile.activePage.find("form.ui-listview-filter-inset").length, 1, "form is inset");
+				deepEqual( $.mobile.activePage.find("form.ui-listview-filter-inset").length, 1, "form is inset");
 				window.history.back();
 			},
 
@@ -913,7 +973,7 @@
 
 			function( timedOut) {
 				ok( !timedOut );
-				same( $.mobile.activePage.find("form.ui-listview-filter-inset").length, 1, "form is inset");
+				deepEqual( $.mobile.activePage.find("form.ui-listview-filter-inset").length, 1, "form is inset");
 				window.history.back();
 			},
 
@@ -932,7 +992,7 @@
 					var $elem = $(elem),
 						order = [ "star", "plug", "delete", "plug" ];
 
-					same( $elem.find("span.ui-icon-" + order[i]).length, 1, "there should be one " + order[i] + " icon" );
+					deepEqual( $elem.find("span.ui-icon-" + order[i]).length, 1, "there should be one " + order[i] + " icon" );
 				});
 
 				window.history.back();
@@ -949,7 +1009,7 @@
 			},
 
 			function() {
-				same($.mobile.activePage.find("#ignored-link .ui-btn-inner").length, 0, "no buttons in list dividers");
+				deepEqual($.mobile.activePage.find("#ignored-link .ui-btn-inner").length, 0, "no buttons in list dividers");
 
 				window.history.back();
 			},
@@ -967,8 +1027,8 @@
 			},
 
 			function() {
-				same($.mobile.activePage.find(".listitem").css("border-bottom-width"), "0px", "has no border bottom");
-				same($.mobile.activePage.find("#lastitem").css("border-bottom-width"), "1px", "has border bottom");
+				deepEqual($.mobile.activePage.find(".listitem").css("border-bottom-width"), "0px", "has no border bottom");
+				deepEqual($.mobile.activePage.find("#lastitem").css("border-bottom-width"), "1px", "has border bottom");
 
 				window.history.back();
 			},
@@ -984,8 +1044,8 @@
 			},
 
 			function() {
-				same($.mobile.activePage.find("#noninsetlastli").css("border-bottom-width"), "0px", "last li non-inset list has no border bottom");
-				same($.mobile.activePage.find("#insetlastli").css("border-bottom-width"), "1px", "last li inset list has border bottom");
+				deepEqual($.mobile.activePage.find("#noninsetlastli").css("border-bottom-width"), "0px", "last li non-inset list has no border bottom");
+				deepEqual($.mobile.activePage.find("#insetlastli").css("border-bottom-width"), "1px", "last li inset list has border bottom");
 
 				window.history.back();
 			},
diff --git a/tests/unit/listview/listview_nested.js b/tests/unit/listview/listview_nested.js
index 2fabb4a..3403d58 100644
--- a/tests/unit/listview/listview_nested.js
+++ b/tests/unit/listview/listview_nested.js
@@ -79,7 +79,7 @@
 	});
 
 	test( "nested list title should use first text node, regardless of line breaks", function(){
-		same($(":jqmData(url='nested-list-test&ui-page=0-0') .ui-title").text(), "More animals", 'Text should be "More animals"');
+		deepEqual($(":jqmData(url='nested-list-test&ui-page=0-0') .ui-title").text(), "More animals", 'Text should be "More animals"');
 	});
 
 	asyncTest( "Multiple nested lists on a page with same labels", function() {
diff --git a/tests/unit/loader/loader_core.js b/tests/unit/loader/loader_core.js
index d5e8eaa..1848f43 100644
--- a/tests/unit/loader/loader_core.js
+++ b/tests/unit/loader/loader_core.js
@@ -30,14 +30,14 @@
 	test( "prototype options are used for mobile loader", function() {
 		$.mobile.loading( 'show' );
 
-		same( $('.ui-loader').text(), "mobileinit", "prototype options set the text and make it visible" );
+		deepEqual( $('.ui-loader').text(), "mobileinit", "prototype options set the text and make it visible" );
 	});
 
 	test( "showPageLoadingMsg does not show the text when the loading message is false", function(){
 		$.mobile.loadingMessage = false;
 		$.mobile.showPageLoadingMsg();
 
-		same($(".ui-loader h1").text(), "", "no loading message present");
+		deepEqual($(".ui-loader h1").text(), "", "no loading message present");
 	});
 
 	test( "showPageLoadingMsg doesn't hide the text loading message is true", function(){
@@ -52,33 +52,33 @@
 		$.mobile.showPageLoadingMsg();
 		$.mobile.hidePageLoadingMsg();
 
-		same($(".ui-loading").length, 0, "page should not be in the loading state");
+		deepEqual($(".ui-loading").length, 0, "page should not be in the loading state");
 	});
 
 	test( "showPageLoadingMsg adds the dialog to the page when loadingMessage is true", function(){
 		$.mobile.loadingMessage = true;
 		$.mobile.showPageLoadingMsg();
 
-		same($(".ui-loading").length, 1, "page should be in the loading state");
+		deepEqual($(".ui-loading").length, 1, "page should be in the loading state");
 	});
 
 	test( "page loading should contain custom loading message", function(){
 		$.mobile.loadingMessage = "foo";
 		$.mobile.showPageLoadingMsg();
 
-		same($(".ui-loader h1").text(), "foo");
+		deepEqual($(".ui-loader h1").text(), "foo");
 	});
 
 	test( "page loading should contain custom loading message when set at runtime", function(){
 		$.mobile.loadingMessage = "bar";
 		$.mobile.showPageLoadingMsg();
 
-		same($(".ui-loader h1").text(), "bar");
+		deepEqual($(".ui-loader h1").text(), "bar");
 	});
 
 	test( "page loading should contain custom loading message when used in param object", function() {
 		$.mobile.showPageLoadingMsg({ text: "bak" });
-		same($(".ui-loader h1").text(), "bak", "loader has custom message 'bak'");
+		deepEqual($(".ui-loader h1").text(), "bak", "loader has custom message 'bak'");
 	});
 
 	test( "page loading should contain different theme when used in param object", function() {
@@ -91,7 +91,7 @@
 			html: "<div class=\"foo\"></div>"
 		});
 
-		same($(".ui-loader > div.foo").length, 1, "loader has a custom html");
+		deepEqual($(".ui-loader > div.foo").length, 1, "loader has a custom html");
 	});
 
 	test( "page loading should always contain text when passed as the second arg", function() {
@@ -100,7 +100,7 @@
 		// simulate error call in navigation ajax error callback
 		$.mobile.showPageLoadingMsg( "e", "foo serious", true );
 
-		same($(".ui-loader").text(), "foo serious", "loader has message regardless of global setting");
+		deepEqual($(".ui-loader").text(), "foo serious", "loader has message regardless of global setting");
 	});
 
 	test( "page loading should always contain text when passed as an object prop", function() {
@@ -109,7 +109,7 @@
 		// simulate error call in navigation ajax error callback
 		$.mobile.showPageLoadingMsg({ theme: "e", text: "foo serious second", textonly: true });
 
-		same($(".ui-loader").text(), "foo serious second", "loader has message regardless of global setting");
+		deepEqual($(".ui-loader").text(), "foo serious second", "loader has message regardless of global setting");
 	});
 
 	test( "page loading should not contain text when default is used and visible prop is false", function() {
@@ -134,6 +134,6 @@
 
 		$.mobile.showPageLoadingMsg();
 		ok($(".ui-loader").hasClass( "ui-body-x" ), "has theme x");
-		same($(".ui-loader h1").text(), "fozzle", "has text fozzle in loading config object");
+		deepEqual($(".ui-loader h1").text(), "fozzle", "has text fozzle in loading config object");
 	});
 })(jQuery);
diff --git a/tests/unit/media/media_core.js b/tests/unit/media/media_core.js
index 68eca0c..a0b08cc 100644
--- a/tests/unit/media/media_core.js
+++ b/tests/unit/media/media_core.js
@@ -19,20 +19,20 @@
 
 	test( "media query check returns true when the position is absolute", function(){
 		$.fn.css = function(){ return "absolute"; };
-		same($.mobile.media("screen 1"), true);
+		deepEqual($.mobile.media("screen 1"), true);
 	});
 
 	test( "media query check returns false when the position is not absolute", function(){
 		$.fn.css = function(){ return "not absolute"; };
-		same($.mobile.media("screen 2"), false);
+		deepEqual($.mobile.media("screen 2"), false);
 	});
 
 	test( "media query check is cached", function(){
 		$.fn.css = function(){ return "absolute"; };
-		same($.mobile.media("screen 3"), true);
+		deepEqual($.mobile.media("screen 3"), true);
 
 		$.fn.css = function(){ return "not absolute"; };
-		same($.mobile.media("screen 3"), true);
+		deepEqual($.mobile.media("screen 3"), true);
 	});
 
 
diff --git a/tests/unit/navbar/navbar_core.js b/tests/unit/navbar/navbar_core.js
index f80bb5d..129b82f 100644
--- a/tests/unit/navbar/navbar_core.js
+++ b/tests/unit/navbar/navbar_core.js
@@ -23,8 +23,8 @@
 
 		$("#foo").trigger( "create" );
 
-		same( $ignored.attr( "class" ), undefined, "ignored list doesn't have the grid theme" );
-		same( $enhanced.attr( "class" ).indexOf("ui-grid"), 0, "enhanced list has the grid theme" );
+		deepEqual( $ignored.attr( "class" ), undefined, "ignored list doesn't have the grid theme" );
+		deepEqual( $enhanced.attr( "class" ).indexOf("ui-grid"), 0, "enhanced list has the grid theme" );
 
 		$.mobile.ignoreContentEnabled = false;
 	});
diff --git a/tests/unit/navigation/navigation_core.js b/tests/unit/navigation/navigation_core.js
index 41515ae..d401eee 100644
--- a/tests/unit/navigation/navigation_core.js
+++ b/tests/unit/navigation/navigation_core.js
@@ -68,13 +68,13 @@
 
 			// page is pulled and displayed in the dom
 			function(){
-				same( $( "#external-test" ).length, 1 );
+				deepEqual( $( "#external-test" ).length, 1 );
 				window.history.back();
 			},
 
 			// external-test is *NOT* cached in the dom after transitioning away
 			function(){
-				same( $( "#external-test" ).length, 0 );
+				deepEqual( $( "#external-test" ).length, 0 );
 				start();
 			}
 		]);
@@ -99,13 +99,13 @@
 
 			// page is pulled and displayed in the dom
 			function(){
-				same( $( "#external-test" ).length, 1 );
+				deepEqual( $( "#external-test" ).length, 1 );
 				window.history.back();
 			},
 
 			// external-test *IS* cached in the dom after transitioning away
 			function(){
-				same( $( "#external-test" ).length, 1 );
+				deepEqual( $( "#external-test" ).length, 1 );
 
 				// Switch back to the page again!
 				$.mobile.changePage( "external.html" );
@@ -113,7 +113,7 @@
 
 			// page is still present and displayed in the dom
 			function(){
-				same( $( "#external-test" ).length, 1 );
+				deepEqual( $( "#external-test" ).length, 1 );
 
 				// Now turn off our removal prevention.
 				preventRemoval = false;
@@ -123,7 +123,7 @@
 
 			// external-test is *NOT* cached in the dom after transitioning away
 			function(){
-				same( $( "#external-test" ).length, 0 );
+				deepEqual( $( "#external-test" ).length, 0 );
 				$( document ).unbind( "pageremove", removeCallback );
 				start();
 			}
@@ -140,13 +140,13 @@
 
 			// page is pulled and displayed in the dom
 			function(){
-				same( $( "#external-test-cached" ).length, 1 );
+				deepEqual( $( "#external-test-cached" ).length, 1 );
 				window.history.back();
 			},
 
 			// external test page is cached in the dom after transitioning away
 			function(){
-				same( $( "#external-test-cached" ).length, 1 );
+				deepEqual( $( "#external-test-cached" ).length, 1 );
 				start();
 			}
 		]);
@@ -163,13 +163,13 @@
 
 			// page is pulled and displayed in the dom
 			function(){
-				same( $( "#external-test" ).length, 1 );
+				deepEqual( $( "#external-test" ).length, 1 );
 				window.history.back();
 			},
 
 			// external test page is cached in the dom after transitioning away
 			function(){
-				same( $( "#external-test" ).length, 1 );
+				deepEqual( $( "#external-test" ).length, 1 );
 				$.mobile.page.prototype.options.domCache = false;
 				$( "#external-test" ).remove();
 				start();
@@ -187,7 +187,7 @@
 				// wait for the initial scroll to 0
 				setTimeout( function() {
 					window.scrollTo( 0, 300 );
-					same( $(window).scrollTop(), 300, "scrollTop is 300 after setting it" );
+					deepEqual( $(window).scrollTop(), 300, "scrollTop is 300 after setting it" );
 				}, 300);
 
 				// wait for the scrollstop to fire and for the scroll to be
@@ -203,7 +203,7 @@
 			function(){
 				// Give the silentScroll function some time to kick in.
 				setTimeout(function() {
-					same( $(window).scrollTop(), 300, "scrollTop is 300 after returning to the page" );
+					deepEqual( $(window).scrollTop(), 300, "scrollTop is 300 after returning to the page" );
 					$( "body" ).height( "" );
 					start();
 				}, 300 );
@@ -264,7 +264,7 @@
 		$( "<a>test</a>" ).appendTo( $.mobile.firstPage ).click();
 
 		setTimeout(function(){
-			same(fired, false, "hash shouldn't change after click");
+			deepEqual(fired, false, "hash shouldn't change after click");
 			$(window).unbind("hashchange.temp");
 			start();
 		}, 500);
@@ -273,7 +273,7 @@
 	test( "urlHistory is working properly", function(){
 
 		//urlHistory
-		same( $.type( $.mobile.urlHistory.stack ), "array", "urlHistory.stack is an array" );
+		deepEqual( $.type( $.mobile.urlHistory.stack ), "array", "urlHistory.stack is an array" );
 
 		//preload the stack
 		$.mobile.urlHistory.stack[0] = { url: "foo", transition: "bar" };
@@ -281,30 +281,30 @@
 		$.mobile.urlHistory.stack[2] = { url: "shizoo", transition: "shizaah" };
 
 		//active index
-		same( $.mobile.urlHistory.activeIndex , 0, "urlHistory.activeIndex is 0" );
+		deepEqual( $.mobile.urlHistory.activeIndex , 0, "urlHistory.activeIndex is 0" );
 
 		//getActive
-		same( $.type( $.mobile.urlHistory.getActive() ) , "object", "active item is an object" );
-		same( $.mobile.urlHistory.getActive().url , "foo", "active item has url foo" );
-		same( $.mobile.urlHistory.getActive().transition , "bar", "active item has transition bar" );
+		deepEqual( $.type( $.mobile.urlHistory.getActive() ) , "object", "active item is an object" );
+		deepEqual( $.mobile.urlHistory.getActive().url , "foo", "active item has url foo" );
+		deepEqual( $.mobile.urlHistory.getActive().transition , "bar", "active item has transition bar" );
 
 		//get prev / next
-		same( $.mobile.urlHistory.getPrev(), undefined, "urlHistory.getPrev() is undefined when active index is 0" );
+		deepEqual( $.mobile.urlHistory.getPrev(), undefined, "urlHistory.getPrev() is undefined when active index is 0" );
 		$.mobile.urlHistory.activeIndex = 1;
-		same( $.mobile.urlHistory.getPrev().url, "foo", "urlHistory.getPrev() has url foo when active index is 1" );
+		deepEqual( $.mobile.urlHistory.getPrev().url, "foo", "urlHistory.getPrev() has url foo when active index is 1" );
 		$.mobile.urlHistory.activeIndex = 0;
-		same( $.mobile.urlHistory.getNext().url, "baz", "urlHistory.getNext() has url baz when active index is 0" );
+		deepEqual( $.mobile.urlHistory.getNext().url, "baz", "urlHistory.getNext() has url baz when active index is 0" );
 
 		//add new
 		$.mobile.urlHistory.activeIndex = 2;
 		$.mobile.urlHistory.addNew("test");
-		same( $.mobile.urlHistory.stack.length, 4, "urlHistory.addNew() adds an item after the active index" );
-		same( $.mobile.urlHistory.activeIndex, 3, "urlHistory.addNew() moves the activeIndex to the newly added item" );
+		deepEqual( $.mobile.urlHistory.stack.length, 4, "urlHistory.addNew() adds an item after the active index" );
+		deepEqual( $.mobile.urlHistory.activeIndex, 3, "urlHistory.addNew() moves the activeIndex to the newly added item" );
 
 		//clearForward
 		$.mobile.urlHistory.activeIndex = 0;
 		$.mobile.urlHistory.clearForward();
-		same( $.mobile.urlHistory.stack.length, 1, "urlHistory.clearForward() clears the url stack after the active index" );
+		deepEqual( $.mobile.urlHistory.stack.length, 1, "urlHistory.clearForward() clears the url stack after the active index" );
 	});
 
 	//url listening
@@ -385,7 +385,7 @@
 				// fourth page (third index) in the stack to account for first page being hash manipulation,
 				// the third page is dup-history-second which has two entries in history
 				// the test is to make sure the index isn't 1 in this case, or the first entry for dup-history-second
-				same($.mobile.urlHistory.activeIndex, 3, "should be the fourth page in the stack");
+				deepEqual($.mobile.urlHistory.activeIndex, 3, "should be the fourth page in the stack");
 				start();
 			}]);
 	});
@@ -470,7 +470,7 @@
 			// make sure the dialog is closed
 			function() {
 				setTimeout( function() {
-					same($("#dialog-double-hash-test")[0], $.mobile.activePage[0], "should be back to the test page");
+					deepEqual($("#dialog-double-hash-test")[0], $.mobile.activePage[0], "should be back to the test page");
 					start();
 				}, 300);
 			}
@@ -493,7 +493,7 @@
 
 			// make sure we're on first dialog
 			function(){
-				same($(".ui-page-active")[0], $("#nested-dialog-first")[0], "should be the first dialog");
+				deepEqual($(".ui-page-active")[0], $("#nested-dialog-first")[0], "should be the first dialog");
 				start();
 			}]);
 	});
@@ -512,7 +512,7 @@
 			// make sure the page was loaded properly via ajax
 			function(){
 				// data attribute intentionally left without namespace
-				same($(".ui-page-active").data("other"), "for testing", "should be relative ajax loaded page");
+				deepEqual($(".ui-page-active").data("other"), "for testing", "should be relative ajax loaded page");
 				start();
 			}]);
 	});
@@ -528,7 +528,7 @@
 			},
 
 			function(){
-				same(document.title, "jQuery Mobile Navigation Test Suite");
+				deepEqual(document.title, "jQuery Mobile Navigation Test Suite");
 				start();
 			}
 		]);
@@ -547,12 +547,12 @@
 			},
 
 			function(){
-				same(document.title, "Title Tag");
+				deepEqual(document.title, "Title Tag");
 				$.mobile.activePage.find("#title-check-link").click();
 			},
 
 			function(){
-				same(document.title, title);
+				deepEqual(document.title, title);
 				start();
 			}
 		]);
@@ -569,7 +569,7 @@
 			},
 
 			function(){
-				same(document.title, "Title Tag");
+				deepEqual(document.title, "Title Tag");
 				start();
 			}
 		]);
@@ -586,7 +586,7 @@
 			},
 
 			function(){
-				same(document.title, "Title Attr");
+				deepEqual(document.title, "Title Attr");
 				start();
 			}
 		]);
@@ -603,7 +603,7 @@
 			},
 
 			function(){
-				same(document.title, "Title Heading");
+				deepEqual(document.title, "Title Heading");
 				start();
 			}
 		]);
@@ -620,7 +620,7 @@
 			},
 
 			function(){
-				same($.mobile.activePage[0], $("#self-link")[0], "self-link page is still the active page" );
+				deepEqual($.mobile.activePage[0], $("#self-link")[0], "self-link page is still the active page" );
 				start();
 			}
 		]);
@@ -707,7 +707,7 @@
 			},
 
 			function(){
-				same(location.hash || location.href, firstDialogLoc, "additional dialog hash key not added");
+				deepEqual(location.hash || location.href, firstDialogLoc, "additional dialog hash key not added");
 				start();
 			}
 		]);
@@ -760,7 +760,7 @@
 		$.testHelper.pageSequence([
 			// open our test page
 			function(){
-				same($(".foo-class").length, 1, "should only have one instance of foo-class in the document");
+				deepEqual($(".foo-class").length, 1, "should only have one instance of foo-class in the document");
 				location.hash = "#foo&ui-state=dialog";
 			},
 
@@ -771,7 +771,7 @@
 					report: "hash should match what was loaded"
 				});
 
-				same( $(".foo-class").length, 1, "should only have one instance of foo-class in the document" );
+				deepEqual( $(".foo-class").length, 1, "should only have one instance of foo-class in the document" );
 				start();
 			}
 		]);
@@ -866,7 +866,7 @@
 			},
 
 			function(){
-				same( $.mobile.activePage[0], $( "#default-trans-dialog" )[0] );
+				deepEqual( $.mobile.activePage[0], $( "#default-trans-dialog" )[0] );
 				$.mobile.activePage.find( "a" ).click();
 			},
 
@@ -875,7 +875,7 @@
 			},
 
 			function(){
-				same( $.mobile.activePage[0], $( "#default-trans-dialog" )[0] );
+				deepEqual( $.mobile.activePage[0], $( "#default-trans-dialog" )[0] );
 				start();
 			}
 		]);
@@ -894,7 +894,7 @@
 			// make sure the page is opening first without the mocked button click value
 			// only necessary to prevent issues with test specific fixtures
 			function() {
-				same($.mobile.activePage[0], $("#odd-clicks-page-dest")[0]);
+				deepEqual($.mobile.activePage[0], $("#odd-clicks-page-dest")[0]);
 				$.testHelper.openPage( "#odd-clicks-page" );
 
 				// mock the which value to simulate a middle click
@@ -1011,7 +1011,7 @@
 
 				// Now make sure opening the page didn't result in page duplication.
 				ok( $.mobile.firstPage.hasClass( "first-page" ), "first page has expected class" );
-				same( $( ".first-page" ).length, 1, "first page was not duplicated" );
+				deepEqual( $( ".first-page" ).length, 1, "first page was not duplicated" );
 
 				start();
 			}
@@ -1031,7 +1031,7 @@
 			function(){
 				// Make sure there's only one copy of the first-page in the DOM to begin with.
 				ok( $.mobile.firstPage.hasClass( "first-page" ), "first page has expected class" );
-				same( $( ".first-page" ).length, 1, "first page was not duplicated" );
+				deepEqual( $( ".first-page" ).length, 1, "first page was not duplicated" );
 
 				// Navigate to any page except the first page of the application.
 				$.testHelper.openPage("#foo");
@@ -1040,7 +1040,7 @@
 			function(){
 				var $foo = $( "#foo" );
 				ok( $.mobile.activePage[ 0 ] === $foo[ 0 ], "navigated successfully to #foo" );
-				same( pagechangefailed, false, "no page change failures" );
+				deepEqual( pagechangefailed, false, "no page change failures" );
 
 				// Now navigate to a non-existent page.
 				$foo.find( "#bad-internal-page-link" ).click();
@@ -1048,13 +1048,13 @@
 
 			function(){
 				// Make sure a pagechangefailed event was triggered.
-				same( pagechangefailed, true, "pagechangefailed dispatched" );
+				deepEqual( pagechangefailed, true, "pagechangefailed dispatched" );
 
 				// Make sure we didn't navigate away from #foo.
 				ok( $.mobile.activePage[ 0 ] === $( "#foo" )[ 0 ], "did not navigate away from #foo" );
 
 				// Now make sure opening the page didn't result in page duplication.
-				same( $( ".first-page" ).length, 1, "first page was not duplicated" );
+				deepEqual( $( ".first-page" ).length, 1, "first page was not duplicated" );
 
 				$( document ).unbind( "pagechangefailed", pageChangeFailedCB );
 
@@ -1109,7 +1109,7 @@
 				ok( $.mobile.firstPage[ 0 ].id, "first page has an id" );
 
 				// Make sure there is only one first page in the DOM.
-				same( $( ".first-page" ).length, 1, "only one instance of the first page in the DOM" );
+				deepEqual( $( ".first-page" ).length, 1, "only one instance of the first page in the DOM" );
 
 				// Navigate to any page except the first page of the application.
 				$.testHelper.openPage("#foo");
@@ -1124,7 +1124,7 @@
 
 				// Make sure the first page was actually pruned from the document.
 				ok( $.mobile.firstPage.parent().length === 0, "first page was pruned from the DOM" );
-				same( $( ".first-page" ).length, 0, "no instance of the first page in the DOM" );
+				deepEqual( $( ".first-page" ).length, 0, "no instance of the first page in the DOM" );
 
 				// Remove our hideCallback.
 				$(document).unbind('pagehide', hideCallback);
@@ -1137,7 +1137,7 @@
 				var firstPage = $( ".first-page" );
 
 				// We should only have one first page in the document at any time!
-				same( firstPage.length, 1, "single instance of first page recreated in the DOM" );
+				deepEqual( firstPage.length, 1, "single instance of first page recreated in the DOM" );
 
 				// Make sure the first page in the DOM is actually a different DOM element than the original
 				// one we started with.
diff --git a/tests/unit/navigation/navigation_helpers.js b/tests/unit/navigation/navigation_helpers.js
index a097381..675ce52 100644
--- a/tests/unit/navigation/navigation_helpers.js
+++ b/tests/unit/navigation/navigation_helpers.js
@@ -18,9 +18,9 @@
 
 	test( "path.get method is working properly", function(){
 		window.location.hash = "foo";
-		same($.mobile.path.get(), "foo", "get method returns location.hash minus hash character");
-		same($.mobile.path.get( "#foo/bar/baz.html" ), "foo/bar/", "get method with hash arg returns path with no filename or hash prefix");
-		same($.mobile.path.get( "#foo/bar/baz.html/" ), "foo/bar/baz.html/", "last segment of hash is retained if followed by a trailing slash");
+		deepEqual($.mobile.path.get(), "foo", "get method returns location.hash minus hash character");
+		deepEqual($.mobile.path.get( "#foo/bar/baz.html" ), "foo/bar/", "get method with hash arg returns path with no filename or hash prefix");
+		deepEqual($.mobile.path.get( "#foo/bar/baz.html/" ), "foo/bar/baz.html/", "last segment of hash is retained if followed by a trailing slash");
 	});
 
 	test( "path.isPath method is working properly", function(){
@@ -32,13 +32,13 @@
 	});
 
 	test( "path.getFilePath method is working properly", function(){
-		same($.mobile.path.getFilePath("foo.html" + "&" + $.mobile.subPageUrlKey ), "foo.html", "returns path without sub page key");
+		deepEqual($.mobile.path.getFilePath("foo.html" + "&" + $.mobile.subPageUrlKey ), "foo.html", "returns path without sub page key");
 	});
 
 	test( "path.set method is working properly", function(){
 		$.mobile.urlHistory.ignoreNextHashChange = false;
 		$.mobile.path.set("foo");
-		same("foo", window.location.hash.replace(/^#/,""), "sets location.hash properly");
+		deepEqual("foo", window.location.hash.replace(/^#/,""), "sets location.hash properly");
 	});
 
 	test( "path.makeUrlAbsolute is working properly", function(){
@@ -65,66 +65,66 @@
 
 		// Test URL conversion against an absolute URL to the site root.
 		// directory tests
-		same( mua( "http://jqm.com/",                            p1 ), "http://jqm.com/", "absolute root - absolute root" );
-		same( mua( "//jqm.com/",                                 p1 ), "http://jqm.com/", "protocol relative root - absolute root" );
-		same( mua( "/",                                          p1 ), "http://jqm.com/", "site relative root - absolute root" );
+		deepEqual( mua( "http://jqm.com/",                            p1 ), "http://jqm.com/", "absolute root - absolute root" );
+		deepEqual( mua( "//jqm.com/",                                 p1 ), "http://jqm.com/", "protocol relative root - absolute root" );
+		deepEqual( mua( "/",                                          p1 ), "http://jqm.com/", "site relative root - absolute root" );
 
-		same( mua( "http://jqm.com/?foo=1&bar=2",                p1 ), "http://jqm.com/?foo=1&bar=2", "absolute root with query - absolute root" );
-		same( mua( "//jqm.com/?foo=1&bar=2",                     p1 ), "http://jqm.com/?foo=1&bar=2", "protocol relative root with query - absolute root" );
-		same( mua( "/?foo=1&bar=2",                              p1 ), "http://jqm.com/?foo=1&bar=2", "site relative root with query - absolute root" );
-		same( mua( "?foo=1&bar=2",                               p1 ), "http://jqm.com/?foo=1&bar=2", "query relative - absolute root" );
+		deepEqual( mua( "http://jqm.com/?foo=1&bar=2",                p1 ), "http://jqm.com/?foo=1&bar=2", "absolute root with query - absolute root" );
+		deepEqual( mua( "//jqm.com/?foo=1&bar=2",                     p1 ), "http://jqm.com/?foo=1&bar=2", "protocol relative root with query - absolute root" );
+		deepEqual( mua( "/?foo=1&bar=2",                              p1 ), "http://jqm.com/?foo=1&bar=2", "site relative root with query - absolute root" );
+		deepEqual( mua( "?foo=1&bar=2",                               p1 ), "http://jqm.com/?foo=1&bar=2", "query relative - absolute root" );
 
-		same( mua( "http://jqm.com/#spaz",                       p1 ), "http://jqm.com/#spaz", "absolute root with fragment - absolute root" );
-		same( mua( "//jqm.com/#spaz",                            p1 ), "http://jqm.com/#spaz", "protocol relative root with fragment - absolute root" );
-		same( mua( "/#spaz",                                     p1 ), "http://jqm.com/#spaz", "site relative root with fragment - absolute root" );
-		same( mua( "#spaz",                                      p1 ), "http://jqm.com/#spaz", "fragment relative - absolute root" );
+		deepEqual( mua( "http://jqm.com/#spaz",                       p1 ), "http://jqm.com/#spaz", "absolute root with fragment - absolute root" );
+		deepEqual( mua( "//jqm.com/#spaz",                            p1 ), "http://jqm.com/#spaz", "protocol relative root with fragment - absolute root" );
+		deepEqual( mua( "/#spaz",                                     p1 ), "http://jqm.com/#spaz", "site relative root with fragment - absolute root" );
+		deepEqual( mua( "#spaz",                                      p1 ), "http://jqm.com/#spaz", "fragment relative - absolute root" );
 
-		same( mua( "http://jqm.com/?foo=1&bar=2#spaz",           p1 ), "http://jqm.com/?foo=1&bar=2#spaz", "absolute root with query and fragment - absolute root" );
-		same( mua( "//jqm.com/?foo=1&bar=2#spaz",                p1 ), "http://jqm.com/?foo=1&bar=2#spaz", "protocol relative root with query and fragment - absolute root" );
-		same( mua( "/?foo=1&bar=2#spaz",                         p1 ), "http://jqm.com/?foo=1&bar=2#spaz", "site relative root with query and fragment - absolute root" );
-		same( mua( "?foo=1&bar=2#spaz",                          p1 ), "http://jqm.com/?foo=1&bar=2#spaz", "query relative and fragment - absolute root" );
+		deepEqual( mua( "http://jqm.com/?foo=1&bar=2#spaz",           p1 ), "http://jqm.com/?foo=1&bar=2#spaz", "absolute root with query and fragment - absolute root" );
+		deepEqual( mua( "//jqm.com/?foo=1&bar=2#spaz",                p1 ), "http://jqm.com/?foo=1&bar=2#spaz", "protocol relative root with query and fragment - absolute root" );
+		deepEqual( mua( "/?foo=1&bar=2#spaz",                         p1 ), "http://jqm.com/?foo=1&bar=2#spaz", "site relative root with query and fragment - absolute root" );
+		deepEqual( mua( "?foo=1&bar=2#spaz",                          p1 ), "http://jqm.com/?foo=1&bar=2#spaz", "query relative and fragment - absolute root" );
 
 		// file tests
-		same( mua( "http://jqm.com/test.php",                    p1 ), "http://jqm.com/test.php", "absolute file at root - absolute root" );
-		same( mua( "//jqm.com/test.php",                         p1 ), "http://jqm.com/test.php", "protocol relative file at root - absolute root" );
-		same( mua( "/test.php",                                  p1 ), "http://jqm.com/test.php", "site relative file at root - absolute root" );
-		same( mua( "test.php",                                   p1 ), "http://jqm.com/test.php", "document relative file at root - absolute root" );
-
-		same( mua( "http://jqm.com/test.php?foo=1&bar=2",        p1 ), "http://jqm.com/test.php?foo=1&bar=2", "absolute file at root with query - absolute root" );
-		same( mua( "//jqm.com/test.php?foo=1&bar=2",             p1 ), "http://jqm.com/test.php?foo=1&bar=2", "protocol relative file at root with query - absolute root" );
-		same( mua( "/test.php?foo=1&bar=2",                      p1 ), "http://jqm.com/test.php?foo=1&bar=2", "site relative file at root with query - absolute root" );
-		same( mua( "test.php?foo=1&bar=2",                       p1 ), "http://jqm.com/test.php?foo=1&bar=2", "document relative file at root with query - absolute root" );
-
-		same( mua( "http://jqm.com/test.php#spaz",               p1 ), "http://jqm.com/test.php#spaz", "absolute file at root with fragment - absolute root" );
-		same( mua( "//jqm.com/test.php#spaz",                    p1 ), "http://jqm.com/test.php#spaz", "protocol relative file at root with fragment - absolute root" );
-		same( mua( "/test.php#spaz",                             p1 ), "http://jqm.com/test.php#spaz", "site relative file at root with fragment - absolute root" );
-		same( mua( "test.php#spaz",                              p1 ), "http://jqm.com/test.php#spaz", "file at root with fragment - absolute root" );
-
-		same( mua( "http://jqm.com/test.php?foo=1&bar=2#spaz",   p1 ), "http://jqm.com/test.php?foo=1&bar=2#spaz", "absolute file at root with query and fragment - absolute root" );
-		same( mua( "//jqm.com/test.php?foo=1&bar=2#spaz",        p1 ), "http://jqm.com/test.php?foo=1&bar=2#spaz", "protocol relative file at root with query and fragment - absolute root" );
-		same( mua( "/test.php?foo=1&bar=2#spaz",                 p1 ), "http://jqm.com/test.php?foo=1&bar=2#spaz", "site relative file at root with query and fragment - absolute root" );
-		same( mua( "test.php?foo=1&bar=2#spaz",                  p1 ), "http://jqm.com/test.php?foo=1&bar=2#spaz", "query relative file at root fragment - absolute root" );
+		deepEqual( mua( "http://jqm.com/test.php",                    p1 ), "http://jqm.com/test.php", "absolute file at root - absolute root" );
+		deepEqual( mua( "//jqm.com/test.php",                         p1 ), "http://jqm.com/test.php", "protocol relative file at root - absolute root" );
+		deepEqual( mua( "/test.php",                                  p1 ), "http://jqm.com/test.php", "site relative file at root - absolute root" );
+		deepEqual( mua( "test.php",                                   p1 ), "http://jqm.com/test.php", "document relative file at root - absolute root" );
+
+		deepEqual( mua( "http://jqm.com/test.php?foo=1&bar=2",        p1 ), "http://jqm.com/test.php?foo=1&bar=2", "absolute file at root with query - absolute root" );
+		deepEqual( mua( "//jqm.com/test.php?foo=1&bar=2",             p1 ), "http://jqm.com/test.php?foo=1&bar=2", "protocol relative file at root with query - absolute root" );
+		deepEqual( mua( "/test.php?foo=1&bar=2",                      p1 ), "http://jqm.com/test.php?foo=1&bar=2", "site relative file at root with query - absolute root" );
+		deepEqual( mua( "test.php?foo=1&bar=2",                       p1 ), "http://jqm.com/test.php?foo=1&bar=2", "document relative file at root with query - absolute root" );
+
+		deepEqual( mua( "http://jqm.com/test.php#spaz",               p1 ), "http://jqm.com/test.php#spaz", "absolute file at root with fragment - absolute root" );
+		deepEqual( mua( "//jqm.com/test.php#spaz",                    p1 ), "http://jqm.com/test.php#spaz", "protocol relative file at root with fragment - absolute root" );
+		deepEqual( mua( "/test.php#spaz",                             p1 ), "http://jqm.com/test.php#spaz", "site relative file at root with fragment - absolute root" );
+		deepEqual( mua( "test.php#spaz",                              p1 ), "http://jqm.com/test.php#spaz", "file at root with fragment - absolute root" );
+
+		deepEqual( mua( "http://jqm.com/test.php?foo=1&bar=2#spaz",   p1 ), "http://jqm.com/test.php?foo=1&bar=2#spaz", "absolute file at root with query and fragment - absolute root" );
+		deepEqual( mua( "//jqm.com/test.php?foo=1&bar=2#spaz",        p1 ), "http://jqm.com/test.php?foo=1&bar=2#spaz", "protocol relative file at root with query and fragment - absolute root" );
+		deepEqual( mua( "/test.php?foo=1&bar=2#spaz",                 p1 ), "http://jqm.com/test.php?foo=1&bar=2#spaz", "site relative file at root with query and fragment - absolute root" );
+		deepEqual( mua( "test.php?foo=1&bar=2#spaz",                  p1 ), "http://jqm.com/test.php?foo=1&bar=2#spaz", "query relative file at root fragment - absolute root" );
 
 		// Test URL conversion against an absolute URL to a file at the site root.
 
-		same( mua( "http://jqm.com/",                            p5 ), "http://jqm.com/", "absolute root - absolute root" );
-		same( mua( "//jqm.com/",                                 p5 ), "http://jqm.com/", "protocol relative root - absolute root" );
-		same( mua( "/",                                          p5 ), "http://jqm.com/", "site relative root - absolute root" );
+		deepEqual( mua( "http://jqm.com/",                            p5 ), "http://jqm.com/", "absolute root - absolute root" );
+		deepEqual( mua( "//jqm.com/",                                 p5 ), "http://jqm.com/", "protocol relative root - absolute root" );
+		deepEqual( mua( "/",                                          p5 ), "http://jqm.com/", "site relative root - absolute root" );
 
-		same( mua( "http://jqm.com/?foo=1&bar=2",                p5 ), "http://jqm.com/?foo=1&bar=2", "absolute root with query - absolute root" );
-		same( mua( "//jqm.com/?foo=1&bar=2",                     p5 ), "http://jqm.com/?foo=1&bar=2", "protocol relative root with query - absolute root" );
-		same( mua( "/?foo=1&bar=2",                              p5 ), "http://jqm.com/?foo=1&bar=2", "site relative root with query - absolute root" );
-		same( mua( "?foo=1&bar=2",                               p5 ), "http://jqm.com/test.php?foo=1&bar=2", "query relative - absolute root" );
+		deepEqual( mua( "http://jqm.com/?foo=1&bar=2",                p5 ), "http://jqm.com/?foo=1&bar=2", "absolute root with query - absolute root" );
+		deepEqual( mua( "//jqm.com/?foo=1&bar=2",                     p5 ), "http://jqm.com/?foo=1&bar=2", "protocol relative root with query - absolute root" );
+		deepEqual( mua( "/?foo=1&bar=2",                              p5 ), "http://jqm.com/?foo=1&bar=2", "site relative root with query - absolute root" );
+		deepEqual( mua( "?foo=1&bar=2",                               p5 ), "http://jqm.com/test.php?foo=1&bar=2", "query relative - absolute root" );
 
-		same( mua( "http://jqm.com/#spaz",                       p5 ), "http://jqm.com/#spaz", "absolute root with fragment - absolute root" );
-		same( mua( "//jqm.com/#spaz",                            p5 ), "http://jqm.com/#spaz", "protocol relative root with fragment - absolute root" );
-		same( mua( "/#spaz",                                     p5 ), "http://jqm.com/#spaz", "site relative root with fragment - absolute root" );
-		same( mua( "#spaz",                                      p5 ), "http://jqm.com/test.php#spaz", "fragment relative - absolute root" );
+		deepEqual( mua( "http://jqm.com/#spaz",                       p5 ), "http://jqm.com/#spaz", "absolute root with fragment - absolute root" );
+		deepEqual( mua( "//jqm.com/#spaz",                            p5 ), "http://jqm.com/#spaz", "protocol relative root with fragment - absolute root" );
+		deepEqual( mua( "/#spaz",                                     p5 ), "http://jqm.com/#spaz", "site relative root with fragment - absolute root" );
+		deepEqual( mua( "#spaz",                                      p5 ), "http://jqm.com/test.php#spaz", "fragment relative - absolute root" );
 
-		same( mua( "http://jqm.com/?foo=1&bar=2#spaz",           p5 ), "http://jqm.com/?foo=1&bar=2#spaz", "absolute root with query and fragment - absolute root" );
-		same( mua( "//jqm.com/?foo=1&bar=2#spaz",                p5 ), "http://jqm.com/?foo=1&bar=2#spaz", "protocol relative root with query and fragment - absolute root" );
-		same( mua( "/?foo=1&bar=2#spaz",                         p5 ), "http://jqm.com/?foo=1&bar=2#spaz", "site relative root with query and fragment - absolute root" );
-		same( mua( "?foo=1&bar=2#spaz",                          p5 ), "http://jqm.com/test.php?foo=1&bar=2#spaz", "query relative and fragment - absolute root" );
+		deepEqual( mua( "http://jqm.com/?foo=1&bar=2#spaz",           p5 ), "http://jqm.com/?foo=1&bar=2#spaz", "absolute root with query and fragment - absolute root" );
+		deepEqual( mua( "//jqm.com/?foo=1&bar=2#spaz",                p5 ), "http://jqm.com/?foo=1&bar=2#spaz", "protocol relative root with query and fragment - absolute root" );
+		deepEqual( mua( "/?foo=1&bar=2#spaz",                         p5 ), "http://jqm.com/?foo=1&bar=2#spaz", "site relative root with query and fragment - absolute root" );
+		deepEqual( mua( "?foo=1&bar=2#spaz",                          p5 ), "http://jqm.com/test.php?foo=1&bar=2#spaz", "query relative and fragment - absolute root" );
 	});
 
 	// https://github.com/jquery/jquery-mobile/issues/2362
@@ -140,17 +140,17 @@
 			ipv6_7 = "http://[2010:836B:4179::836B:4179]",
 		  fromIssue = "http://[3fff:cafe:babe::]:443/foo";
 
-		same( $.mobile.path.parseUrl(ipv6_1).host, "[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80");
-		same( $.mobile.path.parseUrl(ipv6_1).hostname, "[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]");
-		same( $.mobile.path.parseUrl(ipv6_2).host, "[1080:0:0:0:8:800:200C:417A]");
-		same( $.mobile.path.parseUrl(ipv6_3).host, "[3ffe:2a00:100:7031::1]");
-		same( $.mobile.path.parseUrl(ipv6_4).host, "[1080::8:800:200C:417A]");
-		same( $.mobile.path.parseUrl(ipv6_5).host, "[::192.9.5.5]");
-		same( $.mobile.path.parseUrl(ipv6_6).host, "[::FFFF:129.144.52.38]:80");
-		same( $.mobile.path.parseUrl(ipv6_6).hostname, "[::FFFF:129.144.52.38]");
-		same( $.mobile.path.parseUrl(ipv6_7).host, "[2010:836B:4179::836B:4179]");
-		same( $.mobile.path.parseUrl(fromIssue).host, "[3fff:cafe:babe::]:443");
-		same( $.mobile.path.parseUrl(fromIssue).hostname, "[3fff:cafe:babe::]");
+		deepEqual( $.mobile.path.parseUrl(ipv6_1).host, "[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80");
+		deepEqual( $.mobile.path.parseUrl(ipv6_1).hostname, "[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]");
+		deepEqual( $.mobile.path.parseUrl(ipv6_2).host, "[1080:0:0:0:8:800:200C:417A]");
+		deepEqual( $.mobile.path.parseUrl(ipv6_3).host, "[3ffe:2a00:100:7031::1]");
+		deepEqual( $.mobile.path.parseUrl(ipv6_4).host, "[1080::8:800:200C:417A]");
+		deepEqual( $.mobile.path.parseUrl(ipv6_5).host, "[::192.9.5.5]");
+		deepEqual( $.mobile.path.parseUrl(ipv6_6).host, "[::FFFF:129.144.52.38]:80");
+		deepEqual( $.mobile.path.parseUrl(ipv6_6).hostname, "[::FFFF:129.144.52.38]");
+		deepEqual( $.mobile.path.parseUrl(ipv6_7).host, "[2010:836B:4179::836B:4179]");
+		deepEqual( $.mobile.path.parseUrl(fromIssue).host, "[3fff:cafe:babe::]:443");
+		deepEqual( $.mobile.path.parseUrl(fromIssue).hostname, "[3fff:cafe:babe::]");
 	});
 
 	test( "path.clean is working properly", function(){
@@ -161,81 +161,81 @@
 			localpath = localroot + fakepath,
 			remotepath = remoteroot + fakepath;
 
-		same( $.mobile.path.clean( localpath ), location.pathname + fakepath, "removes location protocol, host, and portfrom same-domain path");
-		same( $.mobile.path.clean( remotepath ), remotepath, "does nothing to an external domain path");
-		same( $.mobile.path.clean( pathWithParam ), location.pathname + "bar?baz=" + localroot, "doesn't remove params with localroot value");
+		deepEqual( $.mobile.path.clean( localpath ), location.pathname + fakepath, "removes location protocol, host, and portfrom same-domain path");
+		deepEqual( $.mobile.path.clean( remotepath ), remotepath, "does nothing to an external domain path");
+		deepEqual( $.mobile.path.clean( pathWithParam ), location.pathname + "bar?baz=" + localroot, "doesn't remove params with localroot value");
 	});
 
 	test( "path.stripHash is working properly", function(){
-		same( $.mobile.path.stripHash( "#bar" ), "bar", "returns a hash without the # prefix");
+		deepEqual( $.mobile.path.stripHash( "#bar" ), "bar", "returns a hash without the # prefix");
 	});
 
 	test( "path.hasProtocol is working properly", function(){
-		same( $.mobile.path.hasProtocol( "tel:5559999" ), true, "value in tel protocol format has protocol" );
-		same( $.mobile.path.hasProtocol( location.href ), true, "location href has protocol" );
-		same( $.mobile.path.hasProtocol( "foo/bar/baz.html" ), false, "simple directory path has no protocol" );
-		same( $.mobile.path.hasProtocol( "file://foo/bar/baz.html" ), true, "simple directory path with file:// has protocol" );
+		deepEqual( $.mobile.path.hasProtocol( "tel:5559999" ), true, "value in tel protocol format has protocol" );
+		deepEqual( $.mobile.path.hasProtocol( location.href ), true, "location href has protocol" );
+		deepEqual( $.mobile.path.hasProtocol( "foo/bar/baz.html" ), false, "simple directory path has no protocol" );
+		deepEqual( $.mobile.path.hasProtocol( "file://foo/bar/baz.html" ), true, "simple directory path with file:// has protocol" );
 	});
 
 	test( "path.isRelativeUrl is working properly", function(){
-		same( $.mobile.path.isRelativeUrl("http://company.com/"), false, "absolute url is not relative" );
-		same( $.mobile.path.isRelativeUrl("//company.com/"), true, "protocol relative url is relative" );
-		same( $.mobile.path.isRelativeUrl("/"), true, "site relative url is relative" );
-
-		same( $.mobile.path.isRelativeUrl("http://company.com/test.php"), false, "absolute url is not relative" );
-		same( $.mobile.path.isRelativeUrl("//company.com/test.php"), true, "protocol relative url is relative" );
-		same( $.mobile.path.isRelativeUrl("/test.php"), true, "site relative url is relative" );
-		same( $.mobile.path.isRelativeUrl("test.php"), true, "document relative url is relative" );
-
-		same( $.mobile.path.isRelativeUrl("http://company.com/dir1/dir2/test.php?foo=1&bar=2#frag"), false, "absolute url is not relative" );
-		same( $.mobile.path.isRelativeUrl("//company.com/dir1/dir2/test.php?foo=1&bar=2#frag"), true, "protocol relative url is relative" );
-		same( $.mobile.path.isRelativeUrl("/dir1/dir2/test.php?foo=1&bar=2#frag"), true, "site relative url is relative" );
-		same( $.mobile.path.isRelativeUrl("dir1/dir2/test.php?foo=1&bar=2#frag"), true, "document relative path url is relative" );
-		same( $.mobile.path.isRelativeUrl("test.php?foo=1&bar=2#frag"), true, "document relative file url is relative" );
-		same( $.mobile.path.isRelativeUrl("?foo=1&bar=2#frag"), true, "query relative url is relative" );
-		same( $.mobile.path.isRelativeUrl("#frag"), true, "fragments are relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("http://company.com/"), false, "absolute url is not relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("//company.com/"), true, "protocol relative url is relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("/"), true, "site relative url is relative" );
+
+		deepEqual( $.mobile.path.isRelativeUrl("http://company.com/test.php"), false, "absolute url is not relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("//company.com/test.php"), true, "protocol relative url is relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("/test.php"), true, "site relative url is relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("test.php"), true, "document relative url is relative" );
+
+		deepEqual( $.mobile.path.isRelativeUrl("http://company.com/dir1/dir2/test.php?foo=1&bar=2#frag"), false, "absolute url is not relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("//company.com/dir1/dir2/test.php?foo=1&bar=2#frag"), true, "protocol relative url is relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("/dir1/dir2/test.php?foo=1&bar=2#frag"), true, "site relative url is relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("dir1/dir2/test.php?foo=1&bar=2#frag"), true, "document relative path url is relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("test.php?foo=1&bar=2#frag"), true, "document relative file url is relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("?foo=1&bar=2#frag"), true, "query relative url is relative" );
+		deepEqual( $.mobile.path.isRelativeUrl("#frag"), true, "fragments are relative" );
 	});
 
 	test( "path.isExternal is working properly", function(){
-		same( $.mobile.path.isExternal( location.href ), false, "same domain is not external" );
-		same( $.mobile.path.isExternal( "http://example.com" ), true, "example.com is external" );
-		same($.mobile.path.isExternal("mailto:"), true, "mailto protocol");
-		same($.mobile.path.isExternal("http://foo.com"), true, "http protocol");
-		same($.mobile.path.isExternal("http://www.foo.com"), true, "http protocol with www");
-		same($.mobile.path.isExternal("tel:16178675309"), true, "tel protocol");
-		same($.mobile.path.isExternal("foo.html"), false, "filename");
-		same($.mobile.path.isExternal("foo/foo/foo.html"), false, "file path");
-		same($.mobile.path.isExternal("../../index.html"), false, "relative parent path");
-		same($.mobile.path.isExternal("/foo"), false, "root-relative path");
-		same($.mobile.path.isExternal("foo"), false, "simple string");
-		same($.mobile.path.isExternal("#foo"), false, "local id reference");
+		deepEqual( $.mobile.path.isExternal( location.href ), false, "same domain is not external" );
+		deepEqual( $.mobile.path.isExternal( "http://example.com" ), true, "example.com is external" );
+		deepEqual($.mobile.path.isExternal("mailto:"), true, "mailto protocol");
+		deepEqual($.mobile.path.isExternal("http://foo.com"), true, "http protocol");
+		deepEqual($.mobile.path.isExternal("http://www.foo.com"), true, "http protocol with www");
+		deepEqual($.mobile.path.isExternal("tel:16178675309"), true, "tel protocol");
+		deepEqual($.mobile.path.isExternal("foo.html"), false, "filename");
+		deepEqual($.mobile.path.isExternal("foo/foo/foo.html"), false, "file path");
+		deepEqual($.mobile.path.isExternal("../../index.html"), false, "relative parent path");
+		deepEqual($.mobile.path.isExternal("/foo"), false, "root-relative path");
+		deepEqual($.mobile.path.isExternal("foo"), false, "simple string");
+		deepEqual($.mobile.path.isExternal("#foo"), false, "local id reference");
 	});
 
 	test( "path.cleanHash", function(){
-		same( $.mobile.path.cleanHash( "#anything/atall?akjfdjjf" ), "anything/atall", "removes query param");
-		same( $.mobile.path.cleanHash( "#nothing/atall" ), "nothing/atall", "removes query param");
+		deepEqual( $.mobile.path.cleanHash( "#anything/atall?akjfdjjf" ), "anything/atall", "removes query param");
+		deepEqual( $.mobile.path.cleanHash( "#nothing/atall" ), "nothing/atall", "removes query param");
 	});
 
 	test( "path.isHashValid", function(){
-        same( $.mobile.path.isHashValid( "#id" ), true, "Valid hash");
-        same( $.mobile.path.isHashValid( "#" ), false, "Empty hash");
-        same( $.mobile.path.isHashValid( "#id#" ), false, "Hash with more than one #");
-        same( $.mobile.path.isHashValid( "id" ), false, "Hash without #");
-        same( $.mobile.path.isHashValid( "i#d" ), false, "Hash with # in the wrong spot");
+        deepEqual( $.mobile.path.isHashValid( "#id" ), true, "Valid hash");
+        deepEqual( $.mobile.path.isHashValid( "#" ), false, "Empty hash");
+        deepEqual( $.mobile.path.isHashValid( "#id#" ), false, "Hash with more than one #");
+        deepEqual( $.mobile.path.isHashValid( "id" ), false, "Hash without #");
+        deepEqual( $.mobile.path.isHashValid( "i#d" ), false, "Hash with # in the wrong spot");
 	});
 
 	test( "path.isPermittedCrossDomainRequest", function() {
 		var fileDocUrl = $.mobile.path.parseUrl( "file://foo" );
 
 		$.mobile.allowCrossDomainPages = false;
-		same( $.mobile.path.isPermittedCrossDomainRequest( "foo",  "bar"), false, "always false from the setting");
+		deepEqual( $.mobile.path.isPermittedCrossDomainRequest( "foo",  "bar"), false, "always false from the setting");
 
 
 		$.mobile.allowCrossDomainPages = true;
 		// test the two states of the file protocol logic
-		same( $.mobile.path.isPermittedCrossDomainRequest( fileDocUrl,  "http://bar.com/foo"), true, "external url from file protocol succeeds");
+		deepEqual( $.mobile.path.isPermittedCrossDomainRequest( fileDocUrl,  "http://bar.com/foo"), true, "external url from file protocol succeeds");
 
-		same( $.mobile.path.isPermittedCrossDomainRequest( fileDocUrl,  "file://foo"), false, "two file protocol urls fail");
+		deepEqual( $.mobile.path.isPermittedCrossDomainRequest( fileDocUrl,  "file://foo"), false, "two file protocol urls fail");
 
 	});
 })(jQuery);
diff --git a/tests/unit/navigation/navigation_paths.js b/tests/unit/navigation/navigation_paths.js
index 017a943..2f53a18 100644
--- a/tests/unit/navigation/navigation_paths.js
+++ b/tests/unit/navigation/navigation_paths.js
@@ -33,7 +33,7 @@
 
 			// verify that the page has changed and the expected text value is present
 			function(){
-				same($.mobile.activePage.find(".test-value").text(), expectedTextValue);
+				deepEqual($.mobile.activePage.find(".test-value").text(), expectedTextValue);
 				start();
 			}
 		]);
diff --git a/tests/unit/navigation/navigation_transitions.js b/tests/unit/navigation/navigation_transitions.js
index 160f720..f68c2f8 100644
--- a/tests/unit/navigation/navigation_transitions.js
+++ b/tests/unit/navigation/navigation_transitions.js
@@ -206,7 +206,7 @@
 
 	test( "animationComplete return value", function(){
 		$.fn.animationComplete = animationCompleteFn;
-		equals($("#foo").animationComplete(function(){})[0], $("#foo")[0]);
+		equal($("#foo").animationComplete(function(){})[0], $("#foo")[0]);
 	});
 
 
diff --git a/tests/unit/page-sections/page_core.js b/tests/unit/page-sections/page_core.js
index 75f0765..53bba93 100644
--- a/tests/unit/page-sections/page_core.js
+++ b/tests/unit/page-sections/page_core.js
@@ -40,14 +40,14 @@
 			.attr( "data-" + $.mobile.ns + "role", "page" )
 			.page()
 			.trigger( "pagecreate" );
-		same( $ignored.attr( "class" ), undefined, "ignored header has no class" );
+		deepEqual( $ignored.attr( "class" ), undefined, "ignored header has no class" );
 
 		$enhanced
 			.parent()
 			.attr( "data-" + $.mobile.ns + "role", "page" )
 			.page()
 			.trigger( "pagecreate" );
-		same( $enhanced.attr( "class" ).indexOf("ui-header"), 0, "enhanced header has classes" );
+		deepEqual( $enhanced.attr( "class" ).indexOf("ui-header"), 0, "enhanced header has classes" );
 
 		$.mobile.ignoreContentEnabled = false;
 	});
diff --git a/tests/unit/page/page_core.js b/tests/unit/page/page_core.js
index 234df61..232df49 100644
--- a/tests/unit/page/page_core.js
+++ b/tests/unit/page/page_core.js
@@ -80,27 +80,27 @@
 		var pageProto = $.mobile.page.prototype;
 		pageProto.options.keepNative = pageProto.options.keepNativeDefault;
 
-		same(pageProto.keepNativeSelector(), pageProto.options.keepNativeDefault);
+		deepEqual(pageProto.keepNativeSelector(), pageProto.options.keepNativeDefault);
 	});
 
 	test( "keepNativeSelector returns the default where keepNative is empty, undefined, whitespace", function() {
 		var pageProto = $.mobile.page.prototype;
 
 		pageProto.options.keepNative = "";
-		same(pageProto.keepNativeSelector(), pageProto.options.keepNativeDefault);
+		deepEqual(pageProto.keepNativeSelector(), pageProto.options.keepNativeDefault);
 
 		pageProto.options.keepNative = undefined;
-		same(pageProto.keepNativeSelector(), pageProto.options.keepNativeDefault);
+		deepEqual(pageProto.keepNativeSelector(), pageProto.options.keepNativeDefault);
 
 		pageProto.options.keepNative = "  ";
-		same(pageProto.keepNativeSelector(), pageProto.options.keepNativeDefault);
+		deepEqual(pageProto.keepNativeSelector(), pageProto.options.keepNativeDefault);
 	});
 
 	test( "keepNativeSelector returns a selector joined with the default", function() {
 		var pageProto = $.mobile.page.prototype;
 
 		pageProto.options.keepNative = "foo, bar";
-		same(pageProto.keepNativeSelector(), "foo, bar, " + pageProto.options.keepNativeDefault);
+		deepEqual(pageProto.keepNativeSelector(), "foo, bar, " + pageProto.options.keepNativeDefault);
 	});
 
 	test( "links inside an ignored container do not enhance", function() {
@@ -109,10 +109,10 @@
 		$.mobile.ignoreContentEnabled = true;
 
 		$ignored.parent().trigger( "create" );
-		same( $ignored.attr( "class" ), undefined, "ignored link doesn't have link class" );
+		deepEqual( $ignored.attr( "class" ), undefined, "ignored link doesn't have link class" );
 
 		$enhanced.parent().trigger( "create" );
-		same( $enhanced.attr( "class" ).indexOf("ui-link"), 0, "enhanced link has link class" );
+		deepEqual( $enhanced.attr( "class" ).indexOf("ui-link"), 0, "enhanced link has link class" );
 
 		$.mobile.ignoreContentEnabled = false;
 	});
diff --git a/tests/unit/popup/popup_core.js b/tests/unit/popup/popup_core.js
index f6908f9..6fb42e8 100644
--- a/tests/unit/popup/popup_core.js
+++ b/tests/unit/popup/popup_core.js
@@ -119,7 +119,7 @@
 
 	function tolTest( el, popup, val, expected ) {
 		el.popup( "option", "tolerance", val );
-		same( popup._tolerance, expected, "Popup tolerance: '" + val + "' results in expected tolerances" );
+		deepEqual( popup._tolerance, expected, "Popup tolerance: '" + val + "' results in expected tolerances" );
 	}
 
 	test( "Popup tolerances are parsed correctly", function() {
diff --git a/tests/unit/select/select_cached.js b/tests/unit/select/select_cached.js
index 1493dff..811b346 100644
--- a/tests/unit/select/select_cached.js
+++ b/tests/unit/select/select_cached.js
@@ -34,7 +34,7 @@
 			},
 
 			function(){
-				same( value, $.trim(selectButton.text()), "the selected value is propogated back to the button text" );
+				deepEqual( value, $.trim(selectButton.text()), "the selected value is propogated back to the button text" );
 				start();
 			}
 		]);
@@ -56,12 +56,12 @@
 			function(){
 				selectButton = $.mobile.activePage.find( "#cached-page-select" ).siblings( 'a' );
 				parentPageId = $.mobile.activePage.attr( 'id' );
-				same( $("#" + parentPageId).length, 1, "establish the parent page exists" );
+				deepEqual( $("#" + parentPageId).length, 1, "establish the parent page exists" );
 				selectButton.click();
 			},
 
 			function(){
-				same( $( "#" + parentPageId).length, 1, "make sure parent page is still there after opening the dialog" );
+				deepEqual( $( "#" + parentPageId).length, 1, "make sure parent page is still there after opening the dialog" );
 				$.mobile.activePage.find( "li a" ).last().click();
 			},
 
@@ -94,7 +94,7 @@
 			},
 
 			function(){
-				same( $("#dialog-select-parent-domcache-test").length, 1, "make sure the select parent page is still cached in the dom after changing page" );
+				deepEqual( $("#dialog-select-parent-domcache-test").length, 1, "make sure the select parent page is still cached in the dom after changing page" );
 				start();
 			}
 		]);
@@ -111,7 +111,7 @@
 
 			function(){
 				// for performance reason we don't initially create the menu dialog now
-				same( $(":jqmData(role='dialog')").length, dialogCount);
+				deepEqual( $(":jqmData(role='dialog')").length, dialogCount);
 
 				// manually trigger dialog opening
 				$( "#domcache-uncached-page-select" ).data( 'selectmenu' ).open();
@@ -119,7 +119,7 @@
 
 			function(){
 				// check if dialog was successfully  created
-				same( $(":jqmData(role='dialog')").length, dialogCount + 1 );
+				deepEqual( $(":jqmData(role='dialog')").length, dialogCount + 1 );
 				$( "#domcache-uncached-page-select" ).data( 'selectmenu' ).close();
 			},
 
@@ -129,7 +129,7 @@
 			},
 
 			function() {
-				same( $(":jqmData(role='dialog')").length, dialogCount );
+				deepEqual( $(":jqmData(role='dialog')").length, dialogCount );
 				start();
 			}
 		]);
diff --git a/tests/unit/select/select_core.js b/tests/unit/select/select_core.js
index 785a05f..5ecb5c6 100644
--- a/tests/unit/select/select_core.js
+++ b/tests/unit/select/select_core.js
@@ -61,7 +61,7 @@
 			},
 
 			function(){
-				same($("#select-choice-few-menu").parent().parent(".ui-selectmenu-hidden").length, 1);
+				deepEqual($("#select-choice-few-menu").parent().parent(".ui-selectmenu-hidden").length, 1);
 				start();
 			}
 		], 1000);
@@ -81,7 +81,7 @@
 					fn: $.mobile.defaultTransitionHandler,
 
 					before: function(name){
-						same(name, $.mobile.defaultDialogTransition);
+						deepEqual(name, $.mobile.defaultDialogTransition);
 					}
 				});
 
@@ -111,7 +111,7 @@
 			},
 
 			function(){
-				same(location.hash.indexOf(dialogHashKey), -1);
+				deepEqual(location.hash.indexOf(dialogHashKey), -1);
 				start();
 			}
 		]);
@@ -273,16 +273,16 @@
 		button = select.siblings( "a" ).first();
 
 		select.selectmenu( 'disable' );
-		same( select.attr('disabled'), "disabled", "select is disabled" );
+		deepEqual( select.attr('disabled'), "disabled", "select is disabled" );
 		ok( button.hasClass("ui-disabled"), "disabled class added" );
-		same( button.attr('aria-disabled'), "true", "select is disabled" );
-		same( select.selectmenu( 'option', 'disabled' ), true, "disbaled option set" );
+		deepEqual( button.attr('aria-disabled'), "true", "select is disabled" );
+		deepEqual( select.selectmenu( 'option', 'disabled' ), true, "disbaled option set" );
 
 		select.selectmenu( 'enable' );
-		same( select.attr('disabled'), undefined, "select is disabled" );
+		deepEqual( select.attr('disabled'), undefined, "select is disabled" );
 		ok( !button.hasClass("ui-disabled"), "disabled class added" );
-		same( button.attr('aria-disabled'), "false", "select is disabled" );
-		same( select.selectmenu( 'option', 'disabled' ), false, "disbaled option set" );
+		deepEqual( button.attr('aria-disabled'), "false", "select is disabled" );
+		deepEqual( select.selectmenu( 'option', 'disabled' ), false, "disbaled option set" );
 	});
 
 	asyncTest( "adding options and refreshing a custom select changes the options list", function(){
@@ -297,7 +297,7 @@
 			},
 
 			function() {
-				same( $( ".ui-popup-container:not(.ui-selectmenu-hidden) .ui-selectmenu ul" ).text(), "default" );
+				deepEqual( $( ".ui-popup-container:not(.ui-selectmenu-hidden) .ui-selectmenu ul" ).text(), "default" );
 				$( ".ui-popup-screen" ).click();
 			},
 
@@ -312,7 +312,7 @@
 			},
 
 			function() {
-				same( $( ".ui-popup-container:not(.ui-selectmenu-hidden) .ui-selectmenu ul" ).text(), text );
+				deepEqual( $( ".ui-popup-container:not(.ui-selectmenu-hidden) .ui-selectmenu ul" ).text(), text );
 				$( ".ui-popup-screen" ).click();
 			},
 
@@ -337,7 +337,7 @@
 	// issue #2547
 	test( "custom select list item links have encoded option text values", function() {
 		$( "#encoded-option" ).data( 'selectmenu' )._buildList();
-		same(window.encodedValueIsDefined, undefined);
+		deepEqual(window.encodedValueIsDefined, undefined);
 	});
 
 	// not testing the positive case here since's it's obviously tested elsewhere
@@ -356,7 +356,7 @@
 			},
 
 			function() {
-				same($.mobile.activePage.find( ".ui-title" ).text(), $label.text());
+				deepEqual($.mobile.activePage.find( ".ui-title" ).text(), $label.text());
 				window.history.back();
 			},
 
@@ -378,7 +378,7 @@
 			},
 
 			function() {
-				same($.mobile.activePage.find( ".ui-title" ).text(), $label.text());
+				deepEqual($.mobile.activePage.find( ".ui-title" ).text(), $label.text());
 				window.history.back();
 			},
 
diff --git a/tests/unit/select/select_events.js b/tests/unit/select/select_events.js
index 355a142..f492cad 100644
--- a/tests/unit/select/select_events.js
+++ b/tests/unit/select/select_events.js
@@ -16,15 +16,15 @@
 	});
 
 	test( "selects marked with data-native-menu=true should use a div as their button", function(){
-		same($("#select-choice-native-container div.ui-btn").length, 1);
+		deepEqual($("#select-choice-native-container div.ui-btn").length, 1);
 	});
 
 	test( "selects marked with data-native-menu=true should not have a custom menu", function(){
-		same($("#select-choice-native-container ul").length, 0);
+		deepEqual($("#select-choice-native-container ul").length, 0);
 	});
 
 	test( "selects marked with data-native-menu=true should sit inside the button", function(){
-		same($("#select-choice-native-container div.ui-btn select").length, 1);
+		deepEqual($("#select-choice-native-container div.ui-btn select").length, 1);
 	});
 
 	test( "select controls will create when inside a container that receives a 'create' event", function(){
diff --git a/tests/unit/select/select_native.js b/tests/unit/select/select_native.js
index fdabe85..466ee6d 100644
--- a/tests/unit/select/select_native.js
+++ b/tests/unit/select/select_native.js
@@ -13,7 +13,7 @@
 
 			select.val( key ).selectmenu( 'refresh' );
 			text = select.find( "option[value='" + key + "']" ).text();
-			same( select.parent().find(".ui-btn-text").text(), text );
+			deepEqual( select.parent().find(".ui-btn-text").text(), text );
 		};
 
 		setAndCheck( 'rush' );
@@ -51,11 +51,11 @@
 			button = select.siblings( "a" ).find( ".ui-btn-inner" ),
 			text = "foo";
 
-		same($.trim(button.text()), "default");
+		deepEqual($.trim(button.text()), "default");
 		select.find( "option" ).remove(); //remove the loading message
 		select.append('<option value="1">' + text + '</option>');
 		select.selectmenu( 'refresh' );
-		same($.trim(button.text()), text);
+		deepEqual($.trim(button.text()), text);
 	});
 
 	// issue 2424
diff --git a/tests/unit/slider/slider_core.js b/tests/unit/slider/slider_core.js
index 1359a6d..061ff1a 100644
--- a/tests/unit/slider/slider_core.js
+++ b/tests/unit/slider/slider_core.js
@@ -8,7 +8,7 @@
 
 	// not testing the positive case here since's it's obviously tested elsewhere
 	test( "slider elements in the keepNative set shouldn't be enhanced", function() {
-		same( $("input.should-be-native").siblings("div.ui-slider").length, 0 );
+		deepEqual( $("input.should-be-native").siblings("div.ui-slider").length, 0 );
 	});
 
 	test( "refresh should force val to nearest step", function() {
@@ -21,19 +21,19 @@
 
 		ok( step > 1, "the step is greater than one" );
 		ok( slider.val() > 0, "the value has been altered" );
-		same( slider.val() % step, 0, "value has 'snapped' to a step" );
+		deepEqual( slider.val() % step, 0, "value has 'snapped' to a step" );
 	});
 
 	test( "empty string value results defaults to slider min value", function() {
 		var slider = $( "#empty-string-val-slider" );
-		same( slider.attr('min'), "10", "slider min is greater than 0" );
-		same( slider.val( '' ).slider( 'refresh' ).val(), slider.attr('min'), "val is equal to min attr");
+		deepEqual( slider.attr('min'), "10", "slider min is greater than 0" );
+		deepEqual( slider.val( '' ).slider( 'refresh' ).val(), slider.attr('min'), "val is equal to min attr");
 	});
 
 	test( "flip toggle switch title should be current selected value attr", function() {
 		var slider = $( "#slider-switch" );
 
-		same(slider.siblings(".ui-slider").find("a").attr('title'),
+		deepEqual(slider.siblings(".ui-slider").find("a").attr('title'),
 				 $(slider.find("option")[slider[0].selectedIndex]).text(),
 				 "verify that the link title is set to the selected option text");
 	});
@@ -41,9 +41,9 @@
 	test( "data-highlight works properly", function() {
 		var $highlighted = $("#background-slider"), $unhighlighted = $("#no-background-slider");
 
-		same( $highlighted.siblings( ".ui-slider" ).find( ".ui-slider-bg" ).length, 1,
+		deepEqual( $highlighted.siblings( ".ui-slider" ).find( ".ui-slider-bg" ).length, 1,
 					"highlighted slider should have a div for the track bg" );
-		same( $unhighlighted.siblings( ".ui-slider" ).find( ".ui-slider-bg" ).length, 0,
+		deepEqual( $unhighlighted.siblings( ".ui-slider" ).find( ".ui-slider-bg" ).length, 0,
 					"unhighlighted slider _not_ should have a div for the track bg" );
 	});
 
diff --git a/tests/unit/slider/slider_events.js b/tests/unit/slider/slider_events.js
index fcc7806..c801226 100644
--- a/tests/unit/slider/slider_events.js
+++ b/tests/unit/slider/slider_events.js
@@ -29,7 +29,7 @@
 			handle.trigger('keydown');
 
 			val += opts.increment;
-			same(val, window.parseFloat(slider.val(), 10), "new value is " + opts.increment + " different");
+			deepEqual(val, window.parseFloat(slider.val(), 10), "new value is " + opts.increment + " different");
 		});
 	};
 
@@ -92,22 +92,22 @@
 		var slider = $("#range-slider-up");
 		slider.focus();
 		slider.val(200);
-		same(slider.val(), "200");
+		deepEqual(slider.val(), "200");
 		slider.blur();
-		same(slider.val(), slider.attr('max'));
+		deepEqual(slider.val(), slider.attr('max'));
 	});
 
 	test( "slider should not validate input on keyup", function(){
 		var slider = $("#range-slider-up");
 		slider.focus();
 		slider.val(200);
-		same(slider.val(), "200");
+		deepEqual(slider.val(), "200");
 		slider.keyup();
-		same(slider.val(), "200");
+		deepEqual(slider.val(), "200");
 	});
 
 	test( "input type should degrade to number when slider is created", function(){
-		same($("#range-slider-up").attr( "type" ), "number");
+		deepEqual($("#range-slider-up").attr( "type" ), "number");
 	});
 
 	// generic switch test function
@@ -131,8 +131,8 @@
 			$.Event.prototype.keyCode = $.mobile.keyCode[elem];
 			handle.trigger('keydown');
 
-			same(handle.attr('aria-valuenow'), opts.finish, "handle value is " + opts.finish);
-			same(slider[0].selectedIndex, switchValues[opts.finish], "select input has correct index");
+			deepEqual(handle.attr('aria-valuenow'), opts.finish, "handle value is " + opts.finish);
+			deepEqual(slider[0].selectedIndex, switchValues[opts.finish], "select input has correct index");
 		});
 	};
 
@@ -153,13 +153,13 @@
 	});
 
 	test( "onchange should not be called on create", function(){
-		equals(onChangeCnt, 0, "onChange should not have been called");
+		equal(onChangeCnt, 0, "onChange should not have been called");
 	});
 
 	test( "onchange should be called onchange", function(){
 		onChangeCnt = 0;
 		$( "#onchange" ).slider( "refresh", 50 );
-		equals(onChangeCnt, 1, "onChange should have been called once");
+		equal(onChangeCnt, 1, "onChange should have been called once");
 	});
 
 	test( "slider controls will create when inside a container that receives a 'create' event", function(){
@@ -202,7 +202,7 @@
 		control.unbind( "change", changeFunc );
 
 		ok( control[0].selectedIndex !== currentValue, "value did change");
-		same( changeCount, 1, "change event should be fired once during a click" );
+		deepEqual( changeCount, 1, "change event should be fired once during a click" );
 	});
 
 	var assertLeftCSS = function( obj, opts ) {
diff --git a/tests/unit/support/support_core.js b/tests/unit/support/support_core.js
index 7782291..d7168de 100644
--- a/tests/unit/support/support_core.js
+++ b/tests/unit/support/support_core.js
@@ -91,10 +91,10 @@ $.testHelper.excludeFileProtocol(function(){
 		 	 jqmdetectedver = $.mobile.browser.ie;
 
 		 	if( ie ){
-		 		same(version, jqmdetectedver, "It's IE and the version is correct");
+		 		deepEqual(version, jqmdetectedver, "It's IE and the version is correct");
 		 	}
 		 	else{
-		 		same(ie, jqmdetectedver, "It's not IE");
+		 		deepEqual(ie, jqmdetectedver, "It's not IE");
 		 	}
 			start();
 		});
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 5425382..92985a1 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -9,7 +9,7 @@
 
 		$.mobile.widget.prototype.options = { "fooBar" : true };
 		$.mobile.widget.prototype.element = $("<div data-"+$.mobile.ns+"foo-bar=" + expected + ">");
-		same($.mobile.widget.prototype._getCreateOptions()["fooBar"], expected);
+		deepEqual($.mobile.widget.prototype._getCreateOptions()["fooBar"], expected);
 	});
 
 	test( "getting no data when the options are empty", function(){
@@ -17,7 +17,7 @@
 
 		$.mobile.widget.prototype.options = {};
 		$.mobile.widget.prototype.element = $("<div data-"+$.mobile.ns+"foo-bar=" + expected + ">");
-		same($.mobile.widget.prototype._getCreateOptions(), expected);
+		deepEqual($.mobile.widget.prototype._getCreateOptions(), expected);
 	});
 
 	test( "getting no data when the element has none", function(){
@@ -25,7 +25,7 @@
 
 		$.mobile.widget.prototype.options = { "fooBar" : true };
 		$.mobile.widget.prototype.element = $("<div>");
-		same($.mobile.widget.prototype._getCreateOptions(), expected);
+		deepEqual($.mobile.widget.prototype._getCreateOptions(), expected);
 	});
 
 	test( "elements embedded in sub page elements are excluded on create when they match the keep native selector", function() {