         done()
 
     context 'when I click on "More tools" in the toolbar', ->
-      before (done) ->
+      it 'waits for the window', (done) ->
         setTimeout done, 500 # wait for window to get big enough!
 
-      before (done) ->
+      it 'waits for the chooser to appear', (done) ->
         wd40.click '#toolbar .new-view', ->
           browser.waitForElementByCss '#chooser .tool', 4000, done
 
       context 'when I click on the newview tool', ->
-        before (done) ->
+        it 'clicks the new-view tool and waits for it to appear', (done) ->
           wd40.click '.newview.tool', =>
             wd40.waitForInvisibleByCss '#chooser', (err) =>
               browser.url (err, url) =>

                done()
            , 4000

        before (done) ->
          setTimeout done, 2000

        it 'takes me to the view page', (done) ->
          wd40.waitForMatchingURL new RegExp("#{base_url}/dataset/[^/]+/view/[^/]+"), done

    context 'when I click on "More tools" in the toolbar (again)', ->
      before (done) ->
        wd40.click '#toolbar .new-view', ->
          browser.waitForElementByCss '#chooser .tool', 4000, done

      context 'when I click on the newview tool', ->
        before (done) ->
          wd40.click '.newview.tool', (err) =>
            wd40.waitForInvisibleByCss '#chooser', (err) =>
              browser.url (err, url) =>

    # tial view. But I'm unsure.
    cleaner.clear_and_set_fixtures done

  it "goes to ehg's /datasets", (done) ->
    loginAndGo 'ehg', 'testing', "/datasets", done

  context 'when I click on an Apricot dataset', ->
    it 'clicks the Apricot dataset', (done) ->
        wd40.elementByPartialLinkText 'Apricot', (err, link) ->
          link.click done

