     fileIcons = new DefaultFileIcons
 
     it "defaults to text", ->
-
       waitsForPromise ->
         atom.workspace.open('sample.js')
 
-      runs ->
-        waitsForPromise ->
-          bufferView.toggle()
-
-        runs ->
+      waitsForPromise ->
+        bufferView.toggle()
+
+      runs ->
         expect(atom.workspace.panelForItem(bufferView).isVisible()).toBe true
-
-        bufferView.filterEditorView.getModel().insertText('js')
-        bufferView.populateList()
-        firstResult = bufferView.list.children('li').find('.primary-line')
-        expect(fileIcons.iconClassForPath(firstResult[0].dataset.path)).toBe 'icon-file-text'
+        bufferView.selectListView.refs.queryEditor.insertText('js')
+
+      waitsForPromise ->
+        etch.getScheduler().getNextUpdatePromise()
+
+      runs ->
+        firstResult = bufferView.element.querySelector('li .primary-line')
+        expect(fileIcons.iconClassForPath(firstResult.dataset.path)).toBe 'icon-file-text'
 
     it "shows image icons", ->
-
       waitsForPromise ->
         atom.workspace.open('sample.gif')
 
-      runs ->
-        waitsForPromise ->
-          bufferView.toggle()
-
-        runs ->
+      waitsForPromise ->
+        bufferView.toggle()
+
+      runs ->
         expect(atom.workspace.panelForItem(bufferView).isVisible()).toBe true
-
-        bufferView.filterEditorView.getModel().insertText('gif')
-        bufferView.populateList()
-        firstResult = bufferView.list.children('li').find('.primary-line')
-        expect(fileIcons.iconClassForPath(firstResult[0].dataset.path)).toBe 'icon-file-media'
+        bufferView.selectListView.refs.queryEditor.insertText('gif')
+
+      waitsForPromise ->
+        etch.getScheduler().getNextUpdatePromise()
+
+      runs ->
+        firstResult = bufferView.element.querySelector('li .primary-line')
+        expect(fileIcons.iconClassForPath(firstResult.dataset.path)).toBe 'icon-file-media'
 
   describe "Git integration", ->
     [projectPath, gitRepository, gitDirectory] = []

            projectView.toggle()

          runs ->
          projectView.setMaxItems(Infinity)

          waitForPathsToDisplay(projectView)

          runs ->
            expect(Array.from(projectView.element.querySelectorAll('li')).find((a) -> a.textContent.includes("b.txt"))).toBeDefined()

            bufferView.toggle()

          runs ->
            expect(bufferView.element.querySelectorAll('.status.status-modified').length).toBe 1
            expect(bufferView.element.querySelector('.status.status-modified').closest('li').querySelector('.file').textContent).toBe 'a.txt'

      describe "when a new file is shown in the list", ->
        it "displays the new icon", ->
