diff --git a/platform/commonUI/notification/src/NotificationIndicator.js b/platform/commonUI/notification/src/NotificationIndicator.js
index b1d20e8264..29a831d251 100644
--- a/platform/commonUI/notification/src/NotificationIndicator.js
+++ b/platform/commonUI/notification/src/NotificationIndicator.js
@@ -26,25 +26,10 @@ define(
     function () {
         "use strict";
 
-        function NotificationIndicator() {
-
-        }
+        function NotificationIndicator() {}
 
         NotificationIndicator.template = 'notificationIndicatorTemplate';
 
-        NotificationIndicator.prototype.getGlyph = function () {
-            return "A";
-        };
-        NotificationIndicator.prototype.getGlyphClass = function () {
-            return 'caution';
-        };
-        NotificationIndicator.prototype.getText = function () {
-            return "Notifications";
-        };
-        NotificationIndicator.prototype.getDescription = function () {
-            return "Notifications";
-        };
-
         return NotificationIndicator;
     }
 );
diff --git a/platform/commonUI/notification/src/NotificationIndicatorController.js b/platform/commonUI/notification/src/NotificationIndicatorController.js
index 21da649a8f..685152de9c 100644
--- a/platform/commonUI/notification/src/NotificationIndicatorController.js
+++ b/platform/commonUI/notification/src/NotificationIndicatorController.js
@@ -45,14 +45,11 @@ define(
              * Launch a dialog showing a list of current notifications.
              */
             $scope.showNotificationsList = function(){
-
-                var model = {
-                    title: "Messages"
-                };
-
-                model.messages = notificationService.notifications;
                 dialogService.getDialogResponse('overlay-message-list', {
-                    dialog: model,
+                    dialog: {
+                        title: "Messages",
+                        messages: notificationService.notifications
+                    },
                     cancel: function(){
                         dialogService.dismiss();
                     }
diff --git a/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js
new file mode 100644
index 0000000000..fa906012ae
--- /dev/null
+++ b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js
@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,describe,it,expect,beforeEach,waitsFor,jasmine */
+
+define(
+    ['../src/NotificationIndicatorController'],
+    function (NotificationIndicatorController) {
+        "use strict";
+
+        describe("The notification indicator controller ", function () {
+            var mockNotificationService,
+                mockScope,
+                mockDialogService;
+
+            beforeEach(function(){
+                mockNotificationService = jasmine.createSpy("notificationService");
+                mockScope = jasmine.createSpy("$scope");
+                mockDialogService = {
+                    getDialogResponse: function(template, model){},
+                    dismiss: function(){}
+                }
+
+                spyOn(mockDialogService, 'getDialogResponse');
+                spyOn(mockDialogService, 'dismiss');
+            });
+
+            it("exposes the highest notification severity to the template", function() {
+                mockNotificationService.highest = {
+                    severity: "error"
+                };
+                var controller = new NotificationIndicatorController(mockScope, mockNotificationService, mockDialogService);
+                expect(mockScope.highest).toBeTruthy();
+                expect(mockScope.highest.severity).toBe("error");
+            });
+
+            it("invokes the dialog service to show list of messages", function() {
+                var controller = new NotificationIndicatorController(mockScope, mockNotificationService, mockDialogService);
+                expect(mockScope.showNotificationsList).toBeDefined();
+                mockScope.showNotificationsList();
+                expect(mockDialogService.getDialogResponse).toHaveBeenCalled();
+                expect(mockDialogService.getDialogResponse.mostRecentCall.args[0]).toBe('overlay-message-list');
+                expect(mockDialogService.getDialogResponse.mostRecentCall.args[1].dialog).toBeDefined();
+                expect(mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel).toBeDefined();
+                //Invoke the cancel callback
+                mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel();
+                expect(mockDialogService.dismiss).toHaveBeenCalled();
+            });
+
+            it("provides a means of dismissing the message list", function() {
+                var controller = new NotificationIndicatorController(mockScope, mockNotificationService, mockDialogService);
+                expect(mockScope.showNotificationsList).toBeDefined();
+                mockScope.showNotificationsList();
+                expect(mockDialogService.getDialogResponse).toHaveBeenCalled();
+                expect(mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel).toBeDefined();
+                //Invoke the cancel callback
+                mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel();
+                expect(mockDialogService.dismiss).toHaveBeenCalled();
+            })
+
+        });
+    });
\ No newline at end of file
diff --git a/platform/commonUI/notification/test/suite.json b/platform/commonUI/notification/test/suite.json
index 08238b16c0..2b52722303 100644
--- a/platform/commonUI/notification/test/suite.json
+++ b/platform/commonUI/notification/test/suite.json
@@ -1,3 +1,4 @@
 [
-    "NotificationService"
+    "NotificationService",
+    "NotificationIndicatorController"
 ]
\ No newline at end of file