diff --git a/spec/features/legislation_spec.rb b/spec/features/legislation_spec.rb
index 13a4b76b9..d555d0bb3 100644
--- a/spec/features/legislation_spec.rb
+++ b/spec/features/legislation_spec.rb
@@ -27,32 +27,36 @@ feature 'Legislation' do
       fill_in 'annotator-field-0', with: 'this is my annotation'
       page.find(:css, ".annotator-controls a[href='#save']").click
 
-      expect(page).to have_css ".annotator-hl[data-annotation-id]"
+      expect(page).to have_css ".annotator-hl"
+      first(:css, ".annotator-hl").click
+      expect(page).to have_content "this is my annotation"
 
       visit legislation_path(legislation)
 
-      expect(page).to have_css ".annotator-hl[data-annotation-id]"
+      expect(page).to have_css ".annotator-hl"
+      first(:css, ".annotator-hl").click
+      expect(page).to have_content "this is my annotation"
     end
 
     scenario 'Update' do
       legislation = create(:legislation, body: "In order to achieve...")
-      create(:annotation, user: user, legislation: legislation, text: "this one" , quote: "In order to achieve...", ranges: [{"start"=>"/div[2]", "startOffset"=>12, "end"=>"/div[2]", "endOffset"=>19}])
+      annotation = create(:annotation, legislation: legislation, text: "my annotation" , quote: "In order to achieve...", ranges: [{"start"=>"/div[2]", "startOffset"=>12, "end"=>"/div[2]", "endOffset"=>19}])
 
       visit legislation_path(legislation)
 
       page.find(:css, ".annotator-hl").click
       page.find(:css, ".annotator-edit").click
 
-      fill_in 'annotator-field-0', with: 'editing my annotation'
+      fill_in 'annotator-field-0', with: 'edited annotation'
       page.find(:css, ".annotator-controls a[href='#save']").click
 
       page.find(:css, ".annotator-hl").click
-      expect(page).to have_css ".annotator-item", text: 'editing my annotation'
+      expect(page).to have_content "edited annotation"
 
       visit legislation_path(legislation)
 
       page.find(:css, ".annotator-hl").click
-      expect(page).to have_css ".annotator-item", text: 'editing my annotation'
+      expect(page).to have_content "edited annotation"
     end
 
     scenario 'Destroy' do
@@ -61,23 +65,27 @@ feature 'Legislation' do
 
       visit legislation_path(legislation)
 
-      expect(page).to have_css ".annotator-hl[data-annotation-id='#{annotation.id}']"
+      expect(page).to have_css ".annotator-hl"
 
       page.find(:css, ".annotator-hl").click
       page.find(:css, ".annotator-delete").click
 
-      expect(page).to_not have_css ".annotator-hl[data-annotation-id='#{annotation.id}']"
+      expect(page).to_not have_css ".annotator-hl"
     end
 
     scenario 'Search' do
       legislation = create(:legislation, body: "In order to achieve...")
-      annotation1 = create(:annotation, legislation: legislation, text: "this one" , quote: "achieve", ranges: [{"start"=>"/div[2]", "startOffset"=>12, "end"=>"/div[2]", "endOffset"=>19}])
-      annotation2 = create(:annotation, legislation: legislation, text: "this one" , quote: "achieve", ranges: [{"start"=>"/div[2]", "startOffset"=>5, "end"=>"/div[2]", "endOffset"=>10}])
+      annotation1 = create(:annotation, legislation: legislation, text: "my annotation" , quote: "achieve", ranges: [{"start"=>"/div[2]", "startOffset"=>5, "end"=>"/div[2]", "endOffset"=>10}])
+      annotation2 = create(:annotation, legislation: legislation, text: "my other annotation" , quote: "achieve", ranges: [{"start"=>"/div[2]", "startOffset"=>12, "end"=>"/div[2]", "endOffset"=>19}])
 
       visit legislation_path(legislation)
 
-      expect(page).to have_css ".annotator-hl[data-annotation-id='#{annotation1.id}']"
-      expect(page).to have_css ".annotator-hl[data-annotation-id='#{annotation2.id}']"
+      expect(page).to have_css ".annotator-hl"
+      first(:css, ".annotator-hl").click
+      expect(page).to have_content "my annotation"
+
+      all(".annotator-hl")[1].click
+      expect(page).to have_content "my other annotation"
     end
 
   end