diff --git a/app.js b/app.js
index 8b10eaaacb..5d98b5b964 100644
--- a/app.js
+++ b/app.js
@@ -15,11 +15,7 @@ const fs = require('fs');
 const request = require('request');
 
 // Defaults
-<<<<<<< HEAD
-options.port = options.port || options.p || 8070;
-=======
 options.port = options.port || options.p || 8080;
->>>>>>> 656d6d6c3f0701f9afceb01c358eb047bd351bb2
 options.host = options.host || 'localhost';
 options.directory = options.directory || options.D || '.';
 
diff --git a/src/plugins/conditionSet/plugin.js b/src/plugins/conditionSet/plugin.js
index c3cda3641e..c117aef4ba 100644
--- a/src/plugins/conditionSet/plugin.js
+++ b/src/plugins/conditionSet/plugin.js
@@ -30,7 +30,6 @@ export default function plugin() {
         cssClass: 'icon-folder',
         initialize: function (domainObject) {
             domainObject.composition = [];
-            // domainObject.telemetry = {};
         }
     };
 
diff --git a/src/plugins/conditionSet/pluginSpec.js b/src/plugins/conditionSet/pluginSpec.js
index 6cf0552b03..dd9422f558 100644
--- a/src/plugins/conditionSet/pluginSpec.js
+++ b/src/plugins/conditionSet/pluginSpec.js
@@ -20,46 +20,40 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import ConditionSetPlugin from './plugin';
 import { createOpenMct } from 'testTools';
+import ConditionSetPlugin from './plugin';
 
-describe("The plugin", () => {
+fdescribe('The plugin', () => {
     let openmct;
-    let mockDomainObject;
+    let conditionSetDefinition;
 
     beforeEach(() => {
         openmct = createOpenMct();
         openmct.install(new ConditionSetPlugin());
-
-        mockDomainObject = {
-            identifier: {
-                key: 'testKey',
-                namespace: ''
-            },
-            type: 'conditionSet'
-        };
+        conditionSetDefinition = openmct.types.get('conditionSet').definition;
     });
 
-    it('defines a conditionSet object type with the correct key', () => {
-        expect(openmct.types.get('conditionSet').definition.key).toEqual('conditionSet');
+    it('defines an object type with the correct key', () => {
+        expect(conditionSetDefinition.key).toEqual('conditionSet');
     });
 
-    it('defines a conditionSet object type that is creatable', () => {
-        expect(openmct.types.get('conditionSet').definition.creatable).toBeTrue();
+    it('defines an object type that is creatable', () => {
+        expect(conditionSetDefinition.creatable).toBeTrue();
     });
 
-    describe("shows the conditionSet object is initialized with", () => {
-        beforeEach(() => {
-            openmct.types.get('conditionSet').definition.initialize(mockDomainObject);
+    describe('The object', () => {
+        it('initializes with an empty composition list', () => {
+            let mockDomainObject = {
+                identifier: {
+                    key: 'testConditionSetKey',
+                    namespace: ''
+                },
+                type: 'conditionSet'
+            };
+
+            conditionSetDefinition.initialize(mockDomainObject);
+            expect(mockDomainObject.composition instanceof Array).toBeTrue();
+            expect(mockDomainObject.composition.length).toEqual(0);
         });
-
-        it('a composition array', () => {
-            expect(Array.isArray(mockDomainObject.composition)).toBeTrue();
-        });
-
-        // it('a telemetry object', () => {
-        //     expect(typeof mockDomainObject.telemetry === 'object').toBeTrue();
-        // });
     });
 });
-