Fix a few more app startup/shutdown problems

Change-Id: Ideb48a1e845ae345306fa10ec55499c471566ce7
diff --git a/protocols/isis/ctl/src/test/java/org/onosproject/isis/controller/impl/ControllerTest.java b/protocols/isis/ctl/src/test/java/org/onosproject/isis/controller/impl/ControllerTest.java
index e78077d..a5396605 100644
--- a/protocols/isis/ctl/src/test/java/org/onosproject/isis/controller/impl/ControllerTest.java
+++ b/protocols/isis/ctl/src/test/java/org/onosproject/isis/controller/impl/ControllerTest.java
@@ -101,7 +101,7 @@
     /**
      * Tests isisDeactivate() method.
      */
-    @Test(expected = Exception.class)
+    @Test
     public void testIsisDeactivate() throws Exception {
         controller.isisDeactivate();
         assertThat(controller, is(notNullValue()));