diff --git a/awx/ui/.jshintrc b/awx/ui/.jshintrc
index c8075a8ba8..a2bb56723e 100644
--- a/awx/ui/.jshintrc
+++ b/awx/ui/.jshintrc
@@ -34,7 +34,8 @@
       "describe": false,
       "moment": false,
       "spyOn": false,
-      "jasmine": false
+      "jasmine": false,
+      "dagre": false
     },
     "strict": false,
     "quotmark": false,
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
index 75976ee70a..5c8d4e6611 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
@@ -68,12 +68,6 @@ export default ['$scope', 'TemplatesService',
 
         getNodes();
 
-        $scope.closeWorkflowMaker = () => {
-            // Revert the data to the master which was created when the dialog was opened
-            $scope.graphState.nodeTree = angular.copy($scope.graphStateMaster);
-            $scope.closeDialog();
-        };
-
         $scope.saveWorkflowMaker = () => {
 
             Wait('start');
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
index 8ec220a933..e44befc510 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
@@ -28,7 +28,7 @@
             <div class="WorkflowMaker-titleText">{{strings.get('workflow_maker.TITLE')}} | {{ workflowJobTemplateObj.name }}</div>
         </div>
         <div class="WorkflowMaker-exitHolder">
-            <button class="WorkflowMaker-exit" ng-click="closeWorkflowMaker()">
+            <button class="WorkflowMaker-exit" ng-click="closeDialog()">
                 <i class="fa fa-times-circle"></i>
             </button>
         </div>
@@ -106,7 +106,7 @@
         </div>
     </div>
     <div class="WorkflowMaker-buttonHolder">
-        <button type="button" class="btn btn-sm WorkflowMaker-cancelButton" ng-click="closeWorkflowMaker()"> {{:: strings.get('CLOSE') }}</button>
+        <button type="button" class="btn btn-sm WorkflowMaker-cancelButton" ng-click="closeDialog()"> {{:: strings.get('CLOSE') }}</button>
         <button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="formState.showNodeForm || formState.showLinkForm"> {{:: strings.get('SAVE') }}</button>
     </div>
 </div>
diff --git a/awx/ui/test/spec/workflow--results/workflow-results.controller-test.js b/awx/ui/test/spec/workflow--results/workflow-results.controller-test.js
index 34401f6d78..15c68045ce 100644
--- a/awx/ui/test/spec/workflow--results/workflow-results.controller-test.js
+++ b/awx/ui/test/spec/workflow--results/workflow-results.controller-test.js
@@ -30,11 +30,11 @@ describe('Controller: workflowResults', () => {
         $provide.value('ParseVariableString', function() {});
         $provide.value('i18n', { '_': (a) => { return a; } });
         $provide.provider('$stateProvider', { '$get': function() { return function() {}; } });
-        $provide.service('WorkflowService', function($q) {
+        $provide.service('WorkflowChartService', function($q) {
             return {
-                buildTree: function() {
+                generateArraysOfNodesAndLinks: function() {
                     var deferred = $q.defer();
-                    deferred.resolve(treeData);
+                    deferred.resolve();
                     return deferred.promise;
                 }
             };
@@ -46,7 +46,6 @@ describe('Controller: workflowResults', () => {
         $rootScope = _$rootScope_;
         workflowResultsService = _workflowResultsService_;
         $interval = _$interval_;
-
     }));
 
     describe('elapsed timer', () => {
diff --git a/awx/ui/test/spec/workflows/workflow-maker.controller-test.js b/awx/ui/test/spec/workflows/workflow-maker.controller-test.js
deleted file mode 100644
index 58e5db8abf..0000000000
--- a/awx/ui/test/spec/workflows/workflow-maker.controller-test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-'use strict';
-
-describe('Controller: WorkflowMaker', () => {
-    // Setup
-    let scope,
-        WorkflowMakerController,
-        TemplatesService,
-        q,
-        getWorkflowJobTemplateNodesDeferred;
-
-    beforeEach(angular.mock.module('awApp'));
-    beforeEach(angular.mock.module('templates', () => {
-
-        TemplatesService = {
-            getWorkflowJobTemplateNodes: function(){
-                return angular.noop;
-            }
-        };
-
-    }));
-
-    beforeEach(angular.mock.inject( ($rootScope, $controller, $q) => {
-        scope = $rootScope.$new();
-        scope.closeDialog = jasmine.createSpy();
-        scope.treeData = {
-            data: {
-                id: 1,
-                canDelete: false,
-                canEdit: false,
-                canAddTo: true,
-                isStartNode: true,
-                unifiedJobTemplate: {
-                    name: "Workflow Launch"
-                },
-                children: [],
-                deletedNodes: [],
-                totalNodes: 0
-            },
-            nextIndex: 2
-        };
-        scope.workflowJobTemplateObj = {
-            id: 1
-        };
-        q = $q;
-        getWorkflowJobTemplateNodesDeferred = q.defer();
-        TemplatesService.getWorkflowJobTemplateNodes = jasmine.createSpy('getWorkflowJobTemplateNodes').and.returnValue(getWorkflowJobTemplateNodesDeferred.promise);
-        WorkflowMakerController = $controller('WorkflowMakerController', {
-            $scope: scope,
-            TemplatesService: TemplatesService
-        });
-    }));
-
-    describe('scope.closeWorkflowMaker()', () => {
-
-        it('should close the dialog', ()=>{
-            scope.closeWorkflowMaker();
-            expect(scope.closeDialog).toHaveBeenCalled();
-        });
-
-    });
-
-});