Datepicker: Style updates

Ref #14246

4 files changed, 1207 insertions, 1164 deletions

diff --git a/tests/unit/datepicker/core.js b/tests/unit/datepicker/core.js
index 43d5e2243..f9cdd4bb0 100644
--- a/tests/unit/datepicker/core.js
+++ b/tests/unit/datepicker/core.js
@@ -10,31 +10,31 @@ module( "datepicker: core", {
 	setup: function() {
 		$( "body" ).trigger( "focus" );
 	}
-});
+} );
 
 common.testJshint( "datepicker" );
 
-test("initialization - Reinitialization after body had been emptied.", function() {
+test( "initialization - Reinitialization after body had been emptied.", function() {
 	expect( 1 );
-	var bodyContent = $("body").children(), inp = $("#inp");
-	$("#inp").datepicker();
-	$("body").empty().append(inp);
-	$("#inp").datepicker();
-	ok( $("#"+$.datepicker._mainDivId).length===1, "Datepicker container added" );
-	$("body").empty().append(bodyContent); // Returning to initial state for later tests
-});
+	var bodyContent = $( "body" ).children(), inp = $( "#inp" );
+	$( "#inp" ).datepicker();
+	$( "body" ).empty().append( inp );
+	$( "#inp" ).datepicker();
+	ok( $( "#" + $.datepicker._mainDivId ).length === 1, "Datepicker container added" );
+	$( "body" ).empty().append( bodyContent ); // Returning to initial state for later tests
+} );
 
 test( "widget method - empty collection", function() {
 	expect( 1 );
 	$( "#nonExist" ).datepicker(); // should create nothing
 	ok( !$( "#ui-datepicker-div" ).length, "Non init on empty collection" );
-});
+} );
 
-test("widget method", function() {
+test( "widget method", function() {
 	expect( 1 );
-	var actual = $("#inp").datepicker().datepicker("widget")[0];
-	deepEqual($("body > #ui-datepicker-div:last-child")[0], actual);
-});
+	var actual = $( "#inp" ).datepicker().datepicker( "widget" )[ 0 ];
+	deepEqual( $( "body > #ui-datepicker-div:last-child" )[ 0 ], actual );
+} );
 
 asyncTest( "baseStructure", function() {
 	expect( 58 );
@@ -56,7 +56,7 @@ asyncTest( "baseStructure", function() {
 			ok( header.children( ":eq(1)" ).is( "a.ui-datepicker-next" ) && header.children( ":eq(1)" ).html() !== "", "Structure - next link" );
 
 			title = header.children( ":last" );
-			ok( title.is( "div.ui-datepicker-title" ) && title.html() !== "","Structure - title division" );
+			ok( title.is( "div.ui-datepicker-title" ) && title.html() !== "", "Structure - title division" );
 			equal( title.children().length, 2, "Structure - title child count" );
 			ok( title.children( ":first" ).is( "span.ui-datepicker-month" ) && title.children( ":first" ).text() !== "", "Structure - month text" );
 			ok( title.children( ":last" ).is( "span.ui-datepicker-year" ) && title.children( ":last" ).text() !== "", "Structure - year text" );
@@ -79,16 +79,17 @@ asyncTest( "baseStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step2();
-		});
+		} );
 	}
 
 	function step2() {
+
 		// Editable month/year and button panel
-		inp = testHelper.initNewInput({
+		inp = testHelper.initNewInput( {
 			changeMonth: true,
 			changeYear: true,
 			showButtonPanel: true
-		});
+		} );
 		testHelper.onFocus( inp, function() {
 			title = dp.find( "div.ui-datepicker-title" );
 			ok( title.children( ":first" ).is( "select.ui-datepicker-month" ), "Structure - month selector" );
@@ -102,12 +103,13 @@ asyncTest( "baseStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step3();
-		});
+		} );
 	}
 
 	function step3() {
+
 		// Multi-month 2
-		inp = testHelper.initNewInput({ numberOfMonths: 2 });
+		inp = testHelper.initNewInput( { numberOfMonths: 2 } );
 		testHelper.onFocus( inp, function() {
 			ok( dp.is( ".ui-datepicker-multi" ), "Structure multi [2] - multi-month" );
 			equal( dp.children().length, 3, "Structure multi [2] - child count" );
@@ -124,24 +126,26 @@ asyncTest( "baseStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step4();
-		});
+		} );
 	}
 
 	function step4() {
+
 		// Multi-month 3
-		inp = testHelper.initNewInput({ numberOfMonths: 3 });
+		inp = testHelper.initNewInput( { numberOfMonths: 3 } );
 		testHelper.onFocus( inp, function() {
 			ok( dp.is( ".ui-datepicker-multi-3" ), "Structure multi [3] - multi-3" );
 			ok( !dp.is( ".ui-datepicker-multi-2" ), "Structure multi [3] - Trac #6704" );
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step5();
-		});
+		} );
 	}
 
 	function step5() {
+
 		// Multi-month [2, 2]
-		inp = testHelper.initNewInput({ numberOfMonths: [ 2, 2 ] });
+		inp = testHelper.initNewInput( { numberOfMonths: [ 2, 2 ] } );
 		testHelper.onFocus( inp, function() {
 			ok( dp.is( ".ui-datepicker-multi" ), "Structure multi - multi-month" );
 			equal( dp.children().length, 6, "Structure multi [2,2] - child count" );
@@ -204,11 +208,11 @@ asyncTest( "baseStructure", function() {
 
 			inl.datepicker( "destroy" );
 			start();
-		});
+		} );
 	}
 
 	step1();
-});
+} );
 
 asyncTest( "customStructure", function() {
 	expect( 20 );
@@ -236,16 +240,16 @@ asyncTest( "customStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step2();
-		});
+		} );
 	}
 
 	// Hide prev/next
 	function step2() {
-		inp = testHelper.initNewInput({
+		inp = testHelper.initNewInput( {
 			hideIfNoPrevNext: true,
 			minDate: new Date( 2008, 2 - 1, 4 ),
 			maxDate: new Date( 2008, 2 - 1, 14 )
-		});
+		} );
 		inp.val( "02/10/2008" );
 
 		testHelper.onFocus( inp, function() {
@@ -256,12 +260,12 @@ asyncTest( "customStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step3();
-		});
+		} );
 	}
 
 	// Changeable Month with read-only year
 	function step3() {
-		inp = testHelper.initNewInput({ changeMonth: true });
+		inp = testHelper.initNewInput( { changeMonth: true } );
 
 		testHelper.onFocus( inp, function() {
 			title = dp.children( ":first" ).children( ":last" );
@@ -271,12 +275,12 @@ asyncTest( "customStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step4();
-		});
+		} );
 	}
 
 	// Changeable year with read-only month
 	function step4() {
-		inp = testHelper.initNewInput({ changeYear: true });
+		inp = testHelper.initNewInput( { changeYear: true } );
 
 		testHelper.onFocus( inp, function() {
 			title = dp.children( ":first" ).children( ":last" );
@@ -286,12 +290,12 @@ asyncTest( "customStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step5();
-		});
+		} );
 	}
 
 	// Read-only first day of week
 	function step5() {
-		inp = testHelper.initNewInput({ changeFirstDay: false });
+		inp = testHelper.initNewInput( { changeFirstDay: false } );
 
 		testHelper.onFocus( inp, function() {
 			thead = dp.find( ".ui-datepicker-calendar thead tr" );
@@ -300,231 +304,239 @@ asyncTest( "customStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			start();
-		});
+		} );
 	}
 
 	// TODO: figure out why this setTimeout is needed in IE,
 	// it only is necessary when the previous baseStructure tests runs first
 	// Support: IE
 	setTimeout( step1 );
-});
+} );
 
-test("keystrokes", function() {
+test( "keystrokes", function() {
 	expect( 26 );
-	var inp = testHelper.init("#inp"),
+	var inp = testHelper.init( "#inp" ),
 		date = new Date();
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke enter");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke enter - preset");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+home");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
-	ok(inp.datepicker("getDate") == null, "Keystroke ctrl+end");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	ok(inp.datepicker("getDate") == null, "Keystroke esc");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke esc - preset");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke esc - abandoned");
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke enter" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Keystroke enter - preset" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.HOME } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+home" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.END } );
+	ok( inp.datepicker( "getDate" ) == null, "Keystroke ctrl+end" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+	ok( inp.datepicker( "getDate" ) == null, "Keystroke esc" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Keystroke esc - preset" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Keystroke esc - abandoned" );
+
 	// Moving by day or week
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.LEFT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+left");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.LEFT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke left");
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.RIGHT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+right");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.RIGHT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke right");
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+up");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke up");
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+down");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke down");
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.LEFT } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+left" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke left" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.RIGHT } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+right" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke right" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 7 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+up" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 7 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke up" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 7 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+down" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 7 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke down" );
+
 	// Moving by month or year
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 1 - 1, 4),
-		"Keystroke pgup");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 3 - 1, 4),
-		"Keystroke pgdn");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 2 - 1, 4),
-		"Keystroke ctrl+pgup");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2009, 2 - 1, 4),
-		"Keystroke ctrl+pgdn");
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 1 - 1, 4 ),
+		"Keystroke pgup" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 3 - 1, 4 ),
+		"Keystroke pgdn" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2007, 2 - 1, 4 ),
+		"Keystroke ctrl+pgup" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2009, 2 - 1, 4 ),
+		"Keystroke ctrl+pgdn" );
+
 	// Check for moving to short months
-	inp.val("03/31/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 29),
-		"Keystroke pgup - Feb");
-	inp.val("01/30/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 29),
-		"Keystroke pgdn - Feb");
-	inp.val("02/29/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 2 - 1, 28),
-		"Keystroke ctrl+pgup - Feb");
-	inp.val("02/29/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2009, 2 - 1, 28),
-		"Keystroke ctrl+pgdn - Feb");
+	inp.val( "03/31/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 29 ),
+		"Keystroke pgup - Feb" );
+	inp.val( "01/30/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 29 ),
+		"Keystroke pgdn - Feb" );
+	inp.val( "02/29/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2007, 2 - 1, 28 ),
+		"Keystroke ctrl+pgup - Feb" );
+	inp.val( "02/29/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2009, 2 - 1, 28 ),
+		"Keystroke ctrl+pgdn - Feb" );
+
 	// Goto current
-	inp.datepicker("option", {gotoCurrent: true}).
-		datepicker("hide").val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke ctrl+home");
+	inp.datepicker( "option", { gotoCurrent: true } ).
+		datepicker( "hide" ).val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.HOME } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Keystroke ctrl+home" );
+
 	// Change steps
-	inp.datepicker("option", {stepMonths: 2, gotoCurrent: false}).
-		datepicker("hide").val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 12 - 1, 4),
-		"Keystroke pgup step 2");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 4 - 1, 4),
-		"Keystroke pgdn step 2");
-});
-
-test("mouse", function() {
+	inp.datepicker( "option", { stepMonths: 2, gotoCurrent: false } ).
+		datepicker( "hide" ).val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2007, 12 - 1, 4 ),
+		"Keystroke pgup step 2" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 4 - 1, 4 ),
+		"Keystroke pgdn step 2" );
+} );
+
+test( "mouse", function() {
 	expect( 15 );
 	var inl,
-		inp = testHelper.init("#inp"),
-		dp = $("#ui-datepicker-div"),
+		inp = testHelper.init( "#inp" ),
+		dp = $( "#ui-datepicker-div" ),
 		date = new Date();
-	inp.val("").datepicker("show");
-	$(".ui-datepicker-calendar tbody a:contains(10)", dp).simulate("click", {});
-	date.setDate(10);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Mouse click");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-calendar tbody a:contains(12)", dp).simulate("click", {});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 12),
-		"Mouse click - preset");
-	inp.val("02/04/2008").datepicker("show");
-	inp.val("").datepicker("show");
-	$("button.ui-datepicker-close", dp).simulate("click", {});
-	ok(inp.datepicker("getDate") == null, "Mouse click - close");
-	inp.val("02/04/2008").datepicker("show");
-	$("button.ui-datepicker-close", dp).simulate("click", {});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Mouse click - close + preset");
-	inp.val("02/04/2008").datepicker("show");
-	$("a.ui-datepicker-prev", dp).simulate("click", {});
-	$("button.ui-datepicker-close", dp).simulate("click", {});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Mouse click - abandoned");
+	inp.val( "" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar tbody a:contains(10)", dp ).simulate( "click", {} );
+	date.setDate( 10 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Mouse click" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar tbody a:contains(12)", dp ).simulate( "click", {} );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 12 ),
+		"Mouse click - preset" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	inp.val( "" ).datepicker( "show" );
+	$( "button.ui-datepicker-close", dp ).simulate( "click", {} );
+	ok( inp.datepicker( "getDate" ) == null, "Mouse click - close" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( "button.ui-datepicker-close", dp ).simulate( "click", {} );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Mouse click - close + preset" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( "a.ui-datepicker-prev", dp ).simulate( "click", {} );
+	$( "button.ui-datepicker-close", dp ).simulate( "click", {} );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Mouse click - abandoned" );
+
 	// Current/previous/next
-	inp.val("02/04/2008").datepicker("option", {showButtonPanel: true}).datepicker("show");
-	$(".ui-datepicker-current", dp).simulate("click", {});
-	$(".ui-datepicker-calendar tbody a:contains(14)", dp).simulate("click", {});
-	date.setDate(14);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Mouse click - current");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-prev", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 1 - 1, 16),
-		"Mouse click - previous");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-next", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 3 - 1, 18),
-		"Mouse click - next");
+	inp.val( "02/04/2008" ).datepicker( "option", { showButtonPanel: true } ).datepicker( "show" );
+	$( ".ui-datepicker-current", dp ).simulate( "click", {} );
+	$( ".ui-datepicker-calendar tbody a:contains(14)", dp ).simulate( "click", {} );
+	date.setDate( 14 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Mouse click - current" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-prev", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 1 - 1, 16 ),
+		"Mouse click - previous" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-next", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 3 - 1, 18 ),
+		"Mouse click - next" );
+
 	// Previous/next with minimum/maximum
-	inp.datepicker("option", {minDate: new Date(2008, 2 - 1, 2),
-		maxDate: new Date(2008, 2 - 1, 26)}).val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-prev", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 16),
-		"Mouse click - previous + min/max");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-next", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 18),
-		"Mouse click - next + min/max");
+	inp.datepicker( "option", { minDate: new Date( 2008, 2 - 1, 2 ),
+		maxDate: new Date( 2008, 2 - 1, 26 ) } ).val( "02/04/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-prev", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 16 ),
+		"Mouse click - previous + min/max" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-next", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 18 ),
+		"Mouse click - next + min/max" );
+
 	// Inline
-	inl = testHelper.init("#inl");
-	dp = $(".ui-datepicker-inline", inl);
+	inl = testHelper.init( "#inl" );
+	dp = $( ".ui-datepicker-inline", inl );
 	date = new Date();
-	inl.datepicker("setDate", date);
-	$(".ui-datepicker-calendar tbody a:contains(10)", dp).simulate("click", {});
-	date.setDate(10);
-	testHelper.equalsDate(inl.datepicker("getDate"), date, "Mouse click inline");
-	inl.datepicker("option", {showButtonPanel: true}).datepicker("setDate", new Date(2008, 2 - 1, 4));
-	$(".ui-datepicker-calendar tbody a:contains(12)", dp).simulate("click", {});
-	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 2 - 1, 12), "Mouse click inline - preset");
-	inl.datepicker("option", {showButtonPanel: true});
-	$(".ui-datepicker-current", dp).simulate("click", {});
-	$(".ui-datepicker-calendar tbody a:contains(14)", dp).simulate("click", {});
-	date.setDate(14);
-	testHelper.equalsDate(inl.datepicker("getDate"), date, "Mouse click inline - current");
-	inl.datepicker("setDate", new Date(2008, 2 - 1, 4));
-	$(".ui-datepicker-prev", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 1 - 1, 16),
-		"Mouse click inline - previous");
-	inl.datepicker("setDate", new Date(2008, 2 - 1, 4));
-	$(".ui-datepicker-next", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 3 - 1, 18),
-		"Mouse click inline - next");
-});
+	inl.datepicker( "setDate", date );
+	$( ".ui-datepicker-calendar tbody a:contains(10)", dp ).simulate( "click", {} );
+	date.setDate( 10 );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date, "Mouse click inline" );
+	inl.datepicker( "option", { showButtonPanel: true } ).datepicker( "setDate", new Date( 2008, 2 - 1, 4 ) );
+	$( ".ui-datepicker-calendar tbody a:contains(12)", dp ).simulate( "click", {} );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 2 - 1, 12 ), "Mouse click inline - preset" );
+	inl.datepicker( "option", { showButtonPanel: true } );
+	$( ".ui-datepicker-current", dp ).simulate( "click", {} );
+	$( ".ui-datepicker-calendar tbody a:contains(14)", dp ).simulate( "click", {} );
+	date.setDate( 14 );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date, "Mouse click inline - current" );
+	inl.datepicker( "setDate", new Date( 2008, 2 - 1, 4 ) );
+	$( ".ui-datepicker-prev", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 1 - 1, 16 ),
+		"Mouse click inline - previous" );
+	inl.datepicker( "setDate", new Date( 2008, 2 - 1, 4 ) );
+	$( ".ui-datepicker-next", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 3 - 1, 18 ),
+		"Mouse click inline - next" );
+} );
 
 } );
diff --git a/tests/unit/datepicker/helper.js b/tests/unit/datepicker/helper.js
index a9753a89a..4712a08da 100644
--- a/tests/unit/datepicker/helper.js
+++ b/tests/unit/datepicker/helper.js
@@ -5,21 +5,21 @@ define( [
 ], function( $, helper ) {
 
 return $.extend( helper, {
-	addMonths: function(date, offset) {
-		var maxDay = 32 - new Date(date.getFullYear(), date.getMonth() + offset, 32).getDate();
-		date.setDate(Math.min(date.getDate(), maxDay));
-		date.setMonth(date.getMonth() + offset);
+	addMonths: function( date, offset ) {
+		var maxDay = 32 - new Date( date.getFullYear(), date.getMonth() + offset, 32 ).getDate();
+		date.setDate( Math.min( date.getDate(), maxDay ) );
+		date.setMonth( date.getMonth() + offset );
 		return date;
 	},
 
-	equalsDate: function(d1, d2, message) {
-		if (!d1 || !d2) {
-			ok(false, message + " - missing date");
+	equalsDate: function( d1, d2, message ) {
+		if ( !d1 || !d2 ) {
+			ok( false, message + " - missing date" );
 			return;
 		}
-		d1 = new Date(d1.getFullYear(), d1.getMonth(), d1.getDate());
-		d2 = new Date(d2.getFullYear(), d2.getMonth(), d2.getDate());
-		equal(d1.toString(), d2.toString(), message);
+		d1 = new Date( d1.getFullYear(), d1.getMonth(), d1.getDate() );
+		d2 = new Date( d2.getFullYear(), d2.getMonth(), d2.getDate() );
+		equal( d1.toString(), d2.toString(), message );
 	},
 
 	init: function( id, options ) {
diff --git a/tests/unit/datepicker/methods.js b/tests/unit/datepicker/methods.js
index 571b4cb98..fcf8c2104 100644
--- a/tests/unit/datepicker/methods.js
+++ b/tests/unit/datepicker/methods.js
@@ -4,123 +4,130 @@ define( [
 	"ui/widgets/datepicker"
 ], function( $, testHelper ) {
 
-module("datepicker: methods");
+module( "datepicker: methods" );
 
-test("destroy", function() {
+test( "destroy", function() {
 	expect( 33 );
 	var inl,
-		inp = testHelper.init("#inp");
-	ok(inp.is(".hasDatepicker"), "Default - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Default - instance present");
-	ok(inp.next().is("#alt"), "Default - button absent");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Default - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Default - instance absent");
-	ok(inp.next().is("#alt"), "Default - button absent");
+		inp = testHelper.init( "#inp" );
+	ok( inp.is( ".hasDatepicker" ), "Default - marker class set" );
+	ok( $.data( inp[ 0 ], testHelper.PROP_NAME ), "Default - instance present" );
+	ok( inp.next().is( "#alt" ), "Default - button absent" );
+	inp.datepicker( "destroy" );
+	inp = $( "#inp" );
+	ok( !inp.is( ".hasDatepicker" ), "Default - marker class cleared" );
+	ok( !$.data( inp[ 0 ], testHelper.PROP_NAME ), "Default - instance absent" );
+	ok( inp.next().is( "#alt" ), "Default - button absent" );
+
 	// With button
-	inp= testHelper.init("#inp", {showOn: "both"});
-	ok(inp.is(".hasDatepicker"), "Button - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Button - instance present");
-	ok(inp.next().text() === "...", "Button - button added");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Button - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Button - instance absent");
-	ok(inp.next().is("#alt"), "Button - button removed");
+	inp = testHelper.init( "#inp", { showOn: "both" } );
+	ok( inp.is( ".hasDatepicker" ), "Button - marker class set" );
+	ok( $.data( inp[ 0 ], testHelper.PROP_NAME ), "Button - instance present" );
+	ok( inp.next().text() === "...", "Button - button added" );
+	inp.datepicker( "destroy" );
+	inp = $( "#inp" );
+	ok( !inp.is( ".hasDatepicker" ), "Button - marker class cleared" );
+	ok( !$.data( inp[ 0 ], testHelper.PROP_NAME ), "Button - instance absent" );
+	ok( inp.next().is( "#alt" ), "Button - button removed" );
+
 	// With append text
-	inp = testHelper.init("#inp", {appendText: "Testing"});
-	ok(inp.is(".hasDatepicker"), "Append - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Append - instance present");
-	ok(inp.next().text() === "Testing", "Append - append text added");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Append - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Append - instance absent");
-	ok(inp.next().is("#alt"), "Append - append text removed");
+	inp = testHelper.init( "#inp", { appendText: "Testing" } );
+	ok( inp.is( ".hasDatepicker" ), "Append - marker class set" );
+	ok( $.data( inp[ 0 ], testHelper.PROP_NAME ), "Append - instance present" );
+	ok( inp.next().text() === "Testing", "Append - append text added" );
+	inp.datepicker( "destroy" );
+	inp = $( "#inp" );
+	ok( !inp.is( ".hasDatepicker" ), "Append - marker class cleared" );
+	ok( !$.data( inp[ 0 ], testHelper.PROP_NAME ), "Append - instance absent" );
+	ok( inp.next().is( "#alt" ), "Append - append text removed" );
+
 	// With both
-	inp= testHelper.init("#inp", {showOn: "both", buttonImageOnly: true,
-		buttonImage: "images/calendar.gif", appendText: "Testing"});
-	ok(inp.is(".hasDatepicker"), "Both - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Both - instance present");
-	ok(inp.next()[0].nodeName.toLowerCase() === "img", "Both - button added");
-	ok(inp.next().next().text() === "Testing", "Both - append text added");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Both - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Both - instance absent");
-	ok(inp.next().is("#alt"), "Both - button and append text absent");
+	inp = testHelper.init( "#inp", { showOn: "both", buttonImageOnly: true,
+		buttonImage: "images/calendar.gif", appendText: "Testing" } );
+	ok( inp.is( ".hasDatepicker" ), "Both - marker class set" );
+	ok( $.data( inp[ 0 ], testHelper.PROP_NAME ), "Both - instance present" );
+	ok( inp.next()[ 0 ].nodeName.toLowerCase() === "img", "Both - button added" );
+	ok( inp.next().next().text() === "Testing", "Both - append text added" );
+	inp.datepicker( "destroy" );
+	inp = $( "#inp" );
+	ok( !inp.is( ".hasDatepicker" ), "Both - marker class cleared" );
+	ok( !$.data( inp[ 0 ], testHelper.PROP_NAME ), "Both - instance absent" );
+	ok( inp.next().is( "#alt" ), "Both - button and append text absent" );
+
 	// Inline
-	inl = testHelper.init("#inl");
-	ok(inl.is(".hasDatepicker"), "Inline - marker class set");
-	ok(inl.html() !== "", "Inline - datepicker present");
-	ok($.data(inl[0], testHelper.PROP_NAME), "Inline - instance present");
-	ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
-	inl.datepicker("destroy");
-	inl = $("#inl");
-	ok(!inl.is(".hasDatepicker"), "Inline - marker class cleared");
-	ok(inl.html() === "", "Inline - datepicker absent");
-	ok(!$.data(inl[0], testHelper.PROP_NAME), "Inline - instance absent");
-	ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
-});
+	inl = testHelper.init( "#inl" );
+	ok( inl.is( ".hasDatepicker" ), "Inline - marker class set" );
+	ok( inl.html() !== "", "Inline - datepicker present" );
+	ok( $.data( inl[ 0 ], testHelper.PROP_NAME ), "Inline - instance present" );
+	ok( inl.next().length === 0 || inl.next().is( "p" ), "Inline - button absent" );
+	inl.datepicker( "destroy" );
+	inl = $( "#inl" );
+	ok( !inl.is( ".hasDatepicker" ), "Inline - marker class cleared" );
+	ok( inl.html() === "", "Inline - datepicker absent" );
+	ok( !$.data( inl[ 0 ], testHelper.PROP_NAME ), "Inline - instance absent" );
+	ok( inl.next().length === 0 || inl.next().is( "p" ), "Inline - button absent" );
+} );
 
-test("enableDisable", function() {
+test( "enableDisable", function() {
 	expect( 33 );
 	var inl, dp,
-		inp = testHelper.init("#inp");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable - initially marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable - field initially enabled");
-	inp.datepicker("disable");
-	ok(inp.datepicker("isDisabled"), "Enable/disable - now marked as disabled");
-	ok(inp[0].disabled, "Enable/disable - field now disabled");
-	inp.datepicker("enable");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable - now marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable - field now enabled");
-	inp.datepicker("destroy");
+		inp = testHelper.init( "#inp" );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable - initially marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable - field initially enabled" );
+	inp.datepicker( "disable" );
+	ok( inp.datepicker( "isDisabled" ), "Enable/disable - now marked as disabled" );
+	ok( inp[ 0 ].disabled, "Enable/disable - field now disabled" );
+	inp.datepicker( "enable" );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable - now marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable - field now enabled" );
+	inp.datepicker( "destroy" );
+
 	// With a button
-	inp = testHelper.init("#inp", {showOn: "button"});
-	ok(!inp.datepicker("isDisabled"), "Enable/disable button - initially marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable button - field initially enabled");
-	ok(!inp.next("button")[0].disabled, "Enable/disable button - button initially enabled");
-	inp.datepicker("disable");
-	ok(inp.datepicker("isDisabled"), "Enable/disable button - now marked as disabled");
-	ok(inp[0].disabled, "Enable/disable button - field now disabled");
-	ok(inp.next("button")[0].disabled, "Enable/disable button - button now disabled");
-	inp.datepicker("enable");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable button - now marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable button - field now enabled");
-	ok(!inp.next("button")[0].disabled, "Enable/disable button - button now enabled");
-	inp.datepicker("destroy");
+	inp = testHelper.init( "#inp", { showOn: "button" } );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable button - initially marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable button - field initially enabled" );
+	ok( !inp.next( "button" )[ 0 ].disabled, "Enable/disable button - button initially enabled" );
+	inp.datepicker( "disable" );
+	ok( inp.datepicker( "isDisabled" ), "Enable/disable button - now marked as disabled" );
+	ok( inp[ 0 ].disabled, "Enable/disable button - field now disabled" );
+	ok( inp.next( "button" )[ 0 ].disabled, "Enable/disable button - button now disabled" );
+	inp.datepicker( "enable" );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable button - now marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable button - field now enabled" );
+	ok( !inp.next( "button" )[ 0 ].disabled, "Enable/disable button - button now enabled" );
+	inp.datepicker( "destroy" );
+
 	// With an image button
-	inp = testHelper.init("#inp", {showOn: "button", buttonImageOnly: true,
-		buttonImage: "images/calendar.gif"});
-	ok(!inp.datepicker("isDisabled"), "Enable/disable image - initially marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable image - field initially enabled");
-	ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image initially enabled");
-	inp.datepicker("disable");
-	ok(inp.datepicker("isDisabled"), "Enable/disable image - now marked as disabled");
-	ok(inp[0].disabled, "Enable/disable image - field now disabled");
-	ok(parseFloat(inp.next("img").css("opacity")) !== 1, "Enable/disable image - image now disabled");
-	inp.datepicker("enable");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable image - now marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable image - field now enabled");
-	ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image now enabled");
-	inp.datepicker("destroy");
+	inp = testHelper.init( "#inp", { showOn: "button", buttonImageOnly: true,
+		buttonImage: "images/calendar.gif" } );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable image - initially marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable image - field initially enabled" );
+	ok( parseFloat( inp.next( "img" ).css( "opacity" ) ) === 1, "Enable/disable image - image initially enabled" );
+	inp.datepicker( "disable" );
+	ok( inp.datepicker( "isDisabled" ), "Enable/disable image - now marked as disabled" );
+	ok( inp[ 0 ].disabled, "Enable/disable image - field now disabled" );
+	ok( parseFloat( inp.next( "img" ).css( "opacity" ) ) !== 1, "Enable/disable image - image now disabled" );
+	inp.datepicker( "enable" );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable image - now marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable image - field now enabled" );
+	ok( parseFloat( inp.next( "img" ).css( "opacity" ) ) === 1, "Enable/disable image - image now enabled" );
+	inp.datepicker( "destroy" );
+
 	// Inline
-	inl = testHelper.init("#inl", {changeYear: true});
-	dp = $(".ui-datepicker-inline", inl);
-	ok(!inl.datepicker("isDisabled"), "Enable/disable inline - initially marked as enabled");
-	ok(!dp.children().is(".ui-state-disabled"), "Enable/disable inline - not visually disabled initially");
-	ok(!dp.find("select").prop("disabled"), "Enable/disable inline - form element enabled initially");
-	inl.datepicker("disable");
-	ok(inl.datepicker("isDisabled"), "Enable/disable inline - now marked as disabled");
-	ok(dp.children().is(".ui-state-disabled"), "Enable/disable inline - visually disabled");
-	ok(dp.find("select").prop("disabled"), "Enable/disable inline - form element disabled");
-	inl.datepicker("enable");
-	ok(!inl.datepicker("isDisabled"), "Enable/disable inline - now marked as enabled");
-	ok(!dp.children().is(".ui-state-disabled"), "Enable/disable inline - not visiually disabled");
-	ok(!dp.find("select").prop("disabled"), "Enable/disable inline - form element enabled");
-	inl.datepicker("destroy");
-});
+	inl = testHelper.init( "#inl", { changeYear: true } );
+	dp = $( ".ui-datepicker-inline", inl );
+	ok( !inl.datepicker( "isDisabled" ), "Enable/disable inline - initially marked as enabled" );
+	ok( !dp.children().is( ".ui-state-disabled" ), "Enable/disable inline - not visually disabled initially" );
+	ok( !dp.find( "select" ).prop( "disabled" ), "Enable/disable inline - form element enabled initially" );
+	inl.datepicker( "disable" );
+	ok( inl.datepicker( "isDisabled" ), "Enable/disable inline - now marked as disabled" );
+	ok( dp.children().is( ".ui-state-disabled" ), "Enable/disable inline - visually disabled" );
+	ok( dp.find( "select" ).prop( "disabled" ), "Enable/disable inline - form element disabled" );
+	inl.datepicker( "enable" );
+	ok( !inl.datepicker( "isDisabled" ), "Enable/disable inline - now marked as enabled" );
+	ok( !dp.children().is( ".ui-state-disabled" ), "Enable/disable inline - not visiually disabled" );
+	ok( !dp.find( "select" ).prop( "disabled" ), "Enable/disable inline - form element enabled" );
+	inl.datepicker( "destroy" );
+} );
 
 } );
diff --git a/tests/unit/datepicker/options.js b/tests/unit/datepicker/options.js
index 3a6c15c6d..eebb85889 100644
--- a/tests/unit/datepicker/options.js
+++ b/tests/unit/datepicker/options.js
@@ -7,90 +7,92 @@ define( [
 	"ui/i18n/datepicker-zh-CN"
 ], function( $, testHelper ) {
 
-module("datepicker: options");
+module( "datepicker: options" );
 
-test("setDefaults", function() {
+test( "setDefaults", function() {
 	expect( 3 );
-	testHelper.init("#inp");
-	equal($.datepicker._defaults.showOn, "focus", "Initial showOn");
-	$.datepicker.setDefaults({showOn: "button"});
-	equal($.datepicker._defaults.showOn, "button", "Change default showOn");
-	$.datepicker.setDefaults({showOn: "focus"});
-	equal($.datepicker._defaults.showOn, "focus", "Restore showOn");
-});
-
-test("option", function() {
+	testHelper.init( "#inp" );
+	equal( $.datepicker._defaults.showOn, "focus", "Initial showOn" );
+	$.datepicker.setDefaults( { showOn: "button" } );
+	equal( $.datepicker._defaults.showOn, "button", "Change default showOn" );
+	$.datepicker.setDefaults( { showOn: "focus" } );
+	equal( $.datepicker._defaults.showOn, "focus", "Restore showOn" );
+} );
+
+test( "option", function() {
 	expect( 17 );
-	var inp = testHelper.init("#inp"),
-	inst = $.data(inp[0], testHelper.PROP_NAME);
+	var inp = testHelper.init( "#inp" ),
+	inst = $.data( inp[ 0 ], testHelper.PROP_NAME );
+
 	// Set option
-	equal(inst.settings.showOn, null, "Initial setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Initial instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Initial default showOn");
-	inp.datepicker("option", "showOn", "button");
-	equal(inst.settings.showOn, "button", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "button", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("option", {showOn: "both"});
-	equal(inst.settings.showOn, "both", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "both", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("option", "showOn", undefined);
-	equal(inst.settings.showOn, null, "Clear setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Restore instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
+	equal( inst.settings.showOn, null, "Initial setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "focus", "Initial instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Initial default showOn" );
+	inp.datepicker( "option", "showOn", "button" );
+	equal( inst.settings.showOn, "button", "Change setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "button", "Change instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+	inp.datepicker( "option", { showOn: "both" } );
+	equal( inst.settings.showOn, "both", "Change setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "both", "Change instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+	inp.datepicker( "option", "showOn", undefined );
+	equal( inst.settings.showOn, null, "Clear setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "focus", "Restore instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+
 	// Get option
-	inp = testHelper.init("#inp");
-	equal(inp.datepicker("option", "showOn"), "focus", "Initial setting showOn");
-	inp.datepicker("option", "showOn", "button");
-	equal(inp.datepicker("option", "showOn"), "button", "Change instance showOn");
-	inp.datepicker("option", "showOn", undefined);
-	equal(inp.datepicker("option", "showOn"), "focus", "Reset instance showOn");
-	deepEqual(inp.datepicker("option", "all"), {showAnim: ""}, "Get instance settings");
-	deepEqual(inp.datepicker("option", "defaults"), $.datepicker._defaults,
-		"Get default settings");
-});
+	inp = testHelper.init( "#inp" );
+	equal( inp.datepicker( "option", "showOn" ), "focus", "Initial setting showOn" );
+	inp.datepicker( "option", "showOn", "button" );
+	equal( inp.datepicker( "option", "showOn" ), "button", "Change instance showOn" );
+	inp.datepicker( "option", "showOn", undefined );
+	equal( inp.datepicker( "option", "showOn" ), "focus", "Reset instance showOn" );
+	deepEqual( inp.datepicker( "option", "all" ), { showAnim: "" }, "Get instance settings" );
+	deepEqual( inp.datepicker( "option", "defaults" ), $.datepicker._defaults,
+		"Get default settings" );
+} );
 
 test( "disabled", function() {
-	expect(8);
-	var inp = testHelper.init("#inp");
-	ok(!inp.datepicker("isDisabled"), "Initially marked as enabled");
-	ok(!inp[0].disabled, "Field initially enabled");
-	inp.datepicker("option", "disabled", true);
-	ok(inp.datepicker("isDisabled"), "Marked as disabled");
-	ok(inp[0].disabled, "Field now disabled");
-	inp.datepicker("option", "disabled", false);
-	ok(!inp.datepicker("isDisabled"), "Marked as enabled");
-	ok(!inp[0].disabled, "Field now enabled");
-	inp.datepicker("destroy");
-
-	inp = testHelper.init("#inp", { disabled: true });
-	ok(inp.datepicker("isDisabled"), "Initially marked as disabled");
-	ok(inp[0].disabled, "Field initially disabled");
-});
-
-test("change", function() {
+	expect( 8 );
+	var inp = testHelper.init( "#inp" );
+	ok( !inp.datepicker( "isDisabled" ), "Initially marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Field initially enabled" );
+	inp.datepicker( "option", "disabled", true );
+	ok( inp.datepicker( "isDisabled" ), "Marked as disabled" );
+	ok( inp[ 0 ].disabled, "Field now disabled" );
+	inp.datepicker( "option", "disabled", false );
+	ok( !inp.datepicker( "isDisabled" ), "Marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Field now enabled" );
+	inp.datepicker( "destroy" );
+
+	inp = testHelper.init( "#inp", { disabled: true } );
+	ok( inp.datepicker( "isDisabled" ), "Initially marked as disabled" );
+	ok( inp[ 0 ].disabled, "Field initially disabled" );
+} );
+
+test( "change", function() {
 	expect( 12 );
-	var inp = testHelper.init("#inp"),
-	inst = $.data(inp[0], testHelper.PROP_NAME);
-	equal(inst.settings.showOn, null, "Initial setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Initial instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Initial default showOn");
-	inp.datepicker("change", "showOn", "button");
-	equal(inst.settings.showOn, "button", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "button", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("change", {showOn: "both"});
-	equal(inst.settings.showOn, "both", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "both", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("change", "showOn", undefined);
-	equal(inst.settings.showOn, null, "Clear setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Restore instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-});
-
-(function() {
+	var inp = testHelper.init( "#inp" ),
+	inst = $.data( inp[ 0 ], testHelper.PROP_NAME );
+	equal( inst.settings.showOn, null, "Initial setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "focus", "Initial instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Initial default showOn" );
+	inp.datepicker( "change", "showOn", "button" );
+	equal( inst.settings.showOn, "button", "Change setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "button", "Change instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+	inp.datepicker( "change", { showOn: "both" } );
+	equal( inst.settings.showOn, "both", "Change setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "both", "Change instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+	inp.datepicker( "change", "showOn", undefined );
+	equal( inst.settings.showOn, null, "Clear setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "focus", "Restore instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+} );
+
+( function() {
 	var url = window.location.search;
 	url = decodeURIComponent( url.slice( url.indexOf( "swarmURL=" ) + 9 ) );
 
@@ -120,7 +122,7 @@ test("change", function() {
 				inp.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
 				ok( !dp.is( ":visible" ), "Focus - hidden on exit" );
 				step1();
-			});
+			} );
 		}
 
 		function step1() {
@@ -135,14 +137,14 @@ test("change", function() {
 				inp.datepicker( "hide" ).datepicker( "destroy" );
 
 				step2();
-			});
+			} );
 		}
 
 		function step2() {
-			var inp = testHelper.initNewInput({
+			var inp = testHelper.initNewInput( {
 					showOn: "button",
 					buttonText: "Popup"
-				}),
+				} ),
 				dp = $( "#ui-datepicker-div" );
 
 			ok( !dp.is( ":visible" ), "Button - initially hidden" );
@@ -161,16 +163,16 @@ test("change", function() {
 				inp.datepicker( "hide" ).datepicker( "destroy" );
 
 				step3();
-			});
+			} );
 		}
 
 		function step3() {
-			var inp = testHelper.initNewInput({
+			var inp = testHelper.initNewInput( {
 					showOn: "button",
 					buttonImageOnly: true,
 					buttonImage: "images/calendar.gif",
 					buttonText: "Cal"
-				}),
+				} ),
 				dp = $( "#ui-datepicker-div" );
 
 			ok( !dp.is( ":visible" ), "Image button - initially hidden" );
@@ -190,14 +192,14 @@ test("change", function() {
 				inp.datepicker( "hide" ).datepicker( "destroy" );
 
 				step4();
-			});
+			} );
 		}
 
 		function step4() {
-			var inp = testHelper.initNewInput({
+			var inp = testHelper.initNewInput( {
 					showOn: "both",
 					buttonImage: "images/calendar.gif"
-				}),
+				} ),
 				dp = $( "#ui-datepicker-div" );
 
 			ok( !dp.is( ":visible" ), "Both - initially hidden" );
@@ -221,548 +223,568 @@ test("change", function() {
 					inp.datepicker( "hide" ).datepicker( "destroy" );
 
 					start();
-				});
+				} );
 			} else {
 				start();
 			}
 		}
 
 		step0();
-	});
-})();
+	} );
+} )();
 
-test("otherMonths", function() {
+test( "otherMonths", function() {
 	expect( 8 );
-	var inp = testHelper.init("#inp"),
-		pop = $("#ui-datepicker-div");
-	inp.val("06/01/2009").datepicker("show");
-	equal(pop.find("tbody").text(),
+	var inp = testHelper.init( "#inp" ),
+		pop = $( "#ui-datepicker-div" );
+	inp.val( "06/01/2009" ).datepicker( "show" );
+	equal( pop.find( "tbody" ).text(),
+
 		// support: IE <9, jQuery <1.8
 		// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
 		$( "<span>\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0</span>" ).text(),
-		"Other months - none");
-	ok(pop.find("td:last *").length === 0, "Other months - no content");
-	inp.datepicker("hide").datepicker("option", "showOtherMonths", true).datepicker("show");
-	equal(pop.find("tbody").text(), "311234567891011121314151617181920212223242526272829301234",
-		"Other months - show");
-	ok(pop.find("td:last span").length === 1, "Other months - span content");
-	inp.datepicker("hide").datepicker("option", "selectOtherMonths", true).datepicker("show");
-	equal(pop.find("tbody").text(), "311234567891011121314151617181920212223242526272829301234",
-		"Other months - select");
-	ok(pop.find("td:last a").length === 1, "Other months - link content");
-	inp.datepicker("hide").datepicker("option", "showOtherMonths", false).datepicker("show");
-	equal(pop.find("tbody").text(),
+		"Other months - none" );
+	ok( pop.find( "td:last *" ).length === 0, "Other months - no content" );
+	inp.datepicker( "hide" ).datepicker( "option", "showOtherMonths", true ).datepicker( "show" );
+	equal( pop.find( "tbody" ).text(), "311234567891011121314151617181920212223242526272829301234",
+		"Other months - show" );
+	ok( pop.find( "td:last span" ).length === 1, "Other months - span content" );
+	inp.datepicker( "hide" ).datepicker( "option", "selectOtherMonths", true ).datepicker( "show" );
+	equal( pop.find( "tbody" ).text(), "311234567891011121314151617181920212223242526272829301234",
+		"Other months - select" );
+	ok( pop.find( "td:last a" ).length === 1, "Other months - link content" );
+	inp.datepicker( "hide" ).datepicker( "option", "showOtherMonths", false ).datepicker( "show" );
+	equal( pop.find( "tbody" ).text(),
+
 		// support: IE <9, jQuery <1.8
 		// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
 		$( "<span>\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0</span>" ).text(),
-		"Other months - none");
-	ok(pop.find("td:last *").length === 0, "Other months - no content");
-});
+		"Other months - none" );
+	ok( pop.find( "td:last *" ).length === 0, "Other months - no content" );
+} );
 
-test("defaultDate", function() {
+test( "defaultDate", function() {
 	expect( 16 );
-	var inp = testHelper.init("#inp"),
+	var inp = testHelper.init( "#inp" ),
 		date = new Date();
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date null");
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date null" );
 
 	// Numeric values
-	inp.datepicker("option", {defaultDate: -2}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2");
+	inp.datepicker( "option", { defaultDate: -2 } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date -2" );
 
 	date = new Date();
-	inp.datepicker("option", {defaultDate: 3}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 3);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 3");
+	inp.datepicker( "option", { defaultDate: 3 } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 3 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date 3" );
 
 	date = new Date();
-	inp.datepicker("option", {defaultDate: 1 / "a"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date NaN");
+	inp.datepicker( "option", { defaultDate: 1 / "a" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date NaN" );
 
 	// String offset values
-	inp.datepicker("option", {defaultDate: "-1d"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -1d");
-	inp.datepicker("option", {defaultDate: "+3D"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 4);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +3D");
-	inp.datepicker("option", {defaultDate: " -2 w "}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	inp.datepicker( "option", { defaultDate: "-1d" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date -1d" );
+	inp.datepicker( "option", { defaultDate: "+3D" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 4 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date +3D" );
+	inp.datepicker( "option", { defaultDate: " -2 w " } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 	date = new Date();
-	date.setDate(date.getDate() - 14);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2 w");
-	inp.datepicker("option", {defaultDate: "+1 W"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 21);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1 W");
-	inp.datepicker("option", {defaultDate: " -1 m "}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = testHelper.addMonths(new Date(), -1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -1 m");
-	inp.datepicker("option", {defaultDate: "+2M"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = testHelper.addMonths(new Date(), 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +2M");
-	inp.datepicker("option", {defaultDate: "-2y"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate( date.getDate() - 14 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date -2 w" );
+	inp.datepicker( "option", { defaultDate: "+1 W" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 21 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date +1 W" );
+	inp.datepicker( "option", { defaultDate: " -1 m " } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date = testHelper.addMonths( new Date(), -1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date -1 m" );
+	inp.datepicker( "option", { defaultDate: "+2M" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date = testHelper.addMonths( new Date(), 2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date +2M" );
+	inp.datepicker( "option", { defaultDate: "-2y" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 	date = new Date();
-	date.setFullYear(date.getFullYear() - 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2y");
-	inp.datepicker("option", {defaultDate: "+1 Y "}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setFullYear(date.getFullYear() + 3);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1 Y");
-	inp.datepicker("option", {defaultDate: "+1M +10d"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = testHelper.addMonths(new Date(), 1);
-	date.setDate(date.getDate() + 10);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1M +10d");
+	date.setFullYear( date.getFullYear() - 2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date -2y" );
+	inp.datepicker( "option", { defaultDate: "+1 Y " } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setFullYear( date.getFullYear() + 3 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date +1 Y" );
+	inp.datepicker( "option", { defaultDate: "+1M +10d" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date = testHelper.addMonths( new Date(), 1 );
+	date.setDate( date.getDate() + 10 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date +1M +10d" );
+
 	// String date values
-	inp.datepicker("option", {defaultDate: "07/04/2007"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = new Date(2007, 7 - 1, 4);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 07/04/2007");
-	inp.datepicker("option", {dateFormat: "yy-mm-dd", defaultDate: "2007-04-02"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = new Date(2007, 4 - 1, 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 2007-04-02");
+	inp.datepicker( "option", { defaultDate: "07/04/2007" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date = new Date( 2007, 7 - 1, 4 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date 07/04/2007" );
+	inp.datepicker( "option", { dateFormat: "yy-mm-dd", defaultDate: "2007-04-02" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date = new Date( 2007, 4 - 1, 2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date 2007-04-02" );
+
 	// Date value
-	date = new Date(2007, 1 - 1, 26);
-	inp.datepicker("option", {dateFormat: "mm/dd/yy", defaultDate: date}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 01/26/2007");
-});
-
-test("miscellaneous", function() {
+	date = new Date( 2007, 1 - 1, 26 );
+	inp.datepicker( "option", { dateFormat: "mm/dd/yy", defaultDate: date } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date 01/26/2007" );
+} );
+
+test( "miscellaneous", function() {
 	expect( 19 );
 	var curYear, longNames, shortNames, date,
-		dp = $("#ui-datepicker-div"),
-		inp = testHelper.init("#inp");
+		dp = $( "#ui-datepicker-div" ),
+		inp = testHelper.init( "#inp" );
+
 	// Year range
-	function genRange(start, offset) {
+	function genRange( start, offset ) {
 		var i = start,
 			range = "";
-		for (; i < start + offset; i++) {
+		for ( ; i < start + offset; i++ ) {
 			range += i;
 		}
 		return range;
 	}
 	curYear = new Date().getFullYear();
-	inp.val("02/04/2008").datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), "2008", "Year range - read-only default");
-	inp.datepicker("hide").datepicker("option", {changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2008 - 10, 21), "Year range - changeable default");
-	inp.datepicker("hide").datepicker("option", {yearRange: "c-6:c+2", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2008 - 6, 9), "Year range - c-6:c+2");
-	inp.datepicker("hide").datepicker("option", {yearRange: "2000:2010", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2000, 11), "Year range - 2000:2010");
-	inp.datepicker("hide").datepicker("option", {yearRange: "-5:+3", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(curYear - 5, 9), "Year range - -5:+3");
-	inp.datepicker("hide").datepicker("option", {yearRange: "2000:-5", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2000, curYear - 2004), "Year range - 2000:-5");
-	inp.datepicker("hide").datepicker("option", {yearRange: "", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(curYear, 1), "Year range - -6:+2");
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), "2008", "Year range - read-only default" );
+	inp.datepicker( "hide" ).datepicker( "option", { changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( 2008 - 10, 21 ), "Year range - changeable default" );
+	inp.datepicker( "hide" ).datepicker( "option", { yearRange: "c-6:c+2", changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( 2008 - 6, 9 ), "Year range - c-6:c+2" );
+	inp.datepicker( "hide" ).datepicker( "option", { yearRange: "2000:2010", changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( 2000, 11 ), "Year range - 2000:2010" );
+	inp.datepicker( "hide" ).datepicker( "option", { yearRange: "-5:+3", changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( curYear - 5, 9 ), "Year range - -5:+3" );
+	inp.datepicker( "hide" ).datepicker( "option", { yearRange: "2000:-5", changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( 2000, curYear - 2004 ), "Year range - 2000:-5" );
+	inp.datepicker( "hide" ).datepicker( "option", { yearRange: "", changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( curYear, 1 ), "Year range - -6:+2" );
 
 	// Navigation as date format
-	inp.datepicker("option", {showButtonPanel: true});
-	equal(dp.find(".ui-datepicker-prev").text(), "Prev", "Navigation prev - default");
-	equal(dp.find(".ui-datepicker-current").text(), "Today", "Navigation current - default");
-	equal(dp.find(".ui-datepicker-next").text(), "Next", "Navigation next - default");
-	inp.datepicker("hide").datepicker("option", {navigationAsDateFormat: true, prevText: "< M", currentText: "MM", nextText: "M >"}).
-		val("02/04/2008").datepicker("show");
-	longNames = $.datepicker.regional[""].monthNames;
-	shortNames = $.datepicker.regional[""].monthNamesShort;
+	inp.datepicker( "option", { showButtonPanel: true } );
+	equal( dp.find( ".ui-datepicker-prev" ).text(), "Prev", "Navigation prev - default" );
+	equal( dp.find( ".ui-datepicker-current" ).text(), "Today", "Navigation current - default" );
+	equal( dp.find( ".ui-datepicker-next" ).text(), "Next", "Navigation next - default" );
+	inp.datepicker( "hide" ).datepicker( "option", { navigationAsDateFormat: true, prevText: "< M", currentText: "MM", nextText: "M >" } ).
+		val( "02/04/2008" ).datepicker( "show" );
+	longNames = $.datepicker.regional[ "" ].monthNames;
+	shortNames = $.datepicker.regional[ "" ].monthNamesShort;
 	date = new Date();
-	equal(dp.find(".ui-datepicker-prev").text(), "< " + shortNames[0], "Navigation prev - as date format");
-	equal(dp.find(".ui-datepicker-current").text(),
-		longNames[date.getMonth()], "Navigation current - as date format");
-	equal(dp.find(".ui-datepicker-next").text(),
-		shortNames[2] + " >", "Navigation next - as date format");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN});
-	equal(dp.find(".ui-datepicker-prev").text(),
-		"< " + shortNames[1], "Navigation prev - as date format + pgdn");
-	equal(dp.find(".ui-datepicker-current").text(),
-		longNames[date.getMonth()], "Navigation current - as date format + pgdn");
-	equal(dp.find(".ui-datepicker-next").text(),
-		shortNames[3] + " >", "Navigation next - as date format + pgdn");
-	inp.datepicker("hide").datepicker("option", {gotoCurrent: true}).
-		val("02/04/2008").datepicker("show");
-	equal(dp.find(".ui-datepicker-prev").text(),
-		"< " + shortNames[0], "Navigation prev - as date format + goto current");
-	equal(dp.find(".ui-datepicker-current").text(),
-		longNames[1], "Navigation current - as date format + goto current");
-	equal(dp.find(".ui-datepicker-next").text(),
-		shortNames[2] + " >", "Navigation next - as date format + goto current");
-});
-
-test("minMax", function() {
+	equal( dp.find( ".ui-datepicker-prev" ).text(), "< " + shortNames[ 0 ], "Navigation prev - as date format" );
+	equal( dp.find( ".ui-datepicker-current" ).text(),
+		longNames[ date.getMonth() ], "Navigation current - as date format" );
+	equal( dp.find( ".ui-datepicker-next" ).text(),
+		shortNames[ 2 ] + " >", "Navigation next - as date format" );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+	equal( dp.find( ".ui-datepicker-prev" ).text(),
+		"< " + shortNames[ 1 ], "Navigation prev - as date format + pgdn" );
+	equal( dp.find( ".ui-datepicker-current" ).text(),
+		longNames[ date.getMonth() ], "Navigation current - as date format + pgdn" );
+	equal( dp.find( ".ui-datepicker-next" ).text(),
+		shortNames[ 3 ] + " >", "Navigation next - as date format + pgdn" );
+	inp.datepicker( "hide" ).datepicker( "option", { gotoCurrent: true } ).
+		val( "02/04/2008" ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-prev" ).text(),
+		"< " + shortNames[ 0 ], "Navigation prev - as date format + goto current" );
+	equal( dp.find( ".ui-datepicker-current" ).text(),
+		longNames[ 1 ], "Navigation current - as date format + goto current" );
+	equal( dp.find( ".ui-datepicker-next" ).text(),
+		shortNames[ 2 ] + " >", "Navigation next - as date format + goto current" );
+} );
+
+test( "minMax", function() {
 	expect( 23 );
 	var date,
-		inp = testHelper.init("#inp"),
-		dp = $("#ui-datepicker-div"),
-		lastYear = new Date(2007, 6 - 1, 4),
-		nextYear = new Date(2009, 6 - 1, 4),
-		minDate = new Date(2008, 2 - 1, 29),
-		maxDate = new Date(2008, 12 - 1, 7);
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), lastYear,
-		"Min/max - null, null - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), nextYear,
-		"Min/max - null, null - ctrl+pgdn");
-	inp.datepicker("option", {minDate: minDate}).
-		datepicker("hide").val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate,
-		"Min/max - 02/29/2008, null - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), nextYear,
-		"Min/max - 02/29/2008, null - ctrl+pgdn");
-	inp.datepicker("option", {maxDate: maxDate}).
-		datepicker("hide").val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate,
-		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate,
-		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgdn");
-	inp.datepicker("option", {minDate: null}).
-		datepicker("hide").val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), lastYear,
-		"Min/max - null, 12/07/2008 - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate,
-		"Min/max - null, 12/07/2008 - ctrl+pgdn");
+		inp = testHelper.init( "#inp" ),
+		dp = $( "#ui-datepicker-div" ),
+		lastYear = new Date( 2007, 6 - 1, 4 ),
+		nextYear = new Date( 2009, 6 - 1, 4 ),
+		minDate = new Date( 2008, 2 - 1, 29 ),
+		maxDate = new Date( 2008, 12 - 1, 7 );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), lastYear,
+		"Min/max - null, null - ctrl+pgup" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), nextYear,
+		"Min/max - null, null - ctrl+pgdn" );
+	inp.datepicker( "option", { minDate: minDate } ).
+		datepicker( "hide" ).val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate,
+		"Min/max - 02/29/2008, null - ctrl+pgup" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), nextYear,
+		"Min/max - 02/29/2008, null - ctrl+pgdn" );
+	inp.datepicker( "option", { maxDate: maxDate } ).
+		datepicker( "hide" ).val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate,
+		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgup" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate,
+		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgdn" );
+	inp.datepicker( "option", { minDate: null } ).
+		datepicker( "hide" ).val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), lastYear,
+		"Min/max - null, 12/07/2008 - ctrl+pgup" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate,
+		"Min/max - null, 12/07/2008 - ctrl+pgdn" );
+
 	// Relative dates
 	date = new Date();
-	date.setDate(date.getDate() - 7);
-	inp.datepicker("option", {minDate: "-1w", maxDate: "+1 M +10 D "}).
-		datepicker("hide").val("").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date,
-		"Min/max - -1w, +1 M +10 D - ctrl+pgup");
-	date = testHelper.addMonths(new Date(), 1);
-	date.setDate(date.getDate() + 10);
-	inp.val("").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date,
-		"Min/max - -1w, +1 M +10 D - ctrl+pgdn");
+	date.setDate( date.getDate() - 7 );
+	inp.datepicker( "option", { minDate: "-1w", maxDate: "+1 M +10 D " } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date,
+		"Min/max - -1w, +1 M +10 D - ctrl+pgup" );
+	date = testHelper.addMonths( new Date(), 1 );
+	date.setDate( date.getDate() + 10 );
+	inp.val( "" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date,
+		"Min/max - -1w, +1 M +10 D - ctrl+pgdn" );
+
 	// With existing date
-	inp = testHelper.init("#inp");
-	inp.val("06/04/2008").datepicker("option", {minDate: minDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate > min");
-	inp.datepicker("option", {minDate: null}).val("01/04/2008").datepicker("option", {minDate: minDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Min/max - setDate < min");
-	inp.datepicker("option", {minDate: null}).val("06/04/2008").datepicker("option", {maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate < max");
-	inp.datepicker("option", {maxDate: null}).val("01/04/2009").datepicker("option", {maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Min/max - setDate > max");
-	inp.datepicker("option", {maxDate: null}).val("01/04/2008").datepicker("option", {minDate: minDate, maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Min/max - setDate < min");
-	inp.datepicker("option", {maxDate: null}).val("06/04/2008").datepicker("option", {minDate: minDate, maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate > min, < max");
-	inp.datepicker("option", {maxDate: null}).val("01/04/2009").datepicker("option", {minDate: minDate, maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Min/max - setDate > max");
-
-	inp.datepicker("option", {yearRange: "-0:+1"}).val("01/01/" + new Date().getFullYear());
-	ok(dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - previous button disabled at 1/1/minYear");
-	inp.datepicker("setDate", "12/30/" + new Date().getFullYear());
-	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - next button disabled at 12/30/maxYear");
-
-	inp.datepicker("option", {
-		minDate: new Date(1900, 0, 1),
+	inp = testHelper.init( "#inp" );
+	inp.val( "06/04/2008" ).datepicker( "option", { minDate: minDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 6 - 1, 4 ), "Min/max - setDate > min" );
+	inp.datepicker( "option", { minDate: null } ).val( "01/04/2008" ).datepicker( "option", { minDate: minDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate, "Min/max - setDate < min" );
+	inp.datepicker( "option", { minDate: null } ).val( "06/04/2008" ).datepicker( "option", { maxDate: maxDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 6 - 1, 4 ), "Min/max - setDate < max" );
+	inp.datepicker( "option", { maxDate: null } ).val( "01/04/2009" ).datepicker( "option", { maxDate: maxDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate, "Min/max - setDate > max" );
+	inp.datepicker( "option", { maxDate: null } ).val( "01/04/2008" ).datepicker( "option", { minDate: minDate, maxDate: maxDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate, "Min/max - setDate < min" );
+	inp.datepicker( "option", { maxDate: null } ).val( "06/04/2008" ).datepicker( "option", { minDate: minDate, maxDate: maxDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 6 - 1, 4 ), "Min/max - setDate > min, < max" );
+	inp.datepicker( "option", { maxDate: null } ).val( "01/04/2009" ).datepicker( "option", { minDate: minDate, maxDate: maxDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate, "Min/max - setDate > max" );
+
+	inp.datepicker( "option", { yearRange: "-0:+1" } ).val( "01/01/" + new Date().getFullYear() );
+	ok( dp.find( ".ui-datepicker-prev" ).hasClass( "ui-state-disabled" ), "Year Range Test - previous button disabled at 1/1/minYear" );
+	inp.datepicker( "setDate", "12/30/" + new Date().getFullYear() );
+	ok( dp.find( ".ui-datepicker-next" ).hasClass( "ui-state-disabled" ), "Year Range Test - next button disabled at 12/30/maxYear" );
+
+	inp.datepicker( "option", {
+		minDate: new Date( 1900, 0, 1 ),
 		maxDate: "-7Y",
 		yearRange: "1900:-7"
-	}).val( "" );
-	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - relative - next button disabled");
-	ok(!dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - relative - prev button enabled");
+	} ).val( "" );
+	ok( dp.find( ".ui-datepicker-next" ).hasClass( "ui-state-disabled" ), "Year Range Test - relative - next button disabled" );
+	ok( !dp.find( ".ui-datepicker-prev" ).hasClass( "ui-state-disabled" ), "Year Range Test - relative - prev button enabled" );
 
-	inp.datepicker("option", {
-		minDate: new Date(1900, 0, 1),
+	inp.datepicker( "option", {
+		minDate: new Date( 1900, 0, 1 ),
 		maxDate: "1/25/2007",
 		yearRange: "1900:2007"
-	}).val( "" );
-	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - absolute - next button disabled");
-	ok(!dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - absolute - prev button enabled");
-});
+	} ).val( "" );
+	ok( dp.find( ".ui-datepicker-next" ).hasClass( "ui-state-disabled" ), "Year Range Test - absolute - next button disabled" );
+	ok( !dp.find( ".ui-datepicker-prev" ).hasClass( "ui-state-disabled" ), "Year Range Test - absolute - prev button enabled" );
+} );
 
-test("setDate", function() {
+test( "setDate", function() {
 	expect( 24 );
 	var inl, alt, minDate, maxDate, dateAndTimeToSet, dateAndTimeClone,
-		inp = testHelper.init("#inp"),
-		date1 = new Date(2008, 6 - 1, 4),
+		inp = testHelper.init( "#inp" ),
+		date1 = new Date( 2008, 6 - 1, 4 ),
 		date2 = new Date();
-	ok(inp.datepicker("getDate") == null, "Set date - default");
-	inp.datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - 2008-06-04");
+	ok( inp.datepicker( "getDate" ) == null, "Set date - default" );
+	inp.datepicker( "setDate", date1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - 2008-06-04" );
 	date1 = new Date();
-	date1.setDate(date1.getDate() + 7);
-	inp.datepicker("setDate", +7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - +7");
-	date2.setFullYear(date2.getFullYear() + 2);
-	inp.datepicker("setDate", "+2y");
-	testHelper.equalsDate(inp.datepicker("getDate"), date2, "Set date - +2y");
-	inp.datepicker("setDate", date1, date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - two dates");
-	inp.datepicker("setDate");
-	ok(inp.datepicker("getDate") == null, "Set date - null");
+	date1.setDate( date1.getDate() + 7 );
+	inp.datepicker( "setDate", +7 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - +7" );
+	date2.setFullYear( date2.getFullYear() + 2 );
+	inp.datepicker( "setDate", "+2y" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date2, "Set date - +2y" );
+	inp.datepicker( "setDate", date1, date2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - two dates" );
+	inp.datepicker( "setDate" );
+	ok( inp.datepicker( "getDate" ) == null, "Set date - null" );
+
 	// Relative to current date
 	date1 = new Date();
-	date1.setDate(date1.getDate() + 7);
-	inp.datepicker("setDate", "c +7");
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c +7");
-	date1.setDate(date1.getDate() + 7);
-	inp.datepicker("setDate", "c+7");
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c+7");
-	date1.setDate(date1.getDate() - 21);
-	inp.datepicker("setDate", "c -3 w");
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c -3 w");
+	date1.setDate( date1.getDate() + 7 );
+	inp.datepicker( "setDate", "c +7" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - c +7" );
+	date1.setDate( date1.getDate() + 7 );
+	inp.datepicker( "setDate", "c+7" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - c+7" );
+	date1.setDate( date1.getDate() - 21 );
+	inp.datepicker( "setDate", "c -3 w" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - c -3 w" );
+
 	// Inline
-	inl = testHelper.init("#inl");
-	date1 = new Date(2008, 6 - 1, 4);
+	inl = testHelper.init( "#inl" );
+	date1 = new Date( 2008, 6 - 1, 4 );
 	date2 = new Date();
-	testHelper.equalsDate(inl.datepicker("getDate"), date2, "Set date inline - default");
-	inl.datepicker("setDate", date1);
-	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - 2008-06-04");
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date2, "Set date inline - default" );
+	inl.datepicker( "setDate", date1 );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date1, "Set date inline - 2008-06-04" );
 	date1 = new Date();
-	date1.setDate(date1.getDate() + 7);
-	inl.datepicker("setDate", +7);
-	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - +7");
-	date2.setFullYear(date2.getFullYear() + 2);
-	inl.datepicker("setDate", "+2y");
-	testHelper.equalsDate(inl.datepicker("getDate"), date2, "Set date inline - +2y");
-	inl.datepicker("setDate", date1, date2);
-	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - two dates");
-	inl.datepicker("setDate");
-	ok(inl.datepicker("getDate") == null, "Set date inline - null");
+	date1.setDate( date1.getDate() + 7 );
+	inl.datepicker( "setDate", +7 );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date1, "Set date inline - +7" );
+	date2.setFullYear( date2.getFullYear() + 2 );
+	inl.datepicker( "setDate", "+2y" );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date2, "Set date inline - +2y" );
+	inl.datepicker( "setDate", date1, date2 );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date1, "Set date inline - two dates" );
+	inl.datepicker( "setDate" );
+	ok( inl.datepicker( "getDate" ) == null, "Set date inline - null" );
+
 	// Alternate field
-	alt = $("#alt");
-	inp.datepicker("option", {altField: "#alt", altFormat: "yy-mm-dd"});
-	date1 = new Date(2008, 6 - 1, 4);
-	inp.datepicker("setDate", date1);
-	equal(inp.val(), "06/04/2008", "Set date alternate - 06/04/2008");
-	equal(alt.val(), "2008-06-04", "Set date alternate - 2008-06-04");
+	alt = $( "#alt" );
+	inp.datepicker( "option", { altField: "#alt", altFormat: "yy-mm-dd" } );
+	date1 = new Date( 2008, 6 - 1, 4 );
+	inp.datepicker( "setDate", date1 );
+	equal( inp.val(), "06/04/2008", "Set date alternate - 06/04/2008" );
+	equal( alt.val(), "2008-06-04", "Set date alternate - 2008-06-04" );
+
 	// With minimum/maximum
-	inp = testHelper.init("#inp");
-	date1 = new Date(2008, 1 - 1, 4);
-	date2 = new Date(2008, 6 - 1, 4);
-	minDate = new Date(2008, 2 - 1, 29);
-	maxDate = new Date(2008, 3 - 1, 28);
-	inp.val("").datepicker("option", {minDate: minDate}).datepicker("setDate", date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date2, "Set date min/max - setDate > min");
-	inp.datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Set date min/max - setDate < min");
-	inp.val("").datepicker("option", {maxDate: maxDate, minDate: null}).datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date min/max - setDate < max");
-	inp.datepicker("setDate", date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Set date min/max - setDate > max");
-	inp.val("").datepicker("option", {minDate: minDate}).datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Set date min/max - setDate < min");
-	inp.datepicker("setDate", date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Set date min/max - setDate > max");
-	dateAndTimeToSet = new Date(2008, 3 - 1, 28, 1, 11, 0);
-	dateAndTimeClone = new Date(2008, 3 - 1, 28, 1, 11, 0);
-	inp.datepicker("setDate", dateAndTimeToSet);
-	equal(dateAndTimeToSet.getTime(), dateAndTimeClone.getTime(), "Date object passed should not be changed by setDate");
-});
-
-test("altField", function() {
+	inp = testHelper.init( "#inp" );
+	date1 = new Date( 2008, 1 - 1, 4 );
+	date2 = new Date( 2008, 6 - 1, 4 );
+	minDate = new Date( 2008, 2 - 1, 29 );
+	maxDate = new Date( 2008, 3 - 1, 28 );
+	inp.val( "" ).datepicker( "option", { minDate: minDate } ).datepicker( "setDate", date2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date2, "Set date min/max - setDate > min" );
+	inp.datepicker( "setDate", date1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate, "Set date min/max - setDate < min" );
+	inp.val( "" ).datepicker( "option", { maxDate: maxDate, minDate: null } ).datepicker( "setDate", date1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date min/max - setDate < max" );
+	inp.datepicker( "setDate", date2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate, "Set date min/max - setDate > max" );
+	inp.val( "" ).datepicker( "option", { minDate: minDate } ).datepicker( "setDate", date1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate, "Set date min/max - setDate < min" );
+	inp.datepicker( "setDate", date2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate, "Set date min/max - setDate > max" );
+	dateAndTimeToSet = new Date( 2008, 3 - 1, 28, 1, 11, 0 );
+	dateAndTimeClone = new Date( 2008, 3 - 1, 28, 1, 11, 0 );
+	inp.datepicker( "setDate", dateAndTimeToSet );
+	equal( dateAndTimeToSet.getTime(), dateAndTimeClone.getTime(), "Date object passed should not be changed by setDate" );
+} );
+
+test( "altField", function() {
 	expect( 10 );
-	var inp = testHelper.init("#inp"),
-		alt = $("#alt");
+	var inp = testHelper.init( "#inp" ),
+		alt = $( "#alt" );
+
 	// No alternate field set
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(inp.val(), "06/04/2008", "Alt field - dp - enter");
-	equal(alt.val(), "", "Alt field - alt not set");
+	alt.val( "" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	equal( inp.val(), "06/04/2008", "Alt field - dp - enter" );
+	equal( alt.val(), "", "Alt field - alt not set" );
+
 	// Alternate field set
-	alt.val("");
-	inp.datepicker("option", {altField: "#alt", altFormat: "yy-mm-dd"}).
-		val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(inp.val(), "06/04/2008", "Alt field - dp - enter");
-	equal(alt.val(), "2008-06-04", "Alt field - alt - enter");
+	alt.val( "" );
+	inp.datepicker( "option", { altField: "#alt", altFormat: "yy-mm-dd" } ).
+		val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	equal( inp.val(), "06/04/2008", "Alt field - dp - enter" );
+	equal( alt.val(), "2008-06-04", "Alt field - alt - enter" );
+
 	// Move from initial date
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(inp.val(), "07/04/2008", "Alt field - dp - pgdn");
-	equal(alt.val(), "2008-07-04", "Alt field - alt - pgdn");
+	alt.val( "" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	equal( inp.val(), "07/04/2008", "Alt field - dp - pgdn" );
+	equal( alt.val(), "2008-07-04", "Alt field - alt - pgdn" );
+
 	// Alternate field set - closed
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	equal(inp.val(), "06/04/2008", "Alt field - dp - pgdn/esc");
-	equal(alt.val(), "", "Alt field - alt - pgdn/esc");
+	alt.val( "" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+	equal( inp.val(), "06/04/2008", "Alt field - dp - pgdn/esc" );
+	equal( alt.val(), "", "Alt field - alt - pgdn/esc" );
+
 	// Clear date and alternate
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
-	equal(inp.val(), "", "Alt field - dp - ctrl+end");
-	equal(alt.val(), "", "Alt field - alt - ctrl+end");
-});
-
-test("autoSize", function() {
+	alt.val( "" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.END } );
+	equal( inp.val(), "", "Alt field - dp - ctrl+end" );
+	equal( alt.val(), "", "Alt field - alt - ctrl+end" );
+} );
+
+test( "autoSize", function() {
 	expect( 15 );
-	var inp = testHelper.init("#inp");
-	equal(inp.prop("size"), 20, "Auto size - default");
-	inp.datepicker("option", "autoSize", true);
-	equal(inp.prop("size"), 10, "Auto size - mm/dd/yy");
-	inp.datepicker("option", "dateFormat", "m/d/yy");
-	equal(inp.prop("size"), 10, "Auto size - m/d/yy");
-	inp.datepicker("option", "dateFormat", "D M d yy");
-	equal(inp.prop("size"), 15, "Auto size - D M d yy");
-	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
-	equal(inp.prop("size"), 29, "Auto size - DD, MM dd, yy");
+	var inp = testHelper.init( "#inp" );
+	equal( inp.prop( "size" ), 20, "Auto size - default" );
+	inp.datepicker( "option", "autoSize", true );
+	equal( inp.prop( "size" ), 10, "Auto size - mm/dd/yy" );
+	inp.datepicker( "option", "dateFormat", "m/d/yy" );
+	equal( inp.prop( "size" ), 10, "Auto size - m/d/yy" );
+	inp.datepicker( "option", "dateFormat", "D M d yy" );
+	equal( inp.prop( "size" ), 15, "Auto size - D M d yy" );
+	inp.datepicker( "option", "dateFormat", "DD, MM dd, yy" );
+	equal( inp.prop( "size" ), 29, "Auto size - DD, MM dd, yy" );
 
 	// French
-	inp.datepicker("option", $.extend({autoSize: false}, $.datepicker.regional.fr));
-	equal(inp.prop("size"), 29, "Auto size - fr - default");
-	inp.datepicker("option", "autoSize", true);
-	equal(inp.prop("size"), 10, "Auto size - fr - dd/mm/yy");
-	inp.datepicker("option", "dateFormat", "m/d/yy");
-	equal(inp.prop("size"), 10, "Auto size - fr - m/d/yy");
-	inp.datepicker("option", "dateFormat", "D M d yy");
-	equal(inp.prop("size"), 18, "Auto size - fr - D M d yy");
-	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
-	equal(inp.prop("size"), 28, "Auto size - fr - DD, MM dd, yy");
+	inp.datepicker( "option", $.extend( { autoSize: false }, $.datepicker.regional.fr ) );
+	equal( inp.prop( "size" ), 29, "Auto size - fr - default" );
+	inp.datepicker( "option", "autoSize", true );
+	equal( inp.prop( "size" ), 10, "Auto size - fr - dd/mm/yy" );
+	inp.datepicker( "option", "dateFormat", "m/d/yy" );
+	equal( inp.prop( "size" ), 10, "Auto size - fr - m/d/yy" );
+	inp.datepicker( "option", "dateFormat", "D M d yy" );
+	equal( inp.prop( "size" ), 18, "Auto size - fr - D M d yy" );
+	inp.datepicker( "option", "dateFormat", "DD, MM dd, yy" );
+	equal( inp.prop( "size" ), 28, "Auto size - fr - DD, MM dd, yy" );
 
 	// Hebrew
-	inp.datepicker("option", $.extend({autoSize: false}, $.datepicker.regional.he));
-	equal(inp.prop("size"), 28, "Auto size - he - default");
-	inp.datepicker("option", "autoSize", true);
-	equal(inp.prop("size"), 10, "Auto size - he - dd/mm/yy");
-	inp.datepicker("option", "dateFormat", "m/d/yy");
-	equal(inp.prop("size"), 10, "Auto size - he - m/d/yy");
-	inp.datepicker("option", "dateFormat", "D M d yy");
-	equal(inp.prop("size"), 16, "Auto size - he - D M d yy");
-	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
-	equal(inp.prop("size"), 23, "Auto size - he - DD, MM dd, yy");
-});
-
-test("daylightSaving", function() {
+	inp.datepicker( "option", $.extend( { autoSize: false }, $.datepicker.regional.he ) );
+	equal( inp.prop( "size" ), 28, "Auto size - he - default" );
+	inp.datepicker( "option", "autoSize", true );
+	equal( inp.prop( "size" ), 10, "Auto size - he - dd/mm/yy" );
+	inp.datepicker( "option", "dateFormat", "m/d/yy" );
+	equal( inp.prop( "size" ), 10, "Auto size - he - m/d/yy" );
+	inp.datepicker( "option", "dateFormat", "D M d yy" );
+	equal( inp.prop( "size" ), 16, "Auto size - he - D M d yy" );
+	inp.datepicker( "option", "dateFormat", "DD, MM dd, yy" );
+	equal( inp.prop( "size" ), 23, "Auto size - he - DD, MM dd, yy" );
+} );
+
+test( "daylightSaving", function() {
 	expect( 25 );
-	var inp = testHelper.init("#inp"),
-		dp = $("#ui-datepicker-div");
-	ok(true, "Daylight saving - " + new Date());
+	var inp = testHelper.init( "#inp" ),
+		dp = $( "#ui-datepicker-div" );
+	ok( true, "Daylight saving - " + new Date() );
+
 	// Australia, Sydney - AM change, southern hemisphere
-	inp.val("04/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
-	equal(inp.val(), "04/05/2008", "Daylight saving - Australia 04/05/2008");
-	inp.val("04/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
-	equal(inp.val(), "04/06/2008", "Daylight saving - Australia 04/06/2008");
-	inp.val("04/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
-	equal(inp.val(), "04/07/2008", "Daylight saving - Australia 04/07/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
-	equal(inp.val(), "10/04/2008", "Daylight saving - Australia 10/04/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
-	equal(inp.val(), "10/05/2008", "Daylight saving - Australia 10/05/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
-	equal(inp.val(), "10/06/2008", "Daylight saving - Australia 10/06/2008");
+	inp.val( "04/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(6) a", dp ).simulate( "click" );
+	equal( inp.val(), "04/05/2008", "Daylight saving - Australia 04/05/2008" );
+	inp.val( "04/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(7) a", dp ).simulate( "click" );
+	equal( inp.val(), "04/06/2008", "Daylight saving - Australia 04/06/2008" );
+	inp.val( "04/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(8) a", dp ).simulate( "click" );
+	equal( inp.val(), "04/07/2008", "Daylight saving - Australia 04/07/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(6) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/04/2008", "Daylight saving - Australia 10/04/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(7) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/05/2008", "Daylight saving - Australia 10/05/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(8) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/06/2008", "Daylight saving - Australia 10/06/2008" );
+
 	// Brasil, Brasilia - midnight change, southern hemisphere
-	inp.val("02/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(20) a", dp).simulate("click");
-	equal(inp.val(), "02/16/2008", "Daylight saving - Brasil 02/16/2008");
-	inp.val("02/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(21) a", dp).simulate("click");
-	equal(inp.val(), "02/17/2008", "Daylight saving - Brasil 02/17/2008");
-	inp.val("02/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(22) a", dp).simulate("click");
-	equal(inp.val(), "02/18/2008", "Daylight saving - Brasil 02/18/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(13) a", dp).simulate("click");
-	equal(inp.val(), "10/11/2008", "Daylight saving - Brasil 10/11/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(14) a", dp).simulate("click");
-	equal(inp.val(), "10/12/2008", "Daylight saving - Brasil 10/12/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(15) a", dp).simulate("click");
-	equal(inp.val(), "10/13/2008", "Daylight saving - Brasil 10/13/2008");
+	inp.val( "02/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(20) a", dp ).simulate( "click" );
+	equal( inp.val(), "02/16/2008", "Daylight saving - Brasil 02/16/2008" );
+	inp.val( "02/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(21) a", dp ).simulate( "click" );
+	equal( inp.val(), "02/17/2008", "Daylight saving - Brasil 02/17/2008" );
+	inp.val( "02/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(22) a", dp ).simulate( "click" );
+	equal( inp.val(), "02/18/2008", "Daylight saving - Brasil 02/18/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(13) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/11/2008", "Daylight saving - Brasil 10/11/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(14) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/12/2008", "Daylight saving - Brasil 10/12/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(15) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/13/2008", "Daylight saving - Brasil 10/13/2008" );
+
 	// Lebanon, Beirut - midnight change, northern hemisphere
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(34) a", dp).simulate("click");
-	equal(inp.val(), "03/29/2008", "Daylight saving - Lebanon 03/29/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(35) a", dp).simulate("click");
-	equal(inp.val(), "03/30/2008", "Daylight saving - Lebanon 03/30/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(36) a", dp).simulate("click");
-	equal(inp.val(), "03/31/2008", "Daylight saving - Lebanon 03/31/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(27) a", dp).simulate("click");
-	equal(inp.val(), "10/25/2008", "Daylight saving - Lebanon 10/25/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(28) a", dp).simulate("click");
-	equal(inp.val(), "10/26/2008", "Daylight saving - Lebanon 10/26/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(29) a", dp).simulate("click");
-	equal(inp.val(), "10/27/2008", "Daylight saving - Lebanon 10/27/2008");
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(34) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/29/2008", "Daylight saving - Lebanon 03/29/2008" );
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(35) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/30/2008", "Daylight saving - Lebanon 03/30/2008" );
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(36) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/31/2008", "Daylight saving - Lebanon 03/31/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(27) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/25/2008", "Daylight saving - Lebanon 10/25/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(28) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/26/2008", "Daylight saving - Lebanon 10/26/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(29) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/27/2008", "Daylight saving - Lebanon 10/27/2008" );
+
 	// US, Eastern - AM change, northern hemisphere
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(13) a", dp).simulate("click");
-	equal(inp.val(), "03/08/2008", "Daylight saving - US 03/08/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(14) a", dp).simulate("click");
-	equal(inp.val(), "03/09/2008", "Daylight saving - US 03/09/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(15) a", dp).simulate("click");
-	equal(inp.val(), "03/10/2008", "Daylight saving - US 03/10/2008");
-	inp.val("11/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
-	equal(inp.val(), "11/01/2008", "Daylight saving - US 11/01/2008");
-	inp.val("11/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
-	equal(inp.val(), "11/02/2008", "Daylight saving - US 11/02/2008");
-	inp.val("11/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
-	equal(inp.val(), "11/03/2008", "Daylight saving - US 11/03/2008");
-});
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(13) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/08/2008", "Daylight saving - US 03/08/2008" );
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(14) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/09/2008", "Daylight saving - US 03/09/2008" );
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(15) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/10/2008", "Daylight saving - US 03/10/2008" );
+	inp.val( "11/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(6) a", dp ).simulate( "click" );
+	equal( inp.val(), "11/01/2008", "Daylight saving - US 11/01/2008" );
+	inp.val( "11/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(7) a", dp ).simulate( "click" );
+	equal( inp.val(), "11/02/2008", "Daylight saving - US 11/02/2008" );
+	inp.val( "11/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(8) a", dp ).simulate( "click" );
+	equal( inp.val(), "11/03/2008", "Daylight saving - US 11/03/2008" );
+} );
 
 var beforeShowThis = null,
 	beforeShowInput = null,
@@ -770,316 +792,318 @@ var beforeShowThis = null,
 	beforeShowDayThis = null,
 	beforeShowDayOK = true;
 
-function beforeAll(input, inst) {
+function beforeAll( input, inst ) {
 	beforeShowThis = this;
 	beforeShowInput = input;
 	beforeShowInst = inst;
-	return {currentText: "Current"};
+	return { currentText: "Current" };
 }
 
-function beforeDay(date) {
+function beforeDay( date ) {
 	beforeShowDayThis = this;
-	beforeShowDayOK &= (date > new Date(2008, 1 - 1, 26) &&
-		date < new Date(2008, 3 - 1, 6));
-	return [(date.getDate() % 2 === 0), (date.getDate() % 10 === 0 ? "day10" : ""),
-		(date.getDate() % 3 === 0 ? "Divisble by 3" : "")];
+	beforeShowDayOK &= ( date > new Date( 2008, 1 - 1, 26 ) &&
+		date < new Date( 2008, 3 - 1, 6 ) );
+	return [ ( date.getDate() % 2 === 0 ), ( date.getDate() % 10 === 0 ? "day10" : "" ),
+		( date.getDate() % 3 === 0 ? "Divisble by 3" : "" ) ];
 }
 
-test("callbacks", function() {
+test( "callbacks", function() {
 	expect( 13 );
+
 	// Before show
 	var dp, day20, day21,
-		inp = testHelper.init("#inp", {beforeShow: beforeAll}),
-		inst = $.data(inp[0], "datepicker");
-	equal($.datepicker._get(inst, "currentText"), "Today", "Before show - initial");
-	inp.val("02/04/2008").datepicker("show");
-	equal($.datepicker._get(inst, "currentText"), "Current", "Before show - changed");
-	ok(beforeShowThis.id === inp[0].id, "Before show - this OK");
-	ok(beforeShowInput.id === inp[0].id, "Before show - input OK");
-	deepEqual(beforeShowInst, inst, "Before show - inst OK");
-	inp.datepicker("hide").datepicker("destroy");
+		inp = testHelper.init( "#inp", { beforeShow: beforeAll } ),
+		inst = $.data( inp[ 0 ], "datepicker" );
+	equal( $.datepicker._get( inst, "currentText" ), "Today", "Before show - initial" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	equal( $.datepicker._get( inst, "currentText" ), "Current", "Before show - changed" );
+	ok( beforeShowThis.id === inp[ 0 ].id, "Before show - this OK" );
+	ok( beforeShowInput.id === inp[ 0 ].id, "Before show - input OK" );
+	deepEqual( beforeShowInst, inst, "Before show - inst OK" );
+	inp.datepicker( "hide" ).datepicker( "destroy" );
+
 	// Before show day
-	inp = testHelper.init("#inp", {beforeShowDay: beforeDay});
-	dp = $("#ui-datepicker-div");
-	inp.val("02/04/2008").datepicker("show");
-	ok(beforeShowDayThis.id === inp[0].id, "Before show day - this OK");
-	ok(beforeShowDayOK, "Before show day - dates OK");
-	day20 = dp.find(".ui-datepicker-calendar td:contains('20')");
-	day21 = dp.find(".ui-datepicker-calendar td:contains('21')");
-	ok(!day20.is(".ui-datepicker-unselectable"), "Before show day - unselectable 20");
-	ok(day21.is(".ui-datepicker-unselectable"), "Before show day - unselectable 21");
-	ok(day20.is(".day10"), "Before show day - CSS 20");
-	ok(!day21.is(".day10"), "Before show day - CSS 21");
-	ok(!day20.attr("title"), "Before show day - title 20");
-	ok(day21.attr("title") === "Divisble by 3", "Before show day - title 21");
-	inp.datepicker("hide").datepicker("destroy");
-});
-
-test("beforeShowDay - tooltips with quotes", function() {
+	inp = testHelper.init( "#inp", { beforeShowDay: beforeDay } );
+	dp = $( "#ui-datepicker-div" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	ok( beforeShowDayThis.id === inp[ 0 ].id, "Before show day - this OK" );
+	ok( beforeShowDayOK, "Before show day - dates OK" );
+	day20 = dp.find( ".ui-datepicker-calendar td:contains('20')" );
+	day21 = dp.find( ".ui-datepicker-calendar td:contains('21')" );
+	ok( !day20.is( ".ui-datepicker-unselectable" ), "Before show day - unselectable 20" );
+	ok( day21.is( ".ui-datepicker-unselectable" ), "Before show day - unselectable 21" );
+	ok( day20.is( ".day10" ), "Before show day - CSS 20" );
+	ok( !day21.is( ".day10" ), "Before show day - CSS 21" );
+	ok( !day20.attr( "title" ), "Before show day - title 20" );
+	ok( day21.attr( "title" ) === "Divisble by 3", "Before show day - title 21" );
+	inp.datepicker( "hide" ).datepicker( "destroy" );
+} );
+
+test( "beforeShowDay - tooltips with quotes", function() {
 	expect( 1 );
 	var inp, dp;
-	inp = testHelper.init("#inp", {
+	inp = testHelper.init( "#inp", {
 		beforeShowDay: function() {
 			return [ true, "", "'" ];
 		}
-	});
-	dp = $("#ui-datepicker-div");
+	} );
+	dp = $( "#ui-datepicker-div" );
 
-	inp.datepicker("show");
-	equal( dp.find( ".ui-datepicker-calendar td:contains('9')").attr( "title" ), "'" );
-	inp.datepicker("hide").datepicker("destroy");
-});
+	inp.datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-calendar td:contains('9')" ).attr( "title" ), "'" );
+	inp.datepicker( "hide" ).datepicker( "destroy" );
+} );
 
-test("localisation", function() {
+test( "localisation", function() {
 	expect( 24 );
 	var dp, month, day, date,
-		inp = testHelper.init("#inp", $.datepicker.regional.fr);
-	inp.datepicker("option", {dateFormat: "DD, d MM yy", showButtonPanel:true, changeMonth:true, changeYear:true}).val("").datepicker("show");
-	dp = $("#ui-datepicker-div");
-	equal($(".ui-datepicker-close", dp).text(), "Fermer", "Localisation - close");
-	$(".ui-datepicker-close", dp).simulate("mouseover");
-	equal($(".ui-datepicker-prev", dp).text(), "Précédent", "Localisation - previous");
-	equal($(".ui-datepicker-current", dp).text(), "Aujourd'hui", "Localisation - current");
-	equal($(".ui-datepicker-next", dp).text(), "Suivant", "Localisation - next");
+		inp = testHelper.init( "#inp", $.datepicker.regional.fr );
+	inp.datepicker( "option", { dateFormat: "DD, d MM yy", showButtonPanel:true, changeMonth:true, changeYear:true } ).val( "" ).datepicker( "show" );
+	dp = $( "#ui-datepicker-div" );
+	equal( $( ".ui-datepicker-close", dp ).text(), "Fermer", "Localisation - close" );
+	$( ".ui-datepicker-close", dp ).simulate( "mouseover" );
+	equal( $( ".ui-datepicker-prev", dp ).text(), "Précédent", "Localisation - previous" );
+	equal( $( ".ui-datepicker-current", dp ).text(), "Aujourd'hui", "Localisation - current" );
+	equal( $( ".ui-datepicker-next", dp ).text(), "Suivant", "Localisation - next" );
 	month = 0;
-	$(".ui-datepicker-month option", dp).each(function() {
-		equal($(this).text(), $.datepicker.regional.fr.monthNamesShort[month],
-			"Localisation - month " + month);
+	$( ".ui-datepicker-month option", dp ).each( function() {
+		equal( $( this ).text(), $.datepicker.regional.fr.monthNamesShort[ month ],
+			"Localisation - month " + month );
 		month++;
-	});
+	} );
 	day = 1;
-	$(".ui-datepicker-calendar th", dp).each(function() {
-		equal($(this).text(), $.datepicker.regional.fr.dayNamesMin[day],
-			"Localisation - day " + day);
-		day = (day + 1) % 7;
-	});
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	$( ".ui-datepicker-calendar th", dp ).each( function() {
+		equal( $( this ).text(), $.datepicker.regional.fr.dayNamesMin[ day ],
+			"Localisation - day " + day );
+		day = ( day + 1 ) % 7;
+	} );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 	date = new Date();
-	equal(inp.val(), $.datepicker.regional.fr.dayNames[date.getDay()] + ", " +
-		date.getDate() + " " + $.datepicker.regional.fr.monthNames[date.getMonth()] +
-		" " + date.getFullYear(), "Localisation - formatting");
-});
+	equal( inp.val(), $.datepicker.regional.fr.dayNames[ date.getDay() ] + ", " +
+		date.getDate() + " " + $.datepicker.regional.fr.monthNames[ date.getMonth() ] +
+		" " + date.getFullYear(), "Localisation - formatting" );
+} );
 
-test("noWeekends", function() {
+test( "noWeekends", function() {
 	expect( 31 );
 	var i, date;
-	for (i = 1; i <= 31; i++) {
-		date = new Date(2001, 1 - 1, i);
-		deepEqual($.datepicker.noWeekends(date), [(i + 1) % 7 >= 2, ""],
-			"No weekends " + date);
+	for ( i = 1; i <= 31; i++ ) {
+		date = new Date( 2001, 1 - 1, i );
+		deepEqual( $.datepicker.noWeekends( date ), [ ( i + 1 ) % 7 >= 2, "" ],
+			"No weekends " + date );
 	}
-});
+} );
 
-test("iso8601Week", function() {
+test( "iso8601Week", function() {
 	expect( 12 );
-	var date = new Date(2000, 12 - 1, 31);
-	equal($.datepicker.iso8601Week(date), 52, "ISO 8601 week " + date);
-	date = new Date(2001, 1 - 1, 1);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2001, 1 - 1, 7);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2001, 1 - 1, 8);
-	equal($.datepicker.iso8601Week(date), 2, "ISO 8601 week " + date);
-	date = new Date(2003, 12 - 1, 28);
-	equal($.datepicker.iso8601Week(date), 52, "ISO 8601 week " + date);
-	date = new Date(2003, 12 - 1, 29);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2004, 1 - 1, 4);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2004, 1 - 1, 5);
-	equal($.datepicker.iso8601Week(date), 2, "ISO 8601 week " + date);
-	date = new Date(2009, 12 - 1, 28);
-	equal($.datepicker.iso8601Week(date), 53, "ISO 8601 week " + date);
-	date = new Date(2010, 1 - 1, 3);
-	equal($.datepicker.iso8601Week(date), 53, "ISO 8601 week " + date);
-	date = new Date(2010, 1 - 1, 4);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2010, 1 - 1, 10);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-});
-
-test("parseDate", function() {
+	var date = new Date( 2000, 12 - 1, 31 );
+	equal( $.datepicker.iso8601Week( date ), 52, "ISO 8601 week " + date );
+	date = new Date( 2001, 1 - 1, 1 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+	date = new Date( 2001, 1 - 1, 7 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+	date = new Date( 2001, 1 - 1, 8 );
+	equal( $.datepicker.iso8601Week( date ), 2, "ISO 8601 week " + date );
+	date = new Date( 2003, 12 - 1, 28 );
+	equal( $.datepicker.iso8601Week( date ), 52, "ISO 8601 week " + date );
+	date = new Date( 2003, 12 - 1, 29 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+	date = new Date( 2004, 1 - 1, 4 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+	date = new Date( 2004, 1 - 1, 5 );
+	equal( $.datepicker.iso8601Week( date ), 2, "ISO 8601 week " + date );
+	date = new Date( 2009, 12 - 1, 28 );
+	equal( $.datepicker.iso8601Week( date ), 53, "ISO 8601 week " + date );
+	date = new Date( 2010, 1 - 1, 3 );
+	equal( $.datepicker.iso8601Week( date ), 53, "ISO 8601 week " + date );
+	date = new Date( 2010, 1 - 1, 4 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+	date = new Date( 2010, 1 - 1, 10 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+} );
+
+test( "parseDate", function() {
 	expect( 26 );
-	testHelper.init("#inp");
+	testHelper.init( "#inp" );
 	var currentYear, gmtDate, fr, settings, zh;
-	ok($.datepicker.parseDate("d m y", "") == null, "Parse date empty");
-	testHelper.equalsDate($.datepicker.parseDate("d m y", "3 2 01"),
-		new Date(2001, 2 - 1, 3), "Parse date d m y");
-	testHelper.equalsDate($.datepicker.parseDate("dd mm yy", "03 02 2001"),
-		new Date(2001, 2 - 1, 3), "Parse date dd mm yy");
-	testHelper.equalsDate($.datepicker.parseDate("d m y", "13 12 01"),
-		new Date(2001, 12 - 1, 13), "Parse date d m y");
-	testHelper.equalsDate($.datepicker.parseDate("dd mm yy", "13 12 2001"),
-		new Date(2001, 12 - 1, 13), "Parse date dd mm yy");
-	testHelper.equalsDate($.datepicker.parseDate("y-o", "01-34"),
-		new Date(2001, 2 - 1, 3), "Parse date y-o");
-	testHelper.equalsDate($.datepicker.parseDate("yy-oo", "2001-347"),
-		new Date(2001, 12 - 1, 13), "Parse date yy-oo");
-	testHelper.equalsDate($.datepicker.parseDate("oo yy", "348 2004"),
-		new Date(2004, 12 - 1, 13), "Parse date oo yy");
-	testHelper.equalsDate($.datepicker.parseDate("D d M y", "Sat 3 Feb 01"),
-		new Date(2001, 2 - 1, 3), "Parse date D d M y");
-	testHelper.equalsDate($.datepicker.parseDate("d MM DD yy", "3 February Saturday 2001"),
-		new Date(2001, 2 - 1, 3), "Parse date dd MM DD yy");
-	testHelper.equalsDate($.datepicker.parseDate("DD, MM d, yy", "Saturday, February 3, 2001"),
-		new Date(2001, 2 - 1, 3), "Parse date DD, MM d, yy");
-	testHelper.equalsDate($.datepicker.parseDate("'day' d 'of' MM (''DD''), yy",
-		"day 3 of February ('Saturday'), 2001"), new Date(2001, 2 - 1, 3),
-		"Parse date 'day' d 'of' MM (''DD''), yy");
+	ok( $.datepicker.parseDate( "d m y", "" ) == null, "Parse date empty" );
+	testHelper.equalsDate( $.datepicker.parseDate( "d m y", "3 2 01" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date d m y" );
+	testHelper.equalsDate( $.datepicker.parseDate( "dd mm yy", "03 02 2001" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date dd mm yy" );
+	testHelper.equalsDate( $.datepicker.parseDate( "d m y", "13 12 01" ),
+		new Date( 2001, 12 - 1, 13 ), "Parse date d m y" );
+	testHelper.equalsDate( $.datepicker.parseDate( "dd mm yy", "13 12 2001" ),
+		new Date( 2001, 12 - 1, 13 ), "Parse date dd mm yy" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-o", "01-34" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date y-o" );
+	testHelper.equalsDate( $.datepicker.parseDate( "yy-oo", "2001-347" ),
+		new Date( 2001, 12 - 1, 13 ), "Parse date yy-oo" );
+	testHelper.equalsDate( $.datepicker.parseDate( "oo yy", "348 2004" ),
+		new Date( 2004, 12 - 1, 13 ), "Parse date oo yy" );
+	testHelper.equalsDate( $.datepicker.parseDate( "D d M y", "Sat 3 Feb 01" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date D d M y" );
+	testHelper.equalsDate( $.datepicker.parseDate( "d MM DD yy", "3 February Saturday 2001" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date dd MM DD yy" );
+	testHelper.equalsDate( $.datepicker.parseDate( "DD, MM d, yy", "Saturday, February 3, 2001" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date DD, MM d, yy" );
+	testHelper.equalsDate( $.datepicker.parseDate( "'day' d 'of' MM (''DD''), yy",
+		"day 3 of February ('Saturday'), 2001" ), new Date( 2001, 2 - 1, 3 ),
+		"Parse date 'day' d 'of' MM (''DD''), yy" );
 	currentYear = new Date().getFullYear();
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000) + "-02-03"),
-			new Date(currentYear, 2 - 1, 3), "Parse date y-m-d - default cutuff");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 10) + "-02-03"),
-			new Date(currentYear+10, 2 - 1, 3), "Parse date y-m-d - default cutuff");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 11) + "-02-03"),
-			new Date(currentYear-89, 2 - 1, 3), "Parse date y-m-d - default cutuff");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", "80-02-03", {shortYearCutoff: 80}),
-		new Date(2080, 2 - 1, 3), "Parse date y-m-d - cutoff 80");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", "81-02-03", {shortYearCutoff: 80}),
-		new Date(1981, 2 - 1, 3), "Parse date y-m-d - cutoff 80");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 60) + "-02-03", {shortYearCutoff: "+60"}),
-			new Date(currentYear + 60, 2 - 1, 3), "Parse date y-m-d - cutoff +60");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 61) + "-02-03", {shortYearCutoff: "+60"}),
-			new Date(currentYear - 39, 2 - 1, 3), "Parse date y-m-d - cutoff +60");
-	gmtDate = new Date(2001, 2 - 1, 3);
-	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
-	testHelper.equalsDate($.datepicker.parseDate("@", "981158400000"), gmtDate, "Parse date @");
-	testHelper.equalsDate($.datepicker.parseDate("!", "631167552000000000"), gmtDate, "Parse date !");
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", ( currentYear - 2000 ) + "-02-03" ),
+			new Date( currentYear, 2 - 1, 3 ), "Parse date y-m-d - default cutuff" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", ( currentYear - 2000 + 10 ) + "-02-03" ),
+			new Date( currentYear + 10, 2 - 1, 3 ), "Parse date y-m-d - default cutuff" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", ( currentYear - 2000 + 11 ) + "-02-03" ),
+			new Date( currentYear - 89, 2 - 1, 3 ), "Parse date y-m-d - default cutuff" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", "80-02-03", { shortYearCutoff: 80 } ),
+		new Date( 2080, 2 - 1, 3 ), "Parse date y-m-d - cutoff 80" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", "81-02-03", { shortYearCutoff: 80 } ),
+		new Date( 1981, 2 - 1, 3 ), "Parse date y-m-d - cutoff 80" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", ( currentYear - 2000 + 60 ) + "-02-03", { shortYearCutoff: "+60" } ),
+			new Date( currentYear + 60, 2 - 1, 3 ), "Parse date y-m-d - cutoff +60" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", ( currentYear - 2000 + 61 ) + "-02-03", { shortYearCutoff: "+60" } ),
+			new Date( currentYear - 39, 2 - 1, 3 ), "Parse date y-m-d - cutoff +60" );
+	gmtDate = new Date( 2001, 2 - 1, 3 );
+	gmtDate.setMinutes( gmtDate.getMinutes() - gmtDate.getTimezoneOffset() );
+	testHelper.equalsDate( $.datepicker.parseDate( "@", "981158400000" ), gmtDate, "Parse date @" );
+	testHelper.equalsDate( $.datepicker.parseDate( "!", "631167552000000000" ), gmtDate, "Parse date !" );
 
 	fr = $.datepicker.regional.fr;
-	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
-		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-	testHelper.equalsDate($.datepicker.parseDate("D d M y", "Lun. 9 avr. 01", settings),
-		new Date(2001, 4 - 1, 9), "Parse date D M y with settings");
-	testHelper.equalsDate($.datepicker.parseDate("d MM DD yy", "9 Avril Lundi 2001", settings),
-		new Date(2001, 4 - 1, 9), "Parse date d MM DD yy with settings");
-	testHelper.equalsDate($.datepicker.parseDate("DD, MM d, yy", "Lundi, Avril 9, 2001", settings),
-		new Date(2001, 4 - 1, 9), "Parse date DD, MM d, yy with settings");
-	testHelper.equalsDate($.datepicker.parseDate("'jour' d 'de' MM (''DD''), yy", "jour 9 de Avril ('Lundi'), 2001", settings),
-		new Date(2001, 4 - 1, 9), "Parse date 'jour' d 'de' MM (''DD''), yy with settings");
-
-	zh = $.datepicker.regional["zh-CN"];
-	testHelper.equalsDate($.datepicker.parseDate("yy M d", "2011 十一月 22", zh),
-		new Date(2011, 11 - 1, 22), "Parse date yy M d with zh-CN");
-});
-
-test("parseDateErrors", function() {
+	settings = { dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames };
+	testHelper.equalsDate( $.datepicker.parseDate( "D d M y", "Lun. 9 avr. 01", settings ),
+		new Date( 2001, 4 - 1, 9 ), "Parse date D M y with settings" );
+	testHelper.equalsDate( $.datepicker.parseDate( "d MM DD yy", "9 Avril Lundi 2001", settings ),
+		new Date( 2001, 4 - 1, 9 ), "Parse date d MM DD yy with settings" );
+	testHelper.equalsDate( $.datepicker.parseDate( "DD, MM d, yy", "Lundi, Avril 9, 2001", settings ),
+		new Date( 2001, 4 - 1, 9 ), "Parse date DD, MM d, yy with settings" );
+	testHelper.equalsDate( $.datepicker.parseDate( "'jour' d 'de' MM (''DD''), yy", "jour 9 de Avril ('Lundi'), 2001", settings ),
+		new Date( 2001, 4 - 1, 9 ), "Parse date 'jour' d 'de' MM (''DD''), yy with settings" );
+
+	zh = $.datepicker.regional[ "zh-CN" ];
+	testHelper.equalsDate( $.datepicker.parseDate( "yy M d", "2011 十一月 22", zh ),
+		new Date( 2011, 11 - 1, 22 ), "Parse date yy M d with zh-CN" );
+} );
+
+test( "parseDateErrors", function() {
 	expect( 18 );
-	testHelper.init("#inp");
+	testHelper.init( "#inp" );
 	var fr, settings;
-	function expectError(expr, value, error) {
+	function expectError( expr, value, error ) {
 		try {
 			expr();
-			ok(false, "Parsed error " + value);
+			ok( false, "Parsed error " + value );
 		}
-		catch (e) {
-			equal(e, error, "Parsed error " + value);
+		catch ( e ) {
+			equal( e, error, "Parsed error " + value );
 		}
 	}
-	expectError(function() { $.datepicker.parseDate(null, "Sat 2 01"); },
-		"Sat 2 01", "Invalid arguments");
-	expectError(function() { $.datepicker.parseDate("d m y", null); },
-		"null", "Invalid arguments");
-	expectError(function() { $.datepicker.parseDate("d m y", "Sat 2 01"); },
-		"Sat 2 01 - d m y", "Missing number at position 0");
-	expectError(function() { $.datepicker.parseDate("dd mm yy", "Sat 2 01"); },
-		"Sat 2 01 - dd mm yy", "Missing number at position 0");
-	expectError(function() { $.datepicker.parseDate("d m y", "3 Feb 01"); },
-		"3 Feb 01 - d m y", "Missing number at position 2");
-	expectError(function() { $.datepicker.parseDate("dd mm yy", "3 Feb 01"); },
-		"3 Feb 01 - dd mm yy", "Missing number at position 2");
-	expectError(function() { $.datepicker.parseDate("mm dd yy", "2 1 01"); },
-		"2 1 01 - dd mm yy", "Missing number at position 4");
-	expectError(function() { $.datepicker.parseDate("d m y", "3 2 AD01"); },
-		"3 2 AD01 - d m y", "Missing number at position 4");
-	expectError(function() { $.datepicker.parseDate("d m yy", "3 2 AD01"); },
-		"3 2 AD01 - dd mm yy", "Missing number at position 4");
-	expectError(function() { $.datepicker.parseDate("y-o", "01-D01"); },
-		"2001-D01 - y-o", "Missing number at position 3");
-	expectError(function() { $.datepicker.parseDate("yy-oo", "2001-D01"); },
-		"2001-D01 - yy-oo", "Missing number at position 5");
-	expectError(function() { $.datepicker.parseDate("D d M y", "D7 3 Feb 01"); },
-		"D7 3 Feb 01 - D d M y", "Unknown name at position 0");
-	expectError(function() { $.datepicker.parseDate("D d M y", "Sat 3 M2 01"); },
-		"Sat 3 M2 01 - D d M y", "Unknown name at position 6");
-	expectError(function() { $.datepicker.parseDate("DD, MM d, yy", "Saturday- Feb 3, 2001"); },
-		"Saturday- Feb 3, 2001 - DD, MM d, yy", "Unexpected literal at position 8");
-	expectError(function() { $.datepicker.parseDate("'day' d 'of' MM (''DD''), yy",
-		"day 3 of February (\"Saturday\"), 2001"); },
-		"day 3 of Mon2 ('Day7'), 2001", "Unexpected literal at position 19");
-	expectError(function() { $.datepicker.parseDate("d m y", "29 2 01"); },
-		"29 2 01 - d m y", "Invalid date");
+	expectError( function() { $.datepicker.parseDate( null, "Sat 2 01" ); },
+		"Sat 2 01", "Invalid arguments" );
+	expectError( function() { $.datepicker.parseDate( "d m y", null ); },
+		"null", "Invalid arguments" );
+	expectError( function() { $.datepicker.parseDate( "d m y", "Sat 2 01" ); },
+		"Sat 2 01 - d m y", "Missing number at position 0" );
+	expectError( function() { $.datepicker.parseDate( "dd mm yy", "Sat 2 01" ); },
+		"Sat 2 01 - dd mm yy", "Missing number at position 0" );
+	expectError( function() { $.datepicker.parseDate( "d m y", "3 Feb 01" ); },
+		"3 Feb 01 - d m y", "Missing number at position 2" );
+	expectError( function() { $.datepicker.parseDate( "dd mm yy", "3 Feb 01" ); },
+		"3 Feb 01 - dd mm yy", "Missing number at position 2" );
+	expectError( function() { $.datepicker.parseDate( "mm dd yy", "2 1 01" ); },
+		"2 1 01 - dd mm yy", "Missing number at position 4" );
+	expectError( function() { $.datepicker.parseDate( "d m y", "3 2 AD01" ); },
+		"3 2 AD01 - d m y", "Missing number at position 4" );
+	expectError( function() { $.datepicker.parseDate( "d m yy", "3 2 AD01" ); },
+		"3 2 AD01 - dd mm yy", "Missing number at position 4" );
+	expectError( function() { $.datepicker.parseDate( "y-o", "01-D01" ); },
+		"2001-D01 - y-o", "Missing number at position 3" );
+	expectError( function() { $.datepicker.parseDate( "yy-oo", "2001-D01" ); },
+		"2001-D01 - yy-oo", "Missing number at position 5" );
+	expectError( function() { $.datepicker.parseDate( "D d M y", "D7 3 Feb 01" ); },
+		"D7 3 Feb 01 - D d M y", "Unknown name at position 0" );
+	expectError( function() { $.datepicker.parseDate( "D d M y", "Sat 3 M2 01" ); },
+		"Sat 3 M2 01 - D d M y", "Unknown name at position 6" );
+	expectError( function() { $.datepicker.parseDate( "DD, MM d, yy", "Saturday- Feb 3, 2001" ); },
+		"Saturday- Feb 3, 2001 - DD, MM d, yy", "Unexpected literal at position 8" );
+	expectError( function() { $.datepicker.parseDate( "'day' d 'of' MM (''DD''), yy",
+		"day 3 of February (\"Saturday\"), 2001" ); },
+		"day 3 of Mon2 ('Day7'), 2001", "Unexpected literal at position 19" );
+	expectError( function() { $.datepicker.parseDate( "d m y", "29 2 01" ); },
+		"29 2 01 - d m y", "Invalid date" );
 	fr = $.datepicker.regional.fr;
-	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
-		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-	expectError(function() { $.datepicker.parseDate("D d M y", "Mon 9 Avr 01", settings); },
-		"Mon 9 Avr 01 - D d M y", "Unknown name at position 0");
-	expectError(function() { $.datepicker.parseDate("D d M y", "Lun. 9 Apr 01", settings); },
-		"Lun. 9 Apr 01 - D d M y", "Unknown name at position 7");
-});
-
-test("Ticket #7244: date parser does not fail when too many numbers are passed into the date function", function() {
+	settings = { dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames };
+	expectError( function() { $.datepicker.parseDate( "D d M y", "Mon 9 Avr 01", settings ); },
+		"Mon 9 Avr 01 - D d M y", "Unknown name at position 0" );
+	expectError( function() { $.datepicker.parseDate( "D d M y", "Lun. 9 Apr 01", settings ); },
+		"Lun. 9 Apr 01 - D d M y", "Unknown name at position 7" );
+} );
+
+test( "Ticket #7244: date parser does not fail when too many numbers are passed into the date function", function() {
 	expect( 4 );
 	var date;
-	try{
-		date = $.datepicker.parseDate("dd/mm/yy", "18/04/19881");
-		ok(false, "Did not properly detect an invalid date");
-	}catch(e){
-		ok("invalid date detected");
+	try {
+		date = $.datepicker.parseDate( "dd/mm/yy", "18/04/19881" );
+		ok( false, "Did not properly detect an invalid date" );
+	}catch ( e ) {
+		ok( "invalid date detected" );
 	}
 
 	try {
-		date = $.datepicker.parseDate("dd/mm/yy", "18/04/1988 @ 2:43 pm");
-		equal(date.getDate(), 18);
-		equal(date.getMonth(), 3);
-		equal(date.getFullYear(), 1988);
-	} catch(e) {
-		ok(false, "Did not properly parse date with extra text separated by whitespace");
+		date = $.datepicker.parseDate( "dd/mm/yy", "18/04/1988 @ 2:43 pm" );
+		equal( date.getDate(), 18 );
+		equal( date.getMonth(), 3 );
+		equal( date.getFullYear(), 1988 );
+	} catch ( e ) {
+		ok( false, "Did not properly parse date with extra text separated by whitespace" );
 	}
-});
+} );
 
-test("formatDate", function() {
+test( "formatDate", function() {
 	expect( 16 );
-	testHelper.init("#inp");
+	testHelper.init( "#inp" );
 	var gmtDate, fr, settings;
-	equal($.datepicker.formatDate("d m y", new Date(2001, 2 - 1, 3)),
-		"3 2 01", "Format date d m y");
-	equal($.datepicker.formatDate("dd mm yy", new Date(2001, 2 - 1, 3)),
-		"03 02 2001", "Format date dd mm yy");
-	equal($.datepicker.formatDate("d m y", new Date(2001, 12 - 1, 13)),
-		"13 12 01", "Format date d m y");
-	equal($.datepicker.formatDate("dd mm yy", new Date(2001, 12 - 1, 13)),
-		"13 12 2001", "Format date dd mm yy");
-	equal($.datepicker.formatDate("yy-o", new Date(2001, 2 - 1, 3)),
-		"2001-34", "Format date yy-o");
-	equal($.datepicker.formatDate("yy-oo", new Date(2001, 2 - 1, 3)),
-		"2001-034", "Format date yy-oo");
-	equal($.datepicker.formatDate("D M y", new Date(2001, 2 - 1, 3)),
-		"Sat Feb 01", "Format date D M y");
-	equal($.datepicker.formatDate("DD MM yy", new Date(2001, 2 - 1, 3)),
-		"Saturday February 2001", "Format date DD MM yy");
-	equal($.datepicker.formatDate("DD, MM d, yy", new Date(2001, 2 - 1, 3)),
-		"Saturday, February 3, 2001", "Format date DD, MM d, yy");
-	equal($.datepicker.formatDate("'day' d 'of' MM (''DD''), yy",
-		new Date(2001, 2 - 1, 3)), "day 3 of February ('Saturday'), 2001",
-		"Format date 'day' d 'of' MM ('DD'), yy");
-	gmtDate = new Date(2001, 2 - 1, 3);
-	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
-	equal($.datepicker.formatDate("@", gmtDate), "981158400000", "Format date @");
-	equal($.datepicker.formatDate("!", gmtDate), "631167552000000000", "Format date !");
+	equal( $.datepicker.formatDate( "d m y", new Date( 2001, 2 - 1, 3 ) ),
+		"3 2 01", "Format date d m y" );
+	equal( $.datepicker.formatDate( "dd mm yy", new Date( 2001, 2 - 1, 3 ) ),
+		"03 02 2001", "Format date dd mm yy" );
+	equal( $.datepicker.formatDate( "d m y", new Date( 2001, 12 - 1, 13 ) ),
+		"13 12 01", "Format date d m y" );
+	equal( $.datepicker.formatDate( "dd mm yy", new Date( 2001, 12 - 1, 13 ) ),
+		"13 12 2001", "Format date dd mm yy" );
+	equal( $.datepicker.formatDate( "yy-o", new Date( 2001, 2 - 1, 3 ) ),
+		"2001-34", "Format date yy-o" );
+	equal( $.datepicker.formatDate( "yy-oo", new Date( 2001, 2 - 1, 3 ) ),
+		"2001-034", "Format date yy-oo" );
+	equal( $.datepicker.formatDate( "D M y", new Date( 2001, 2 - 1, 3 ) ),
+		"Sat Feb 01", "Format date D M y" );
+	equal( $.datepicker.formatDate( "DD MM yy", new Date( 2001, 2 - 1, 3 ) ),
+		"Saturday February 2001", "Format date DD MM yy" );
+	equal( $.datepicker.formatDate( "DD, MM d, yy", new Date( 2001, 2 - 1, 3 ) ),
+		"Saturday, February 3, 2001", "Format date DD, MM d, yy" );
+	equal( $.datepicker.formatDate( "'day' d 'of' MM (''DD''), yy",
+		new Date( 2001, 2 - 1, 3 ) ), "day 3 of February ('Saturday'), 2001",
+		"Format date 'day' d 'of' MM ('DD'), yy" );
+	gmtDate = new Date( 2001, 2 - 1, 3 );
+	gmtDate.setMinutes( gmtDate.getMinutes() - gmtDate.getTimezoneOffset() );
+	equal( $.datepicker.formatDate( "@", gmtDate ), "981158400000", "Format date @" );
+	equal( $.datepicker.formatDate( "!", gmtDate ), "631167552000000000", "Format date !" );
 	fr = $.datepicker.regional.fr;
-	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
-		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-	equal($.datepicker.formatDate("D M y", new Date(2001, 4 - 1, 9), settings),
-		"lun. avr. 01", "Format date D M y with settings");
-	equal($.datepicker.formatDate("DD MM yy", new Date(2001, 4 - 1, 9), settings),
-		"lundi avril 2001", "Format date DD MM yy with settings");
-	equal($.datepicker.formatDate("DD, MM d, yy", new Date(2001, 4 - 1, 9), settings),
-		"lundi, avril 9, 2001", "Format date DD, MM d, yy with settings");
-	equal($.datepicker.formatDate("'jour' d 'de' MM (''DD''), yy",
-		new Date(2001, 4 - 1, 9), settings), "jour 9 de avril ('lundi'), 2001",
-		"Format date 'jour' d 'de' MM (''DD''), yy with settings");
-});
+	settings = { dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames };
+	equal( $.datepicker.formatDate( "D M y", new Date( 2001, 4 - 1, 9 ), settings ),
+		"lun. avr. 01", "Format date D M y with settings" );
+	equal( $.datepicker.formatDate( "DD MM yy", new Date( 2001, 4 - 1, 9 ), settings ),
+		"lundi avril 2001", "Format date DD MM yy with settings" );
+	equal( $.datepicker.formatDate( "DD, MM d, yy", new Date( 2001, 4 - 1, 9 ), settings ),
+		"lundi, avril 9, 2001", "Format date DD, MM d, yy with settings" );
+	equal( $.datepicker.formatDate( "'jour' d 'de' MM (''DD''), yy",
+		new Date( 2001, 4 - 1, 9 ), settings ), "jour 9 de avril ('lundi'), 2001",
+		"Format date 'jour' d 'de' MM (''DD''), yy with settings" );
+} );
 
 // TODO: Fix this test so it isn't mysteriously flaky in Browserstack on certain OS/Browser combos
 // test("Ticket 6827: formatDate day of year calculation is wrong during day lights savings time", function(){
@@ -1096,7 +1120,7 @@ test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler
 	inp = testHelper.init( "#inp", {
 		beforeShow: function() {
 		}
-	});
+	} );
 	dp = $( "#ui-datepicker-div" );
 	inp.datepicker( "show" );
 	equal( dp.css( "display" ), "block", "beforeShow returns nothing" );
@@ -1106,7 +1130,7 @@ test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler
 		beforeShow: function() {
 			return true;
 		}
-	});
+	} );
 	dp = $( "#ui-datepicker-div" );
 	inp.datepicker( "show" );
 	equal( dp.css( "display" ), "block", "beforeShow returns true" );
@@ -1117,11 +1141,11 @@ test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler
 		beforeShow: function() {
 			return false;
 		}
-	});
+	} );
 	dp = $( "#ui-datepicker-div" );
 	inp.datepicker( "show" );
-	equal( dp.css( "display" ), "none","beforeShow returns false" );
+	equal( dp.css( "display" ), "none", "beforeShow returns false" );
 	inp.datepicker( "destroy" );
-});
+} );
 
 } );