diff --git a/react-select/react-select-tests.tsx b/react-select/react-select-tests.tsx
index 444551a67..cc2cc7376 100644
--- a/react-select/react-select-tests.tsx
+++ b/react-select/react-select-tests.tsx
@@ -1,30 +1,69 @@
-
 /// <reference path="../react/react.d.ts" />
 /// <reference path="../react/react-dom.d.ts" />
 /// <reference path="./react-select.d.ts" />
 
-import * as React from "react"
-import * as ReactDOM from "react-dom"
+import * as React from "react";
+import * as ReactDOM from "react-dom";
 
-import * as Select from "react-select"
+import * as Select from "react-select";
+
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+
+import * as Select from "react-select";
 
 class SelectTest extends React.Component<React.Props<{}>, {}> {
 
     render() {
-        const options: ReactSelect.Option[] = [{ label: "Foo", value: "bar" }]
+        const options: ReactSelect.Option[] = [{ label: "Foo", value: "bar" }];
+        const onChange = (value: any) => console.log(value);
         return <div>
-           <Select options={options} />
-        </div>
+            <Select
+                name="test-select"
+                className="test-select"
+                key="1"
+                options={options}
+                matchPos={"any"}
+                matchProp={"any"}
+                multi={true}
+                onValueClick={onChange}
+                valueKey="github"
+                labelKey="name"
+                onChange={onChange}
+                simpleValue
+                value={options}
+                 />
+        </div>;
     }
-
 }
 
 class SelectAsyncTest extends React.Component<React.Props<{}>, {}> {
 
     render() {
+        const getOptions = (input: string, callback: Function) => {
+            setTimeout(function() {
+                callback(null, options);
+            }, 500);
+        };
+        const options: ReactSelect.Option[] = [{ label: "Foo", value: "bar" }];
+        const onChange = (value: any) => console.log(value);
         return <div>
-           <Select.Async />
-        </div>
+            <Select.Async
+                name="test-select"
+                className="test-select"
+                key="1"
+                matchPos={"any"}
+                matchProp={"any"}
+                multi={true}
+                onValueClick={onChange}
+                valueKey="github"
+                labelKey="name"
+                onChange={onChange}
+                simpleValue
+                value={options}
+                loadOptions={getOptions}
+            />
+        </div>;
     }
 
 }
diff --git a/react-select/react-select.d.ts b/react-select/react-select.d.ts
index c9e385a15..3414b4472 100644
--- a/react-select/react-select.d.ts
+++ b/react-select/react-select.d.ts
@@ -210,12 +210,16 @@ declare namespace ReactSelect {
     }
 
     interface ReactSelect extends  __React.ReactElement<ReactSelectProps> { }
-    interface ReactSelectClass extends __React.ComponentClass<ReactSelectProps> {
-        Async: __React.ComponentClass<ReactAsyncSelectProps>;
+    interface ReactSelectAsyncClass extends __React.ComponentClass<ReactAsyncSelectProps> {
     }
+    const Async: ReactSelectAsyncClass;
+    interface ReactSelectClass extends __React.ComponentClass<ReactSelectProps> {
+        Async: ReactSelectAsyncClass;
+    }
+
 }
 
 declare module "react-select" {
-    var select: ReactSelect.ReactSelectClass;
+    const select: ReactSelect.ReactSelectClass;
     export = select;
 }