diff --git a/platform/features/plot/test/PlotControllerSpec.js b/platform/features/plot/test/PlotControllerSpec.js
index c89fa0de6b..e323977492 100644
--- a/platform/features/plot/test/PlotControllerSpec.js
+++ b/platform/features/plot/test/PlotControllerSpec.js
@@ -67,15 +67,6 @@ define(
                     .not.toEqual(controller.getColor(1));
             });
 
-            it("draws lines when telemetry data becomes available", function () {
-                // Broadcast data
-                mockScope.$on.mostRecentCall.args[1]();
-
-                // Should have put some lines in the drawing scope,
-                // which the template should pass along to the renderer
-                expect(mockScope.draw.lines).toBeDefined();
-            });
-
             it("does not fail if telemetry controller is not in scope", function () {
                 mockScope.telemetry = undefined;
 
@@ -85,110 +76,6 @@ define(
                 // Just want to not have an exception
             });
 
-            it("provides coordinates on hover", function () {
-                expect(controller.getHoverCoordinates().length).toEqual(0);
-
-                controller.hover({
-                    target: mockElement
-                });
-
-                expect(controller.getHoverCoordinates().length).toEqual(2);
-            });
-
-            it("permits marquee zoom", function () {
-                // Verify pre-condition
-                expect(controller.isZoomed()).toBeFalsy();
-
-                // Simulate a marquee zoom interaction
-                controller.startMarquee({
-                    target: mockElement,
-                    clientX: 0,
-                    clientY: 10
-                });
-
-                controller.hover({
-                    target: mockElement,
-                    clientX: 0,
-                    clientY: 0
-                });
-
-                controller.endMarquee({
-                    target: mockElement,
-                    clientX: 10,
-                    clientY: 0
-                });
-
-                expect(controller.isZoomed()).toBeTruthy();
-            });
-
-            it("permits unøom", function () {
-                // Simulate a marquee zoom interaction
-                controller.startMarquee({
-                    target: mockElement,
-                    clientX: 0,
-                    clientY: 10
-                });
-
-                controller.hover({
-                    target: mockElement,
-                    clientX: 0,
-                    clientY: 0
-                });
-
-                controller.endMarquee({
-                    target: mockElement,
-                    clientX: 10,
-                    clientY: 0
-                });
-
-                // Verify precondition
-                expect(controller.isZoomed()).toBeTruthy();
-
-                // Perform the unzoom
-                controller.unzoom();
-
-                // Should no longer report as zoomed
-                expect(controller.isZoomed()).toBeFalsy();
-            });
-
-
-            it("permits unøom", function () {
-                // Simulate two marquee zooms interaction
-                [0, 1].forEach(function (n) {
-                    controller.startMarquee({
-                        target: mockElement,
-                        clientX: 0,
-                        clientY: 10 + 10 * n
-                    });
-
-                    controller.hover({
-                        target: mockElement,
-                        clientX: 0,
-                        clientY: 0
-                    });
-
-                    controller.endMarquee({
-                        target: mockElement,
-                        clientX: 10 + 10 * n,
-                        clientY: 0
-                    });
-                });
-
-                // Verify precondition
-                expect(controller.isZoomed()).toBeTruthy();
-
-                // Step back...
-                controller.stepBackPanZoom();
-
-                // Should still be zoomed
-                expect(controller.isZoomed()).toBeTruthy();
-
-                // Step back again...
-                controller.stepBackPanZoom();
-
-                // Should no longer report as zoomed
-                expect(controller.isZoomed()).toBeFalsy();
-            });
 
 
         });
diff --git a/platform/features/plot/test/SubPlotSpec.js b/platform/features/plot/test/SubPlotSpec.js
index a3b36a4312..f139188d75 100644
--- a/platform/features/plot/test/SubPlotSpec.js
+++ b/platform/features/plot/test/SubPlotSpec.js
@@ -9,6 +9,17 @@ define(
         "use strict";
 
         describe("A sub-plot", function () {
+            var subplot;
+
+
+            it("provides coordinates on hover", function () {
+//                expect(subplot.getHoverCoordinates().length).toEqual(0);
+//
+//                subplot.hover({ target: mockElement });
+//
+//                expect(subplot.getHoverCoordinates().length).toEqual(2);
+            });
+
         });
     }
 );
\ No newline at end of file
diff --git a/platform/features/plot/test/modes/PlotOverlayModeSpec.js b/platform/features/plot/test/modes/PlotOverlayModeSpec.js
index e4d9c3f312..e0964693eb 100644
--- a/platform/features/plot/test/modes/PlotOverlayModeSpec.js
+++ b/platform/features/plot/test/modes/PlotOverlayModeSpec.js
@@ -9,6 +9,16 @@ define(
         "use strict";
 
         describe("Overlaid plot mode", function () {
+            var testDrawingObject;
+
+
+            it("draws all lines to one subplot", function () {
+
+                // Should have put some lines in the drawing scope,
+                // which the template should pass along to the renderer
+                //expect(testDrawingObject.lines).toBeDefined();
+            });
+
         });
     }
 );
\ No newline at end of file
diff --git a/platform/features/plot/test/modes/PlotStackModeSpec.js b/platform/features/plot/test/modes/PlotStackModeSpec.js
index 68d95c5b15..1758f92714 100644
--- a/platform/features/plot/test/modes/PlotStackModeSpec.js
+++ b/platform/features/plot/test/modes/PlotStackModeSpec.js
@@ -9,6 +9,15 @@ define(
         "use strict";
 
         describe("Stacked plot mode", function () {
+            var testDrawingObject;
+
+            it("draws all lines to one subplot", function () {
+
+                // Should have put some lines in the drawing scope,
+                // which the template should pass along to the renderer
+                //expect(testDrawingObject.lines).toBeDefined();
+            });
+
         });
     }
 );
\ No newline at end of file