diff --git a/codemirror/codemirror-tests.ts b/codemirror/codemirror-tests.ts
index fe849cd39..d81838ba9 100644
--- a/codemirror/codemirror-tests.ts
+++ b/codemirror/codemirror-tests.ts
@@ -1,15 +1,18 @@
 /// <reference path="codemirror.d.ts" />
 
-var myCodeMirror = CodeMirror(document.body);
+var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body);
 
-var myCodeMirror2 = CodeMirror(document.body, {
+var myCodeMirror2: CodeMirror.Editor = CodeMirror(document.body, {
     value: "function myScript(){return 100;}\n",
     mode: "javascript"
 });
 
-var myTextArea;
-var myCodeMirror3 = CodeMirror(function (elt) {
+var myTextArea: HTMLTextAreaElement;
+var myCodeMirror3: CodeMirror.Editor = CodeMirror(function (elt) {
     myTextArea.parentNode.replaceChild(elt, myTextArea);
 }, { value: myTextArea.value });
 
-var myCodeMirror4 = CodeMirror.fromTextArea(myTextArea);
\ No newline at end of file
+var myCodeMirror4: CodeMirror.Editor = CodeMirror.fromTextArea(myTextArea);
+
+var doc: CodeMirror.Doc = new CodeMirror.Doc('text');
+var doc2: CodeMirror.Doc = CodeMirror(document.body).getDoc();