diff --git a/lib/models/workdir-context.js b/lib/models/workdir-context.js
index 2a80508978..22dda9d829 100644
--- a/lib/models/workdir-context.js
+++ b/lib/models/workdir-context.js
@@ -20,7 +20,6 @@ export default class WorkdirContext {
 
   /*
    * Available options:
-   * - `options.savedResolutionProgress`: Serialized state used to initialize the ResolutionProgress.
    * - `options.window`: Browser window global, used on Linux by the WorkspaceChangeObserver.
    * - `options.workspace`: Atom's workspace singleton, used on Linux by the WorkspaceChangeObserver.
    * - `options.promptCallback`: Callback used to collect information interactively through Atom.
diff --git a/lib/models/workspace-change-observer.js b/lib/models/workspace-change-observer.js
index 29feb4754a..4676a4c8a7 100644
--- a/lib/models/workspace-change-observer.js
+++ b/lib/models/workspace-change-observer.js
@@ -22,7 +22,7 @@ export default class WorkspaceChangeObserver {
     const focusHandler = event => {
       if (this.repository) {
         this.logger.showEvents([event]);
-        this.emitter.emit('did-change');
+        this.didChange();
       }
     };
     this.window.addEventListener('focus', focusHandler);
@@ -80,11 +80,11 @@ export default class WorkspaceChangeObserver {
           });
           if (filteredEvents.length) {
             this.logger.showEvents(filteredEvents);
-            this.emitter.emit('did-change');
+            this.didChange(filteredEvents);
             const workdirOrHeadEvent = filteredEvents.filter(e => !['config', 'index'].includes(e.file || e.newFile));
             if (workdirOrHeadEvent) {
               this.logger.showWorkdirOrHeadEvents();
-              this.emitter.emit('did-change-workdir-or-head');
+              this.didChangeWorkdirOrHead();
             }
           }
         },
diff --git a/test/models/workdir-context-pool.test.js b/test/models/workdir-context-pool.test.js
index a1db27cc38..ff69df6b89 100644
--- a/test/models/workdir-context-pool.test.js
+++ b/test/models/workdir-context-pool.test.js
@@ -1,4 +1,5 @@
 import temp from 'temp';
+import {Disposable} from 'event-kit';
 
 import {cloneRepository} from '../helpers';
 
@@ -15,7 +16,7 @@ describe('WorkdirContextPool', function() {
     };
 
     mockWorkspace = {
-      observeTextEditors: sinon.spy(),
+      observeTextEditors: sinon.stub().returns(new Disposable()),
     };
 
     pool = new WorkdirContextPool({