diff --git a/app/views/legislations/show.html.erb b/app/views/legislations/show.html.erb
index 6c4c75be0..54c91fbf9 100644
--- a/app/views/legislations/show.html.erb
+++ b/app/views/legislations/show.html.erb
@@ -2,6 +2,6 @@
          data-annotatable-id="<%= @legislation.id %>">
 
 <div><%= @legislation.title %></div>
-<div id="test"><%= @legislation.body %></div>
+<div id="legislation_body"><%= @legislation.body %></div>
 
 </section>
diff --git a/spec/factories.rb b/spec/factories.rb
index 61c09373e..862fa4e84 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -230,6 +230,7 @@ FactoryGirl.define do
   factory :annotation do
     quote "ipsum"
     text "Loremp ipsum dolor"
+    ranges [{"start"=>"/div[2]", "startOffset"=>5, "end"=>"/div[2]", "endOffset"=>10}]
     legislation
     user
   end
diff --git a/spec/features/legislation_spec.rb b/spec/features/legislation_spec.rb
index 13a4b76b9..1bafb974e 100644
--- a/spec/features/legislation_spec.rb
+++ b/spec/features/legislation_spec.rb
@@ -17,71 +17,78 @@ feature 'Legislation' do
     background { login_as user }
 
     scenario 'Create' do
-      legislation = create(:legislation, body: "In order to achieve...")
+      legislation = create(:legislation)
 
       visit legislation_path(legislation)
 
-      page.find(:css, "#test").double_click
+      page.find(:css, "#legislation_body").double_click
       page.find(:css, ".annotator-adder button").click
-
       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}])
+      legislation = create(:legislation)
+      annotation = create(:annotation, legislation: legislation, user: user, text: "my annotation")
 
       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
-      legislation = create(:legislation, body: "In order to achieve...")
-      annotation = create(:annotation, user: user, legislation: legislation, text: "this one" , quote: "achieve", ranges: [{"start"=>"/div[2]", "startOffset"=>12, "end"=>"/div[2]", "endOffset"=>19}])
+      legislation = create(:legislation)
+      annotation = create(:annotation, legislation: legislation, user: user)
 
       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}])
+      legislation = create(:legislation)
+      annotation1 = create(:annotation, legislation: legislation, text: "my annotation",       ranges: [{"start"=>"/div[2]", "startOffset"=>5, "end"=>"/div[2]", "endOffset"=>10}])
+      annotation2 = create(:annotation, legislation: legislation, text: "my other annotation", 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
 
 end
 
-## Notes logged in and not logged in users
+## Notes logged in and not logged in users
\ No newline at end of file