diff --git a/lib/ace/editor_change_document_test.js b/lib/ace/editor_change_document_test.js
index fe833e3b..8bd2b937 100644
--- a/lib/ace/editor_change_document_test.js
+++ b/lib/ace/editor_change_document_test.js
@@ -46,7 +46,7 @@ var Buffer = require("ace/model/buffer").Buffer;
 var Editor = require("ace/editor").Editor;
 var Text = require("ace/mode/text").Mode;
 var JavaScriptMode = require("ace/mode/javascript").Mode;
-var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
+var MockRenderer = require("ace/view/window_view_mock").MockRenderer;
 var assert = require("ace/test/assertions");
 
 module.exports = {
diff --git a/lib/ace/editor_highlight_selected_word_test.js b/lib/ace/editor_highlight_selected_word_test.js
index 20e17fc4..78ce465c 100644
--- a/lib/ace/editor_highlight_selected_word_test.js
+++ b/lib/ace/editor_highlight_selected_word_test.js
@@ -45,7 +45,7 @@ define(function(require, exports, module) {
 
 var Buffer = require("ace/model/buffer").Buffer;
 var Editor = require("ace/editor").Editor;
-var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
+var MockRenderer = require("ace/view/window_view_mock").MockRenderer;
 var TextMode = require("ace/mode/text").Mode;
 var assert = require("ace/test/assertions");
 
diff --git a/lib/ace/editor_navigation_test.js b/lib/ace/editor_navigation_test.js
index f6b54c3e..d88c92aa 100644
--- a/lib/ace/editor_navigation_test.js
+++ b/lib/ace/editor_navigation_test.js
@@ -44,7 +44,7 @@ define(function(require, exports, module) {
 
 var Buffer = require("ace/model/buffer").Buffer;
 var Editor = require("ace/editor").Editor;
-var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
+var MockRenderer = require("ace/view/window_view_mock").MockRenderer;
 var assert = require("ace/test/assertions");
 
 module.exports = {
diff --git a/lib/ace/editor_text_edit_test.js b/lib/ace/editor_text_edit_test.js
index 2c1fc371..1e1a5c35 100644
--- a/lib/ace/editor_text_edit_test.js
+++ b/lib/ace/editor_text_edit_test.js
@@ -46,7 +46,7 @@ var Buffer = require("ace/model/buffer").Buffer;
 var Editor = require("ace/editor").Editor;
 var JavaScriptMode = require("ace/mode/javascript").Mode;
 var UndoManager = require("ace/undomanager").UndoManager;
-var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
+var MockRenderer = require("ace/view/window_view_mock").MockRenderer;
 var assert = require("ace/test/assertions");
 
 module.exports = {
diff --git a/lib/ace/model/buffer_test.js b/lib/ace/model/buffer_test.js
index 5e15482b..aee4ca15 100644
--- a/lib/ace/model/buffer_test.js
+++ b/lib/ace/model/buffer_test.js
@@ -47,7 +47,7 @@ var lang = require("pilot/lang");
 var Buffer = require("ace/model/buffer").Buffer;
 var Editor = require("ace/editor").Editor;
 var UndoManager = require("ace/undomanager").UndoManager;
-var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
+var MockRenderer = require("ace/view/window_view_mock").MockRenderer;
 var Range = require("ace/range").Range;
 var assert = require("ace/test/assertions");
 
diff --git a/lib/ace/test/mockrenderer.js b/lib/ace/view/window_view_mock.js
similarity index 65%
rename from lib/ace/test/mockrenderer.js
rename to lib/ace/view/window_view_mock.js
index 3c0c4342..66d82e6f 100644
--- a/lib/ace/test/mockrenderer.js
+++ b/lib/ace/view/window_view_mock.js
@@ -1,3 +1,4 @@
+
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -37,57 +38,62 @@
 
 define(function(require, exports, module) {
 
-var MockRenderer = exports.MockRenderer = function(visibleRowCount) {
+exports.MockRenderer = exports.WindowViewMock = WindowViewMock = function(visibleRowCount) {
     this.container = document.createElement("div");
     this.visibleRowCount = visibleRowCount || 20;
+    this.model = null;
 
     this.layerConfig = {
         firstVisibleRow : 0,
         lastVisibleRow : this.visibleRowCount
     };
 
-    this.isMockRenderer = true;
+    this.isWindowViewMock = true;
 };
 
 
-MockRenderer.prototype.getFirstVisibleRow = function() {
+WindowViewMock.prototype.getFirstVisibleRow = function() {
     return this.layerConfig.firstVisibleRow;
 };
 
-MockRenderer.prototype.getLastVisibleRow = function() {
+WindowViewMock.prototype.getLastVisibleRow = function() {
     return this.layerConfig.lastVisibleRow;
 };
 
-MockRenderer.prototype.getContainerElement = function() {
+WindowViewMock.prototype.getContainerElement = function() {
     return this.container;
 };
 
-MockRenderer.prototype.getMouseEventTarget = function() {
+WindowViewMock.prototype.getMouseEventTarget = function() {
     return this.container;
 };
 
-MockRenderer.prototype.getTextAreaContainer = function() {
+WindowViewMock.prototype.getTextAreaContainer = function() {
     return this.container;
 };
 
-MockRenderer.prototype.moveTextAreaToCursor = function() {
+WindowViewMock.prototype.moveTextAreaToCursor = function() {
 };
 
-MockRenderer.prototype.setSession = function(session) {
+WindowViewMock.prototype.setModel = function(model) {
+    this.model = model;
+};
+
+WindowViewMock.prototype.setSession = function(session) {
     this.session = session;
 };
 
-MockRenderer.prototype.getSession = function(session) {
+WindowViewMock.prototype.getSession = function(session) {
     return this.session;
 };
 
-MockRenderer.prototype.setTokenizer = function() {
+WindowViewMock.prototype.setTokenizer = function() {
 };
 
-MockRenderer.prototype.updateCursor = function() {
+WindowViewMock.prototype.updateCursor = function() {
 };
 
-MockRenderer.prototype.scrollToLine = function(line, center) {
+WindowViewMock.prototype.scrollToLine = function(line, center) {
     var lineHeight = { lineHeight: 16 };
     var row = 0;
     for (var l = 1; l < line; l++) {
@@ -100,7 +106,7 @@ MockRenderer.prototype.scrollToLine = function(line, center) {
     this.scrollToRow(row);
 };
 
-MockRenderer.prototype.scrollCursorIntoView = function() {
+WindowViewMock.prototype.scrollCursorIntoView = function() {
     var cursor = this.session.getSelection().getCursor();
     if (cursor.row < this.layerConfig.firstVisibleRow) {
         this.scrollToRow(cursor.row);
@@ -110,51 +116,51 @@ MockRenderer.prototype.scrollCursorIntoView = function() {
     }
 };
 
-MockRenderer.prototype.scrollToRow = function(row) {
+WindowViewMock.prototype.scrollToRow = function(row) {
     var row = Math.min(this.session.getLength() - this.visibleRowCount, Math.max(0,
                                                                           row));
     this.layerConfig.firstVisibleRow = row;
     this.layerConfig.lastVisibleRow = row + this.visibleRowCount;
 };
 
-MockRenderer.prototype.getScrollTopRow = function() {
+WindowViewMock.prototype.getScrollTopRow = function() {
   return this.layerConfig.firstVisibleRow;
 };
 
-MockRenderer.prototype.draw = function() {
+WindowViewMock.prototype.draw = function() {
 };
 
-MockRenderer.prototype.updateLines = function(startRow, endRow) {
+WindowViewMock.prototype.updateLines = function(startRow, endRow) {
 };
 
-MockRenderer.prototype.updateBackMarkers = function() {
+WindowViewMock.prototype.updateBackMarkers = function() {
 };
 
-MockRenderer.prototype.updateFrontMarkers = function() {
+WindowViewMock.prototype.updateFrontMarkers = function() {
 };
 
-MockRenderer.prototype.setBreakpoints = function() {
+WindowViewMock.prototype.setBreakpoints = function() {
 };
 
-MockRenderer.prototype.onResize = function() {
+WindowViewMock.prototype.onResize = function() {
 };
 
-MockRenderer.prototype.updateFull = function() {
+WindowViewMock.prototype.updateFull = function() {
 };
 
-MockRenderer.prototype.updateText = function() {
+WindowViewMock.prototype.updateText = function() {
 };
 
-MockRenderer.prototype.showCursor = function() {
+WindowViewMock.prototype.showCursor = function() {
 };
 
-MockRenderer.prototype.visualizeFocus = function() {
+WindowViewMock.prototype.visualizeFocus = function() {
 };
 
-MockRenderer.prototype.setAnnotations = function() {
+WindowViewMock.prototype.setAnnotations = function() {
 };
 
-MockRenderer.prototype.textToScreenCoordinates = function() {
+WindowViewMock.prototype.textToScreenCoordinates = function() {
     return {
         pageX: 0,
         pageY: 0