diff --git a/ace/ace.d.ts b/ace/ace.d.ts
index fe31dcc20..6a8e81625 100644
--- a/ace/ace.d.ts
+++ b/ace/ace.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Diullei Gomes <https://github.com/Diullei>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-module AceAjax {
+declare module AceAjax {
 
     export interface Delta {
         action: string;
@@ -75,7 +75,7 @@ module AceAjax {
 
         onTextInput(text);
     }
-    declare var KeyBinding: {
+    var KeyBinding: {
         new(editor: Editor): KeyBinding;
     }
 
@@ -184,7 +184,7 @@ module AceAjax {
         **/
         detach();
     }
-    declare var Anchor: {
+    var Anchor: {
         /**
          * Creates a new `Anchor` and associates it with a document.
          * @param doc The document to associate with the anchor
@@ -248,7 +248,7 @@ module AceAjax {
         **/
         getState(row: number): string;
     }
-    declare var BackgroundTokenizer: {
+    var BackgroundTokenizer: {
         /**
          * Creates a new `BackgroundTokenizer` object.
          * @param tokenizer The tokenizer to use
@@ -435,7 +435,7 @@ module AceAjax {
         **/
         positionToIndex(pos: Position, startRow: number): number;
     }
-    declare var Document: {
+    var Document: {
         /**
          * Creates a new `Document`. If `text` is included, the `Document` contains those strings; otherwise, it's empty.
          * @param text The starting text
@@ -1011,7 +1011,7 @@ module AceAjax {
         **/
         getScreenLength(): number;
     }
-    declare var EditSession: {
+    var EditSession: {
         /**
          * Sets up a new `EditSession` and associates it with the given `Document` and `TextMode`.
          * @param text [If `text` is a `Document`, it associates the `EditSession` with it. Otherwise, a new `Document` is created, with the initial text]{: #textParam}
@@ -1702,7 +1702,7 @@ module AceAjax {
 
     }
 
-    declare var Editor: {    
+    var Editor: {    
         /**
          * Creates a new `Editor` object.
          * @param renderer Associated `VirtualRenderer` that draws everything
@@ -1761,7 +1761,7 @@ module AceAjax {
         **/
         cancel();
     }
-    declare var PlaceHolder: {
+    var PlaceHolder: {
         /**
          * - @param session (Document): The document to associate with the anchor
          * - @param length (Number): The starting row position
@@ -1995,7 +1995,7 @@ module AceAjax {
      * @param endRow The ending row
      * @param endColumn The ending column
     **/
-    declare var Range: {
+    var Range: {
         fromPoints(pos1: Position, pos2: Position): Range;
         new(startRow: number, startColumn: number, endRow: number, endColumn: number): Range;
     }    
@@ -2005,7 +2005,7 @@ module AceAjax {
     ////////////////
 
     export interface RenderLoop { }
-    declare var RenderLoop: {
+    var RenderLoop: {
         new(): RenderLoop;
     }
 
@@ -2047,7 +2047,7 @@ module AceAjax {
         **/
         setScrollTop(scrollTop: number);
     }
-    declare var ScrollBar: {
+    var ScrollBar: {
         /**
          * Creates a new `ScrollBar`. `parent` is the owner of the scroll bar.
          * @param parent A DOM element
@@ -2102,7 +2102,7 @@ module AceAjax {
         **/
         replace(input: string, replacement: string): string;
     }
-    declare var Search: {
+    var Search: {
         /**
          * Creates a new `Search` object. The following search options are avaliable:
          * - `needle`: The string or regular expression you're looking for
@@ -2371,7 +2371,7 @@ module AceAjax {
         **/
         moveCursorToScreen(row: number, column: number, keepDesiredColumn: boolean);
     }
-    declare var Selection: {
+    var Selection: {
         /**
          * Creates a new `Selection` object.
          * @param session The session to use
@@ -2459,7 +2459,7 @@ module AceAjax {
         **/
         resize();
     }
-    declare var Split: {
+    var Split: {
         new(): Split;
     }
 
@@ -2497,7 +2497,7 @@ module AceAjax {
         **/
         getCurrentTokenColumn(): number;
     }
-    declare var TokenIterator: {
+    var TokenIterator: {
         /**
          * Creates a new token iterator object. The inital token index is set to the provided row and column coordinates.
          * @param session The session to associate with
@@ -2522,7 +2522,7 @@ module AceAjax {
         **/
         getLineTokens(): any;
     }
-    declare var Tokenizer: {
+    var Tokenizer: {
         /**
          * Constructs a new tokenizer based on the given rules and flags.
          * @param rules The highlighting rules
@@ -2576,7 +2576,7 @@ module AceAjax {
         hasRedo(): boolean;
 
     }
-    declare var UndoManager: {
+    var UndoManager: {
         /**
          * Resets the current undo state and creates a new `UndoManager`.
         **/
@@ -2924,7 +2924,7 @@ module AceAjax {
         destroy();
 
     }
-    declare var VirtualRenderer: {
+    var VirtualRenderer: {
         /**
          * Constructs a new `VirtualRenderer` within the `container` specified, applying the given `theme`.
          * @param container The root element of the editor
diff --git a/ace/tests/ace-anchor-tests.ts b/ace/tests/ace-anchor-tests.ts
index 40e81600a..08ca8f43f 100644
--- a/ace/tests/ace-anchor-tests.ts
+++ b/ace/tests/ace-anchor-tests.ts
@@ -1,6 +1,7 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var exports = {
 
     "test create anchor" : function() {
         var doc = new AceAjax.Document("juhu");
diff --git a/ace/tests/ace-background_tokenizer-tests.ts b/ace/tests/ace-background_tokenizer-tests.ts
index 8c29358a4..8f54bae51 100644
--- a/ace/tests/ace-background_tokenizer-tests.ts
+++ b/ace/tests/ace-background_tokenizer-tests.ts
@@ -1,5 +1,7 @@
 /// <reference path="../ace.d.ts" />
 
+var assert: any;
+
 function forceTokenize(session) {
     for (var i = 0, l = session.getLength(); i < l; i++)
         session.getTokens(i)
@@ -11,7 +13,7 @@ function testStates(session, states) {
     assert.ok(l == states.length)
 }
 
-exports = {
+var exports = {
 
     "test background tokenizer update on session change": function() {
         var doc = new AceAjax.EditSession([
diff --git a/ace/tests/ace-default-tests.ts b/ace/tests/ace-default-tests.ts
index dcd1ab103..f8a280c1a 100644
--- a/ace/tests/ace-default-tests.ts
+++ b/ace/tests/ace-default-tests.ts
@@ -1,5 +1,6 @@
 /// <reference path="../ace.d.ts" />
 
+var assert: any;
 var editor = ace.edit("editor");
 editor.setTheme("ace/theme/monokai");
 editor.getSession().setMode("ace/mode/javascript");
diff --git a/ace/tests/ace-document-tests.ts b/ace/tests/ace-document-tests.ts
index 1f3e0a9a2..7fc342f74 100644
--- a/ace/tests/ace-document-tests.ts
+++ b/ace/tests/ace-document-tests.ts
@@ -1,6 +1,7 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var exports = {
     "test: insert text in line": function() {
         var doc = new AceAjax.Document(["12", "34"]);
 
diff --git a/ace/tests/ace-edit_session-tests.ts b/ace/tests/ace-edit_session-tests.ts
index 12a3ce5bf..caa2f1729 100644
--- a/ace/tests/ace-edit_session-tests.ts
+++ b/ace/tests/ace-edit_session-tests.ts
@@ -1,6 +1,7 @@
 /// <reference path="../ace.d.ts" />
 
 var lang: any;
+var assert: any;
 
 function createFoldTestSession() {
     var lines = [
@@ -26,7 +27,7 @@ function assertArray(a, b) {
     }
 }
 
-exports = {
+var exports = {
 
    "test: find matching opening bracket in Text mode": function() {
        var session = new AceAjax.EditSession(["(()(", "())))"]);
diff --git a/ace/tests/ace-editor1-tests.ts b/ace/tests/ace-editor1-tests.ts
index ed8b3b3e8..78d3aff04 100644
--- a/ace/tests/ace-editor1-tests.ts
+++ b/ace/tests/ace-editor1-tests.ts
@@ -1,6 +1,7 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var exports = {
 
     setUp: function(next) {
         this.session1 = new AceAjax.EditSession(["abc", "def"]);
diff --git a/ace/tests/ace-editor_highlight_selected_word-tests.ts b/ace/tests/ace-editor_highlight_selected_word-tests.ts
index 7e06c8c50..e02f32366 100644
--- a/ace/tests/ace-editor_highlight_selected_word-tests.ts
+++ b/ace/tests/ace-editor_highlight_selected_word-tests.ts
@@ -27,10 +27,13 @@ function callHighlighterUpdate(session: AceAjax.IEditSession, firstRow: number,
     return rangeCount;
 }
 
-exports = {
+var assert: any;
+var renderer: AceAjax.VirtualRenderer;
+
+var exports = {
     setUp: function(next) {
         var session = new AceAjax.EditSession(lipsum);
-        editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         var selection = session.getSelection();
         next();
     } ,
@@ -38,7 +41,7 @@ exports = {
     "test: highlight selected words by default": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         assert.equal(editor.getHighlightSelectedWord(), true);
     } ,
@@ -46,7 +49,7 @@ exports = {
     "test: highlight a word": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(0, 9);
         selection.selectWord();
@@ -63,7 +66,7 @@ exports = {
     "test: highlight a word and clear highlight": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(0, 8);
         selection.selectWord();
@@ -79,7 +82,7 @@ exports = {
     "test: highlight another word": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         selection.moveCursorTo(0, 14);
         selection.selectWord();
@@ -92,7 +95,7 @@ exports = {
     "test: no selection, no highlight": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         selection.clearSelection();
         assert.equal(callHighlighterUpdate(session, 0, 0), 0);
@@ -101,7 +104,7 @@ exports = {
     "test: select a word, no highlight": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         selection.moveCursorTo(0, 14);
         selection.selectWord();
@@ -116,7 +119,7 @@ exports = {
     "test: select a word with no matches": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.setHighlightSelectedWord(true);
 
@@ -143,7 +146,7 @@ exports = {
     "test: partial word selection 1": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         selection.moveCursorTo(0, 14);
         selection.selectWord();
@@ -157,7 +160,7 @@ exports = {
     "test: partial word selection 2": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         selection.moveCursorTo(0, 13);
         selection.selectWord();
@@ -171,7 +174,7 @@ exports = {
     "test: partial word selection 3": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         selection.moveCursorTo(0, 14);
         selection.selectWord();
@@ -186,7 +189,7 @@ exports = {
     "test: select last word": function () {
         var selection = session.getSelection();
         var session = new AceAjax.EditSession(lipsum);
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         selection.moveCursorTo(0, 1);
 
diff --git a/ace/tests/ace-editor_navigation-tests.ts b/ace/tests/ace-editor_navigation-tests.ts
index c97ee0cd2..b68ae9b9d 100644
--- a/ace/tests/ace-editor_navigation-tests.ts
+++ b/ace/tests/ace-editor_navigation-tests.ts
@@ -1,6 +1,8 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var renderer: AceAjax.VirtualRenderer;
+var exports = {
     createEditSession: function (rows, cols) {
         var line = new Array(cols + 1).join("a");
         var text = new Array(rows).join(line + "\n") + line;
@@ -9,7 +11,7 @@ exports = {
 
     "test: navigate to end of file should scroll the last line into view": function () {
         var doc = this.createEditSession(200, 10);
-        var editor = new AceAjax.Editor(new MockRenderer(), doc);
+        var editor = new AceAjax.Editor(renderer, doc);
 
         editor.navigateFileEnd();
         var cursor = editor.getCursorPosition();
@@ -20,7 +22,7 @@ exports = {
 
     "test: navigate to start of file should scroll the first row into view": function () {
         var doc = this.createEditSession(200, 10);
-        var editor = new AceAjax.Editor(new MockRenderer(), doc);
+        var editor = new AceAjax.Editor(renderer, doc);
 
         editor.moveCursorTo(editor.getLastVisibleRow() + 20);
         editor.navigateFileStart();
@@ -29,7 +31,7 @@ exports = {
     },
 
     "test: goto hidden line should scroll the line into the middle of the viewport": function () {
-        var editor = new AceAjax.Editor(new MockRenderer(), this.createEditSession(200, 5));
+        var editor = new AceAjax.Editor(renderer, this.createEditSession(200, 5));
 
         editor.navigateTo(0, 0);
         editor.gotoLine(101);
@@ -63,7 +65,7 @@ exports = {
     },
 
     "test: goto visible line should only move the cursor and not scroll": function () {
-        var editor = new AceAjax.Editor(new MockRenderer(), this.createEditSession(200, 5));
+        var editor = new AceAjax.Editor(renderer, this.createEditSession(200, 5));
 
         editor.navigateTo(0, 0);
         editor.gotoLine(12);
@@ -77,7 +79,7 @@ exports = {
     },
 
     "test: navigate from the end of a long line down to a short line and back should maintain the curser column": function () {
-        var editor = new AceAjax.Editor(new MockRenderer(), new AceAjax.EditSession(["123456", "1"]));
+        var editor = new AceAjax.Editor(renderer, new AceAjax.EditSession(["123456", "1"]));
 
         editor.navigateTo(0, 6);
         assert.position(editor.getCursorPosition(), 0, 6);
@@ -90,7 +92,7 @@ exports = {
     },
 
     "test: reset desired column on navigate left or right": function () {
-        var editor = new AceAjax.Editor(new MockRenderer(), new AceAjax.EditSession(["123456", "12"]));
+        var editor = new AceAjax.Editor(renderer, new AceAjax.EditSession(["123456", "12"]));
 
         editor.navigateTo(0, 6);
         assert.position(editor.getCursorPosition(), 0, 6);
@@ -106,7 +108,7 @@ exports = {
     },
 
     "test: typing text should update the desired column": function () {
-        var editor = new AceAjax.Editor(new MockRenderer(), new AceAjax.EditSession(["1234", "1234567890"]));
+        var editor = new AceAjax.Editor(renderer, new AceAjax.EditSession(["1234", "1234567890"]));
 
         editor.navigateTo(0, 3);
         editor.insert("juhu");
diff --git a/ace/tests/ace-editor_text_edit-tests.ts b/ace/tests/ace-editor_text_edit-tests.ts
index 9d618acc6..623183016 100644
--- a/ace/tests/ace-editor_text_edit-tests.ts
+++ b/ace/tests/ace-editor_text_edit-tests.ts
@@ -1,9 +1,12 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var renderer: AceAjax.VirtualRenderer;
+var mode: any;
+var exports = {
     "test: delete line from the middle": function () {
         var session = new AceAjax.EditSession(["a", "b", "c", "d"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(1, 1);
         editor.removeLines();
@@ -29,7 +32,7 @@ exports = {
 
     "test: delete multiple selected lines": function () {
         var session = new AceAjax.EditSession(["a", "b", "c", "d"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(1, 1);
         editor.getSelection().selectDown();
@@ -41,7 +44,7 @@ exports = {
 
     "test: delete first line": function () {
         var session = new AceAjax.EditSession(["a", "b", "c"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.removeLines();
 
@@ -51,7 +54,7 @@ exports = {
 
     "test: delete last should also delete the new line of the previous line": function () {
         var session = new AceAjax.EditSession(["a", "b", "c", ""].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(3, 0);
 
@@ -66,7 +69,7 @@ exports = {
 
     "test: indent block": function () {
         var session = new AceAjax.EditSession(["a12345", "b12345", "c12345"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(1, 3);
         editor.getSelection().selectDown();
@@ -84,7 +87,7 @@ exports = {
 
     "test: indent selected lines": function () {
         var session = new AceAjax.EditSession(["a12345", "b12345", "c12345"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(1, 0);
         editor.getSelection().selectDown();
@@ -94,8 +97,8 @@ exports = {
     },
 
     "test: no auto indent if cursor is before the {": function () {
-        var session = new AceAjax.EditSession("{", new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession("{",mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(0, 0);
         editor.onTextInput("\n");
@@ -104,7 +107,7 @@ exports = {
 
     "test: outdent block": function () {
         var session = new AceAjax.EditSession(["        a12345", "    b12345", "        c12345"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(0, 5);
         editor.getSelection().selectDown();
@@ -129,7 +132,7 @@ exports = {
 
     "test: outent without a selection should update cursor": function () {
         var session = new AceAjax.EditSession("        12");
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(0, 3);
         editor.blockOutdent("  ");
@@ -139,8 +142,8 @@ exports = {
     },
 
     "test: comment lines should perserve selection": function () {
-        var session = new AceAjax.EditSession(["  abc", "cde"].join("\n"), new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession(["  abc", "cde"].join("\n"),mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(0, 2);
         editor.getSelection().selectDown();
@@ -154,8 +157,8 @@ exports = {
     },
 
     "test: uncomment lines should perserve selection": function () {
-        var session = new AceAjax.EditSession(["//  abc", "//cde"].join("\n"), new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession(["//  abc", "//cde"].join("\n"),mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(0, 1);
         editor.getSelection().selectDown();
@@ -169,8 +172,8 @@ exports = {
     },
 
     "test: toggle comment lines twice should return the original text": function () {
-        var session = new AceAjax.EditSession(["  abc", "cde", "fg"], new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession(["  abc", "cde", "fg"], mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(0, 0);
         editor.getSelection().selectDown();
@@ -185,8 +188,8 @@ exports = {
 
     "test: comment lines - if the selection end is at the line start it should stay there": function () {
         //select down
-        var session = new AceAjax.EditSession(["abc", "cde"].join("\n"), new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession(["abc", "cde"].join("\n"),mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(0, 0);
         editor.getSelection().selectDown();
@@ -195,8 +198,8 @@ exports = {
         assert.range(editor.getSelectionRange(), 0, 2, 1, 0);
 
         // select up
-        var session = new AceAjax.EditSession(["abc", "cde"].join("\n"), new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession(["abc", "cde"].join("\n"),mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(1, 0);
         editor.getSelection().selectUp();
@@ -207,7 +210,7 @@ exports = {
 
     "test: move lines down should select moved lines": function () {
         var session = new AceAjax.EditSession(["11", "22", "33", "44"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(0, 1);
         editor.getSelection().selectDown();
@@ -234,7 +237,7 @@ exports = {
 
     "test: move lines up should select moved lines": function () {
         var session = new AceAjax.EditSession(["11", "22", "33", "44"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(2, 1);
         editor.getSelection().selectDown();
@@ -254,7 +257,7 @@ exports = {
 
     "test: move line without active selection should not move cursor relative to the moved line": function () {
         var session = new AceAjax.EditSession(["11", "22", "33", "44"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(1, 1);
         editor.clearSelection();
@@ -272,7 +275,7 @@ exports = {
 
     "test: copy lines down should select lines and place cursor at the selection start": function () {
         var session = new AceAjax.EditSession(["11", "22", "33", "44"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(1, 1);
         editor.getSelection().selectDown();
@@ -287,7 +290,7 @@ exports = {
 
     "test: copy lines up should select lines and place cursor at the selection start": function () {
         var session = new AceAjax.EditSession(["11", "22", "33", "44"].join("\n"));
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.moveCursorTo(1, 1);
         editor.getSelection().selectDown();
@@ -302,7 +305,7 @@ exports = {
 
     "test: input a tab with soft tab should convert it to spaces": function () {
         var session = new AceAjax.EditSession("");
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         session.setTabSize(2);
         session.setUseSoftTabs(true);
@@ -317,7 +320,7 @@ exports = {
 
     "test: input tab without soft tabs should keep the tab character": function () {
         var session = new AceAjax.EditSession("");
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         session.setUseSoftTabs(false);
 
@@ -331,7 +334,7 @@ exports = {
         session.setUndoManager(undoManager);
 
         var initialText = session.toString();
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
 
         editor.removeLines();
         var step1 = session.toString();
@@ -361,7 +364,7 @@ exports = {
     "test: remove left should remove character left of the cursor": function () {
         var session = new AceAjax.EditSession(["123", "456"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 1);
         editor.remove("left");
         assert.equal(session.toString(), "123\n56");
@@ -370,7 +373,7 @@ exports = {
     "test: remove left should remove line break if cursor is at line start": function () {
         var session = new AceAjax.EditSession(["123", "456"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 0);
         editor.remove("left");
         assert.equal(session.toString(), "123456");
@@ -381,7 +384,7 @@ exports = {
         session.setUseSoftTabs(true);
         session.setTabSize(4);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 8);
         editor.remove("left");
         assert.equal(session.toString(), "123\n    456");
@@ -390,7 +393,7 @@ exports = {
     "test: transpose at line start should be a noop": function () {
         var session = new AceAjax.EditSession(["123", "4567", "89"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 0);
         editor.transposeLetters();
 
@@ -400,7 +403,7 @@ exports = {
     "test: transpose in line should swap the charaters before and after the cursor": function () {
         var session = new AceAjax.EditSession(["123", "4567", "89"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 2);
         editor.transposeLetters();
 
@@ -410,7 +413,7 @@ exports = {
     "test: transpose at line end should swap the last two characters": function () {
         var session = new AceAjax.EditSession(["123", "4567", "89"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 4);
         editor.transposeLetters();
 
@@ -420,7 +423,7 @@ exports = {
     "test: transpose with non empty selection should be a noop": function () {
         var session = new AceAjax.EditSession(["123", "4567", "89"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 1);
         editor.getSelection().selectRight();
         editor.transposeLetters();
@@ -431,7 +434,7 @@ exports = {
     "test: transpose should move the cursor behind the last swapped character": function () {
         var session = new AceAjax.EditSession(["123", "4567", "89"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 2);
         editor.transposeLetters();
         assert.position(editor.getCursorPosition(), 1, 3);
@@ -440,7 +443,7 @@ exports = {
     "test: remove to line end": function () {
         var session = new AceAjax.EditSession(["123", "4567", "89"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 2);
         editor.removeToLineEnd();
         assert.equal(session.getValue(), ["123", "45", "89"].join("\n"));
@@ -449,7 +452,7 @@ exports = {
     "test: remove to line end at line end should remove the new line": function () {
         var session = new AceAjax.EditSession(["123", "4567", "89"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 4);
         editor.removeToLineEnd();
         assert.position(editor.getCursorPosition(), 1, 4);
@@ -459,7 +462,7 @@ exports = {
     "test: transform selection to uppercase": function () {
         var session = new AceAjax.EditSession(["ajax", "dot", "org"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 0);
         editor.getSelection().selectLineEnd();
         editor.toUpperCase()
@@ -469,7 +472,7 @@ exports = {
     "test: transform word to uppercase": function () {
         var session = new AceAjax.EditSession(["ajax", "dot", "org"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 0);
         editor.toUpperCase()
         assert.equal(session.getValue(), ["ajax", "DOT", "org"].join("\n"));
@@ -479,7 +482,7 @@ exports = {
     "test: transform selection to lowercase": function () {
         var session = new AceAjax.EditSession(["AJAX", "DOT", "ORG"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 0);
         editor.getSelection().selectLineEnd();
         editor.toLowerCase()
@@ -489,7 +492,7 @@ exports = {
     "test: transform word to lowercase": function () {
         var session = new AceAjax.EditSession(["AJAX", "DOT", "ORG"]);
 
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         editor.moveCursorTo(1, 0);
         editor.toLowerCase()
         assert.equal(session.getValue(), ["AJAX", "dot", "ORG"].join("\n"));
diff --git a/ace/tests/ace-multi_select-tests.ts b/ace/tests/ace-multi_select-tests.ts
index ade1493e2..68c7d1af9 100644
--- a/ace/tests/ace-multi_select-tests.ts
+++ b/ace/tests/ace-multi_select-tests.ts
@@ -1,5 +1,8 @@
 /// <reference path="../ace.d.ts" />
 
+var assert: any;
+var editor: any;
+var renderer: any;
 var exec = function (name?, times?, args?) {
     do {
         editor.commands.exec(name, editor, args);
@@ -9,7 +12,7 @@ var testRanges = function (str) {
     assert.equal(editor.selection.getAllRanges() + "", str + "");
 }
 
-exports = {
+var exports = {
 
         name: "ACE multi_select.js",
 
@@ -19,7 +22,7 @@ exports = {
                 "    wtt.w",
                 "    wtt.w"
             ]);
-            editor = new AceAjax.Editor(new MockRenderer(), doc);
+            editor = new AceAjax.Editor(renderer, doc);
 
             editor.navigateFileEnd();
             exec("selectMoreBefore", 3);
@@ -45,7 +48,7 @@ exports = {
             "    wtt.w",
             "    wtt.we"
         ]);
-        editor = new AceAjax.Editor(new MockRenderer(), doc);
+        editor = new AceAjax.Editor(renderer, doc);
 
         editor.selectMoreLines(1);
         testRanges("Range: [0/0] -> [0/0],Range: [1/0] -> [1/0]");
@@ -67,7 +70,7 @@ exports = {
             "    wtt.w",
             "    wtt.w"
         ]);
-        editor = new AceAjax.Editor(new MockRenderer(), doc);
+        editor = new AceAjax.Editor(renderer, doc);
 
         editor.selectMoreLines(1)
         testRanges("Range: [0/0] -> [0/0],Range: [1/0] -> [1/0]");
@@ -87,7 +90,7 @@ exports = {
             "    wtt.w",
             "    wtt.w"
         ]);
-        editor = new AceAjax.Editor(new MockRenderer(), doc);
+        editor = new AceAjax.Editor(renderer, doc);
 
         var selection = editor.selection;
 
diff --git a/ace/tests/ace-placeholder-tests.ts b/ace/tests/ace-placeholder-tests.ts
index 124554cf7..b9693da37 100644
--- a/ace/tests/ace-placeholder-tests.ts
+++ b/ace/tests/ace-placeholder-tests.ts
@@ -1,10 +1,13 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var renderer: AceAjax.VirtualRenderer;
+var mode: any;
+var exports = {
 
     "test: simple at the end appending of text": function () {
-        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]);
 
@@ -20,8 +23,8 @@ exports = {
     },
 
     "test: inserting text outside placeholder": function () {
-        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);\n", new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);\n", mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]);
 
@@ -31,8 +34,8 @@ exports = {
     },
 
     "test: insertion at the beginning": function (next) {
-        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         var p = new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]);
 
@@ -49,8 +52,8 @@ exports = {
     },
 
     "test: detaching placeholder": function () {
-        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         var p = new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]);
 
@@ -63,8 +66,8 @@ exports = {
     },
 
     "test: events": function () {
-        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", new JavaScriptMode());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", mode);
+        var editor = new AceAjax.Editor(renderer, session);
 
         var p = new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]);
         var entered = false;
@@ -86,9 +89,9 @@ exports = {
     },
 
     "test: cancel": function (next) {
-        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", new JavaScriptMode());
+        var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", mode);
         session.setUndoManager(new AceAjax.UndoManager());
-        var editor = new AceAjax.Editor(new MockRenderer(), session);
+        var editor = new AceAjax.Editor(renderer, session);
         var p = new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]);
 
         editor.moveCursorTo(0, 5);
diff --git a/ace/tests/ace-range-tests.ts b/ace/tests/ace-range-tests.ts
index 8a1b1ccc6..8e560e8d2 100644
--- a/ace/tests/ace-range-tests.ts
+++ b/ace/tests/ace-range-tests.ts
@@ -1,6 +1,7 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var exports = {
 
     name: "ACE range.js",
 
diff --git a/ace/tests/ace-range_list-tests.ts b/ace/tests/ace-range_list-tests.ts
index 83f3c8a91..3a531579e 100644
--- a/ace/tests/ace-range_list-tests.ts
+++ b/ace/tests/ace-range_list-tests.ts
@@ -1,5 +1,6 @@
 /// <reference path="../ace.d.ts" />
 
+var assert: any;
 function flatten(rangeList) {
     var points = [];
     rangeList.ranges.forEach(function (r) {
@@ -11,7 +12,7 @@ function testRangeList(rangeList, points) {
     assert.equal("" + flatten(rangeList), "" + points);
 }
 
-exports = {
+var exports = {
 
         name: "ACE range_list.js",
 
diff --git a/ace/tests/ace-search-tests.ts b/ace/tests/ace-search-tests.ts
index c30139d65..14b53397b 100644
--- a/ace/tests/ace-search-tests.ts
+++ b/ace/tests/ace-search-tests.ts
@@ -1,6 +1,7 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var exports = {
     "test: configure the search object": function () {
         var search = new AceAjax.Search();
         search.set({
diff --git a/ace/tests/ace-selection-tests.ts b/ace/tests/ace-selection-tests.ts
index 030cdff66..884631085 100644
--- a/ace/tests/ace-selection-tests.ts
+++ b/ace/tests/ace-selection-tests.ts
@@ -1,6 +1,7 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var exports = {
     createSession: function (rows, cols) {
         var line = new Array(cols + 1).join("a");
         var text = new Array(rows).join(line + "\n") + line;
diff --git a/ace/tests/ace-token_iterator-tests.ts b/ace/tests/ace-token_iterator-tests.ts
index 75260e95a..892d781b9 100644
--- a/ace/tests/ace-token_iterator-tests.ts
+++ b/ace/tests/ace-token_iterator-tests.ts
@@ -1,6 +1,8 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var mode: any;
+var exports = {
     "test: token iterator initialization in JavaScript document": function () {
         var lines = [
             "function foo(items) {",
@@ -9,7 +11,7 @@ exports = {
             "    } // Real Tab.",
             "}"
         ];
-        var session = new AceAjax.EditSession(lines.join("\n"), new JavaScriptMode());
+        var session = new AceAjax.EditSession(lines.join("\n"),mode);
 
         var iterator = new AceAjax.TokenIterator(session, 0, 0);
         assert.equal(iterator.getCurrentToken().value, "function");
@@ -96,7 +98,7 @@ exports = {
             "    } // Real Tab.",
             "}"
         ];
-        var session = new AceAjax.EditSession(lines.join("\n"), new JavaScriptMode());
+        var session = new AceAjax.EditSession(lines.join("\n"),mode);
 
         var tokens = [];
         var len = session.getLength();
@@ -118,7 +120,7 @@ exports = {
             "     } // Real Tab.",
             "}"
         ];
-        var session = new AceAjax.EditSession(lines.join("\n"), new JavaScriptMode());
+        var session = new AceAjax.EditSession(lines.join("\n"),mode);
 
         var tokens = [];
         var len = session.getLength();
@@ -140,7 +142,7 @@ exports = {
             "    } // Real Tab.",
             "}"
         ];
-        var session = new AceAjax.EditSession(lines.join("\n"), new JavaScriptMode());
+        var session = new AceAjax.EditSession(lines.join("\n"),mode);
 
         var iterator = new AceAjax.TokenIterator(session, 0, 0);
 
diff --git a/ace/tests/ace-virtual_renderer-tests.ts b/ace/tests/ace-virtual_renderer-tests.ts
index 83372ad34..51f349dad 100644
--- a/ace/tests/ace-virtual_renderer-tests.ts
+++ b/ace/tests/ace-virtual_renderer-tests.ts
@@ -1,6 +1,7 @@
 /// <reference path="../ace.d.ts" />
 
-exports = {
+var assert: any;
+var exports = {
     "test: screen2text the column should be rounded to the next character edge": function () {
         var el = document.createElement("div");