diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 598d71bc60..cea056ef60 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -25,14 +25,14 @@
 // TypeScript Version: 2.3
 
 declare module 'jquery' {
-    function factory(window: Window): JQueryStatic;
+    function factory(window: Window): JQueryStatic & JQuery;
 
     const factoryOrJQuery: typeof factory & JQueryStatic;
     export = factoryOrJQuery;
 }
 
 declare module 'jquery/dist/jquery.slim' {
-    function factory(window: Window): JQueryStatic;
+    function factory(window: Window): JQueryStatic & JQuery;
 
     const factoryOrJQuery: typeof factory & JQueryStatic;
     export = factoryOrJQuery;
@@ -129,7 +129,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/ajaxComplete/}
      * @since 1.0
      */
-    ajaxComplete(handler: (this: Document, event: JQuery.Event<TElement>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings) => void | false): this;
+    ajaxComplete(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings) => void | false): this;
     /**
      * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
      *
@@ -137,7 +137,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/ajaxError/}
      * @since 1.0
      */
-    ajaxError(handler: (this: Document, event: JQuery.Event<TElement>, jqXHR: JQuery.jqXHR, ajaxSettings: JQuery.AjaxSettings, thrownError: string) => void | false): this;
+    ajaxError(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxSettings: JQuery.AjaxSettings, thrownError: string) => void | false): this;
     /**
      * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
      *
@@ -145,7 +145,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/ajaxSend/}
      * @since 1.0
      */
-    ajaxSend(handler: (this: Document, event: JQuery.Event<TElement>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings) => void | false): this;
+    ajaxSend(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings) => void | false): this;
     /**
      * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
      *
@@ -169,7 +169,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/ajaxSuccess/}
      * @since 1.0
      */
-    ajaxSuccess(handler: (this: Document, event: JQuery.Event<TElement>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings, data: JQuery.PlainObject) => void | false): this;
+    ajaxSuccess(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings, data: JQuery.PlainObject) => void | false): this;
     /**
      * Perform a custom animation of a set of CSS properties.
      *
@@ -201,15 +201,22 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * Perform a custom animation of a set of CSS properties.
      *
      * @param properties An object of CSS properties and values that the animation will move toward.
-     * @param duration_easing_complete_options A string or number determining how long the animation will run.
-     *                                         A string indicating which easing function to use for the transition.
-     *                                         A function to call once the animation is complete, called once per matched element.
-     *                                         A map of additional options to pass to the method.
+     * @param options A map of additional options to pass to the method.
      * @see {@link https://api.jquery.com/animate/}
      * @since 1.0
      */
     animate(properties: JQuery.PlainObject,
-            duration_easing_complete_options?: JQuery.Duration | string | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
+            options: JQuery.EffectsOptions<TElement>): this;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/animate/}
+     * @since 1.0
+     */
+    animate(properties: JQuery.PlainObject,
+            complete?: (this: TElement) => void): this;
     /**
      * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
      *
@@ -516,8 +523,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/data/}
      * @since 1.2.3
      */
-    // tslint:disable-next-line:unified-signatures
-    data(key: string, undefined: undefined): any;
+    data(key: string, undefined: undefined): any; // tslint:disable-line:unified-signatures
     /**
      * Store arbitrary data associated with the matched elements.
      *
@@ -693,7 +699,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      * @since 1.4.3
      */
-    fadeIn(duration_easing: JQuery.Duration | string, complete?: (this: TElement) => void): this;
+    fadeIn(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
     /**
      * Display the matched elements by fading them to opaque.
      *
@@ -726,7 +732,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      * @since 1.4.3
      */
-    fadeOut(duration_easing: JQuery.Duration | string, complete?: (this: TElement) => void): this;
+    fadeOut(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
     /**
      * Hide the matched elements by fading them to transparent.
      *
@@ -780,7 +786,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      * @since 1.4.3
      */
-    fadeToggle(duration_easing: JQuery.Duration | string, complete?: (this: TElement) => void): this;
+    fadeToggle(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
     /**
      * Display or hide the matched elements by animating their opacity.
      *
@@ -933,7 +939,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/height/}
      * @since 1.0
      */
-    height(): number;
+    height(): number | undefined;
     /**
      * Hide the matched elements.
      *
@@ -1025,7 +1031,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/innerHeight/}
      * @since 1.2.6
      */
-    innerHeight(): number;
+    innerHeight(): number | undefined;
     /**
      * Set the CSS inner width of each element in the set of matched elements.
      *
@@ -1045,7 +1051,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/innerWidth/}
      * @since 1.2.6
      */
-    innerWidth(): number;
+    innerWidth(): number | undefined;
     /**
      * Insert every element in the set of matched elements after the target.
      *
@@ -1148,7 +1154,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      */
     load(url: string,
          data: string | JQuery.PlainObject,
-         complete: (this: TElement, responseText: string, textStatus: string, jqXHR: JQuery.jqXHR) => void): this;
+         complete: (this: TElement, responseText: string, textStatus: JQuery.Ajax.TextStatus, jqXHR: JQuery.jqXHR) => void): this;
     /**
      * Load data from the server and place the returned HTML into the matched element.
      *
@@ -1159,7 +1165,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      */
     load(url: string,
-         complete_data?: ((this: TElement, responseText: string, textStatus: string, jqXHR: JQuery.jqXHR) => void) | string | JQuery.PlainObject): this;
+         complete_data?: ((this: TElement, responseText: string, textStatus: JQuery.Ajax.TextStatus, jqXHR: JQuery.jqXHR) => void) | string | JQuery.PlainObject): this;
     /**
      * Pass each element in the current matched set through a function, producing a new jQuery object
      * containing the return values.
@@ -1535,7 +1541,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/outerHeight/}
      * @since 1.2.6
      */
-    outerHeight(includeMargin?: boolean): number;
+    outerHeight(includeMargin?: boolean): number | undefined;
     /**
      * Set the CSS outer width of each element in the set of matched elements.
      *
@@ -1555,7 +1561,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/outerWidth/}
      * @since 1.2.6
      */
-    outerWidth(includeMargin?: boolean): number;
+    outerWidth(includeMargin?: boolean): number | undefined;
     /**
      * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
      *
@@ -1610,7 +1616,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/prepend/}
      * @since 1.4
      */
-    prepend(fn: (this: TElement, elementOfArray: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery): this;
+    prepend(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery): this;
     /**
      * Insert every element in the set of matched elements to the beginning of the target.
      *
@@ -1619,7 +1625,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/prependTo/}
      * @since 1.0
      */
-    prependTo(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery): this;
+    prependTo(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery): this;
     /**
      * Get the immediately preceding sibling of each element in the set of matched elements. If a selector
      * is provided, it retrieves the previous sibling only if it matches that selector.
@@ -1695,8 +1701,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/prop/}
      * @since 1.6
      */
-    // tslint:disable-next-line:unified-signatures
-    prop(propertyName: string, value: any): this;
+    prop(propertyName: string, value: any): this; // tslint:disable-line:unified-signatures
     /**
      * Set one or more properties for the set of matched elements.
      *
@@ -1996,7 +2001,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      * @since 1.4.3
      */
-    slideDown(duration_easing: JQuery.Duration | string, complete?: (this: TElement) => void): this;
+    slideDown(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
     /**
      * Display the matched elements with a sliding motion.
      *
@@ -2029,7 +2034,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      * @since 1.4.3
      */
-    slideToggle(duration_easing: JQuery.Duration | string, complete?: (this: TElement) => void): this;
+    slideToggle(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
     /**
      * Display or hide the matched elements with a sliding motion.
      *
@@ -2062,7 +2067,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      * @since 1.4.3
      */
-    slideUp(duration_easing: JQuery.Duration | string, complete?: (this: TElement) => void): this;
+    slideUp(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
     /**
      * Hide the matched elements with a sliding motion.
      *
@@ -2155,17 +2160,19 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/toggle/}
      * @since 1.0
      */
-    toggle(duration: JQuery.Duration, complete?: (this: TElement) => void): this;
+    toggle(duration: JQuery.Duration, complete: (this: TElement) => void): this;
     /**
      * Display or hide the matched elements.
      *
-     * @param options A map of additional options to pass to the method.
-     *                Use true to show the element or false to hide it.
+     * @param duration_complete_options_display A string or number determining how long the animation will run.
+     *                                          A function to call once the animation is complete, called once per matched element.
+     *                                          A map of additional options to pass to the method.
+     *                                          Use true to show the element or false to hide it.
      * @see {@link https://api.jquery.com/toggle/}
      * @since 1.0
      * @since 1.3
      */
-    toggle(options?: JQuery.EffectsOptions<TElement> | boolean): this;
+    toggle(duration_complete_options_display?: JQuery.Duration | ((this: TElement) => void) | JQuery.EffectsOptions<TElement> | boolean): this;
     /**
      * Add or remove one or more classes from each element in the set of matched elements, depending on
      * either the class's presence or the value of the state argument.
@@ -2179,10 +2186,11 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.3
      * @since 1.4
      */
-    toggleClass(className: string | ((this: TElement, index: number, className: string, state: boolean) => string),
-                state?: boolean): this;
+    toggleClass<TState extends boolean>(className: string | ((this: TElement, index: number, className: string, state: TState) => string),
+                                        state?: TState): this;
     /**
-     *
+     * Add or remove one or more classes from each element in the set of matched elements, depending on
+     * either the class's presence or the value of the state argument.
      *
      * @param state A boolean value to determine whether the class should be added or removed.
      * @see {@link https://api.jquery.com/toggleClass/}
@@ -2316,7 +2324,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/width/}
      * @since 1.0
      */
-    width(): number;
+    width(): number | undefined;
     /**
      * Wrap an HTML structure around each element in the set of matched elements.
      *
@@ -2356,7 +2364,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.2
      * @since 1.4
      */
-    wrapInner(wrappingElement: JQuery.htmlString | JQuery.Selector | JQuery | Element | ((this: TElement, index: number) => string)): this;
+    wrapInner(wrappingElement: JQuery.Selector | JQuery.htmlString | Element | JQuery | ((this: TElement, index: number) => string | Element | JQuery)): this;
 }
 
 interface JQuery<TElement extends Node = HTMLElement> extends ArrayLike<TElement>, Iterable<TElement> { }
@@ -2553,8 +2561,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.data/}
      * @since 1.2.3
      */
-    // tslint:disable-next-line:unified-signatures
-    data(element: Element, key: string, undefined: undefined): any;
+    data(element: Element, key: string, undefined: undefined): any; // tslint:disable-line:unified-signatures
     /**
      * Store arbitrary data associated with the specified element. Returns the value that was set.
      *
@@ -4043,6 +4050,7 @@ declare namespace JQuery {
     // region Effects
 
     type Duration = number | 'fast' | 'slow';
+    // TODO: Is the first element always a string or is that specific to the 'fx' queue?
     type Queue<TElement> = { 0: string; } & Array<QueueFunction<TElement>>;
 
     interface QueueFunction<TElement> {
@@ -4094,7 +4102,7 @@ declare namespace JQuery {
          * An object containing one or more of the CSS properties defined by the properties argument and their
          * corresponding easing functions.
          */
-        specialEasing?: PlainObject;
+        specialEasing?: PlainObject<string>;
         /**
          * A function to call when the animation on an element begins.
          */
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 09468a1c55..0e2e7ee350 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -9,6 +9,1373 @@ function JQuery() {
         $('div')[0] === new HTMLElement();
     }
 
+    function ajax() {
+        function ajaxComplete() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxComplete(function(event, jqXHR, ajaxOptions) {
+                // $ExpectType Document
+                this;
+                // $ExpectType Event<Document, null>
+                event;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+                // $ExpectType AjaxSettings<any>
+                ajaxOptions;
+
+                return false;
+            });
+        }
+
+        function ajaxError() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxError(function(event, jqXHR, ajaxSettings, thrownError) {
+                // $ExpectType Document
+                this;
+                // $ExpectType Event<Document, null>
+                event;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+                // $ExpectType AjaxSettings<any>
+                ajaxSettings;
+                // $ExpectType string
+                thrownError;
+
+                return false;
+            });
+        }
+
+        function ajaxSend() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
+                // $ExpectType Document
+                this;
+                // $ExpectType Event<Document, null>
+                event;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+                // $ExpectType AjaxSettings<any>
+                ajaxOptions;
+
+                return false;
+            });
+        }
+
+        function ajaxStart() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxStart(function() {
+                // $ExpectType Document
+                this;
+
+                return false;
+            });
+        }
+
+        function ajaxStop() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxStop(function() {
+                // $ExpectType Document
+                this;
+
+                return false;
+            });
+        }
+
+        function ajaxSuccess() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxSuccess(function(event, jqXHR, ajaxOptions, data) {
+                // $ExpectType Document
+                this;
+                // $ExpectType Event<Document, null>
+                event;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+                // $ExpectType AjaxSettings<any>
+                ajaxOptions;
+                // $ExpectType PlainObject<any>
+                data;
+
+                return false;
+            });
+        }
+
+        function load() {
+            // $ExpectType JQuery<HTMLElement>
+            $('#result').load('/echo/html/', 'data', function(responseText, textStatus, jqXHR) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType string
+                responseText;
+                // $ExpectType TextStatus
+                textStatus;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#result').load('/echo/html/', { data: 'data' }, function(responseText, textStatus, jqXHR) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType string
+                responseText;
+                // $ExpectType TextStatus
+                textStatus;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#result').load('/echo/html/', function(responseText, textStatus, jqXHR) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType string
+                responseText;
+                // $ExpectType TextStatus
+                textStatus;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#result').load('/echo/html/', 'data');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#result').load('/echo/html/', { data: 'data' });
+        }
+    }
+
+    function attributes() {
+        function attr() {
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('alt', 'Beijing Brush Seller');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('width', 200);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('title', null);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('alt', function(index, attr) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                attr;
+
+                return 'Beijing Brush Seller';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('width', function(index, attr) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                attr;
+
+                return 200;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('title', function(index, attr) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                attr;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('title', function(index, attr) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                attr;
+
+                return undefined;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('img').attr({
+                src: '/resources/hat.gif',
+                title: 'jQuery',
+                alt: 'jQuery Logo'
+            });
+
+            // $ExpectType string | undefined
+            $('img').attr('src');
+        }
+
+        function removeAttr() {
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').removeAttr('alt');
+        }
+    }
+
+    function properties() {
+        function prop() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prop('myProp', function(index, oldPropertyValue) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType any
+                oldPropertyValue;
+
+                return {};
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prop('myProp', {});
+
+            // $ExpectType JQuery<HTMLElement>
+            $('input[type=\'checkbox\']').prop({
+                myProp: true
+            });
+
+            // $ExpectType any
+            $('input[type=\'checkbox\']').prop('myProp');
+        }
+
+        function removeProp() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeProp('luggageCode');
+        }
+    }
+
+    function css() {
+        // TODO: .css() getters can return 'undefined' for properties that don't exist. Consider changing the return types to reflect this after adding specialized signatures.
+        function css() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', 'value');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', 20);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', function(index, value) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                value;
+
+                return 'value';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', function(index, value) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                value;
+
+                return 20;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', function(index, value) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                value;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', function(index, value) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                value;
+
+                return undefined;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css({
+                myProp1: 'value',
+                myProp2: 20,
+                myProp3(index, value) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType number
+                    index;
+                    // $ExpectType string
+                    value;
+
+                    return 'value';
+                },
+                myProp4(index, value) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType number
+                    index;
+                    // $ExpectType string
+                    value;
+
+                    return 20;
+                },
+                myProp5(index, value) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType number
+                    index;
+                    // $ExpectType string
+                    value;
+                },
+                myProp6(index, value) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType number
+                    index;
+                    // $ExpectType string
+                    value;
+
+                    return undefined;
+                }
+            });
+
+            // $ExpectType string
+            $('p').css('myProp');
+
+            // $ExpectType PlainObject<string>
+            $('p').css([
+                'myProp1',
+                'myProp2'
+            ]);
+        }
+
+        function height() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').height('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').height(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').height(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').height(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').height();
+        }
+
+        function innerHeight() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerHeight('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerHeight(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerHeight(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerHeight(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').innerHeight();
+        }
+
+        function outerHeight() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerHeight('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerHeight(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerHeight(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerHeight(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').outerHeight();
+
+            // $ExpectType number | undefined
+            $('p').outerHeight(true);
+        }
+
+        function width() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').width('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').width(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').width(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').width(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').width();
+        }
+
+        function innerWidth() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerWidth('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerWidth(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerWidth(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerWidth(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').innerWidth();
+        }
+
+        function outerWidth() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerWidth('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerWidth(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerWidth(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerWidth(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').outerWidth();
+
+            // $ExpectType number | undefined
+            $('p').outerWidth(true);
+        }
+
+        function offset() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').offset({
+                left: 20,
+                top: 50
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').offset(function(index, coords) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType Coordinates
+                coords;
+
+                return {
+                    left: 20,
+                    top: 50
+                };
+            });
+
+            // $ExpectType Coordinates
+            $('p').offset();
+        }
+
+        function position() {
+            // $ExpectType Coordinates
+            $('p').position();
+        }
+
+        function scrollLeft() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').scrollLeft(200);
+
+            // $ExpectType number
+            $('p').scrollLeft();
+        }
+
+        function scrollTop() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').scrollTop(200);
+
+            // $ExpectType number
+            $('p').scrollTop();
+        }
+
+        function addClass() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').addClass('className');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').addClass(function(index, currentClassName) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                currentClassName;
+
+                return 'className';
+            });
+        }
+
+        function hasClass() {
+            // $ExpectType boolean
+            $('p').hasClass('className');
+        }
+
+        function removeClass() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeClass('className');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeClass(function(index, currentClassName) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                currentClassName;
+
+                return 'className';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeClass();
+        }
+
+        function toggleClass() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass('className', true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass(function(index, className, state) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                className;
+                // $ExpectType true
+                state;
+
+                return 'className';
+            }, true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass('className');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass(function(index, className, state) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                className;
+                // $ExpectType boolean
+                state;
+
+                return 'className';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass();
+        }
+    }
+
+    function data() {
+        function data() {
+            // $ExpectType any
+            $('p').data('myData', undefined);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').data('myData', {});
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').data({
+                myData1: {},
+                myData2: false
+            });
+
+            // $ExpectType any
+            $('p').data('myData');
+
+            // $ExpectType PlainObject<any>
+            $('p').data();
+        }
+
+        function removeData() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeData('myData');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeData([
+                'myData1',
+                'myData2'
+            ]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeData();
+        }
+    }
+
+    function effects() {
+        function animate() {
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+
+                $(this).after('<div>Animation complete.</div>');
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 5000, function() {
+                // $ExpectType HTMLElement
+                this;
+
+                $(this).after('<div>Animation complete.</div>');
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+
+                $(this).after('<div>Animation complete.</div>');
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, function() {
+                // $ExpectType HTMLElement
+                this;
+
+                $(this).after('<div>Animation complete.</div>');
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: 'toggle',
+                height: 'toggle'
+            }, {
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            });
+        }
+
+        function fadeIn() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn();
+        }
+
+        function fadeOut() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut();
+        }
+
+        function fadeToggle() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle();
+        }
+
+        function slideDown() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown();
+        }
+
+        function slideToggle() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle();
+        }
+
+        function slideUp() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp();
+        }
+
+        function fadeTo() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeTo(5000, 0.9, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeTo(5000, 0.9, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeTo(5000, 0.9, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeTo(5000, 0.9);
+        }
+
+        function toggle() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle();
+        }
+
+        function hide() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide();
+        }
+
+        function show() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show();
+        }
+
+        function clearQueue() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').clearQueue('myQueue');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').clearQueue();
+        }
+
+        function delay() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').delay('fast', 'myQueue');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').delay('slow');
+        }
+
+        function dequeue() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').dequeue('myQueue');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').dequeue();
+        }
+
+        function finish() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').finish('myQueue');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').finish();
+        }
+
+        function queue() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').queue('myQueue', function(next) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType () => void
+                next;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').queue('myQueue', [
+                function(next) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType () => void
+                    next;
+                },
+                function(next) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType () => void
+                    next;
+                }
+            ]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').queue(function(next) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType () => void
+                next;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').queue([
+                function(next) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType () => void
+                    next;
+                },
+                function(next) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType () => void
+                    next;
+                }
+            ]);
+
+            // $ExpectType Queue<HTMLElement>
+            $('p').queue('myQueue');
+
+            // $ExpectType Queue<HTMLElement>
+            $('p').queue();
+        }
+
+        function stop() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').stop('myQueue', true, false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').stop('myQueue', true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').stop(true, false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').stop(true);
+        }
+    }
+
     function on() {
         function false_handler_shorthand() {
             $().on('events', false);
@@ -131,6 +1498,70 @@ function JQueryStatic() {
     }
 }
 
+function EffectsOptions() {
+    $('p').show({
+        always(animation, jumpToEnd) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType Promise<any, any, any>
+            animation;
+            // $ExpectType boolean
+            jumpToEnd;
+        },
+        complete() {
+            // $ExpectType HTMLElement
+            this;
+        },
+        done(animation, jumpToEnd) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType Promise<any, any, any>
+            animation;
+            // $ExpectType boolean
+            jumpToEnd;
+        },
+        duration: 5000,
+        easing: 'linear',
+        fail(animation, jumpToEnd) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType Promise<any, any, any>
+            animation;
+            // $ExpectType boolean
+            jumpToEnd;
+        },
+        progress(animation, progress, remainingMs) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType Promise<any, any, any>
+            animation;
+            // $ExpectType number
+            progress;
+            // $ExpectType number
+            remainingMs;
+        },
+        queue: true,
+        specialEasing: {
+            width: 'linear',
+            height: 'easeOutBounce'
+        },
+        start(animation) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType Promise<any, any, any>
+            animation;
+        },
+        step(now, tween) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType number
+            now;
+            // $ExpectType Tween<HTMLElement>
+            tween;
+        }
+    });
+}
+
 function JQuery_Event() {
     function type_guard(e: object) {
         if (e instanceof JQuery.Event) {
@@ -184,7 +1615,9 @@ function jqXHR() {
         $.ajax('/echo').fail((jqXHR, textStatus, errorThrown) => {
             // $ExpectType jqXHR<any>
             jqXHR;
-            // $ExpectType "abort" | "timeout" | "error" | "parsererror" | null
+            // This test is flaky
+            // Should be 'ErrorTextStatus | null' and should be able to handle it out of order
+            // $ExpectType "timeout" | "error" | "abort" | "parsererror" | null
             textStatus;
             // $ExpectType string
             errorThrown;
diff --git a/types/jquery/test/example-tests.ts b/types/jquery/test/example-tests.ts
index d2c0a8464d..961e239192 100644
--- a/types/jquery/test/example-tests.ts
+++ b/types/jquery/test/example-tests.ts
@@ -1822,8 +1822,8 @@ function examples() {
     }
 
     function finish_0() {
-        var horiz = $('#path').width() - 20,
-            vert = $('#path').height() - 20;
+        var horiz = $('#path').width()! - 20,
+            vert = $('#path').height()! - 20;
 
         var btns: { [key: string]: () => void; } = {
             bstt: function() {
@@ -1992,13 +1992,13 @@ function examples() {
         }
 
         $('#getp').click(function() {
-            showHeight('paragraph', $('p').height());
+            showHeight('paragraph', $('p').height()!);
         });
         $('#getd').click(function() {
-            showHeight('document', $(document).height());
+            showHeight('document', $(document).height()!);
         });
         $('#getw').click(function() {
-            showHeight('window', $(window).height());
+            showHeight('window', $(window).height()!);
         });
     }
 
@@ -4935,13 +4935,13 @@ function examples() {
         }
 
         $('#getp').click(function() {
-            showWidth('paragraph', $('p').width());
+            showWidth('paragraph', $('p').width()!);
         });
         $('#getd').click(function() {
-            showWidth('document', $(document).width());
+            showWidth('document', $(document).width()!);
         });
         $('#getw').click(function() {
-            showWidth('window', $(window).width());
+            showWidth('window', $(window).width()!);
         });
     }
 
diff --git a/types/jquery/test/jquery-no-window-module-tests.ts b/types/jquery/test/jquery-no-window-module-tests.ts
new file mode 100644
index 0000000000..700be9d60c
--- /dev/null
+++ b/types/jquery/test/jquery-no-window-module-tests.ts
@@ -0,0 +1,8 @@
+import jQueryFactory = require('jquery');
+
+const jq = jQueryFactory(window);
+// ExpectType will report 'jq' as 'JQueryStatic<HTMLElement> & JQuery<HTMLElement>' even though the compiler seems to know that 'jq' is 'JQueryStatic<HTMLElement>'
+// // $ExpectType JQueryStatic<HTMLElement>
+// jq;
+// jq === jQuery();
+jq === jQuery;
diff --git a/types/jquery/test/jquery-slim-no-window-module-tests.ts b/types/jquery/test/jquery-slim-no-window-module-tests.ts
new file mode 100644
index 0000000000..fdbd34e06c
--- /dev/null
+++ b/types/jquery/test/jquery-slim-no-window-module-tests.ts
@@ -0,0 +1,8 @@
+import jQueryFactory = require('jquery/dist/jquery.slim');
+
+const jq = jQueryFactory(window);
+// ExpectType will report 'jq' as 'JQueryStatic<HTMLElement> & JQuery<HTMLElement>' even though the compiler seems to know that 'jq' is 'JQueryStatic<HTMLElement>'
+// // $ExpectType JQueryStatic<HTMLElement>
+// jq;
+// jq === jQuery();
+jq === jQuery;
diff --git a/types/jquery/test/jquery-slim-window-module-tests.ts b/types/jquery/test/jquery-slim-window-module-tests.ts
new file mode 100644
index 0000000000..8072811f08
--- /dev/null
+++ b/types/jquery/test/jquery-slim-window-module-tests.ts
@@ -0,0 +1,8 @@
+import * as jq from 'jquery/dist/jquery.slim';
+
+const $window = jq(window);
+// ExpectType will report 'jq' as 'JQueryStatic<HTMLElement> & JQuery<HTMLElement>' even though the compiler seems to know that 'jq' is 'JQuery<HTMLElement>'
+// // $ExpectType JQuery<HTMLElement>
+// $window;
+// $window === jq;
+$window === jq();
diff --git a/types/jquery/test/jquery-window-module-tests.ts b/types/jquery/test/jquery-window-module-tests.ts
new file mode 100644
index 0000000000..85f2c4c4ea
--- /dev/null
+++ b/types/jquery/test/jquery-window-module-tests.ts
@@ -0,0 +1,8 @@
+import * as jq from 'jquery';
+
+const $window = jq(window);
+// ExpectType will report 'jq' as 'JQueryStatic<HTMLElement> & JQuery<HTMLElement>' even though the compiler seems to know that 'jq' is 'JQuery<HTMLElement>'
+// // $ExpectType JQuery<HTMLElement>
+// $window;
+// $window === jq;
+$window === jq();
diff --git a/types/jquery/test/module-tests.ts b/types/jquery/test/module-tests.ts
deleted file mode 100644
index b55dee0370..0000000000
--- a/types/jquery/test/module-tests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory = require('jquery');
-const jq = factory(window);
-jq.noop();
-
-import slimFactory = require('jquery/dist/jquery.slim');
-const slim = slimFactory(window);
-slim.noop();
diff --git a/types/jquery/tsconfig.json b/types/jquery/tsconfig.json
index ebfa01c813..21d35a63da 100644
--- a/types/jquery/tsconfig.json
+++ b/types/jquery/tsconfig.json
@@ -22,6 +22,9 @@
         "jquery-tests.ts",
         "test/example-tests.ts",
         "test/longdesc-tests.ts",
-        "test/module-tests.ts"
+        "test/jquery-no-window-module-tests.ts",
+        "test/jquery-window-module-tests.ts",
+        "test/jquery-slim-no-window-module-tests.ts",
+        "test/jquery-slim-window-module-tests.ts"
     ]
 }