diff --git a/spec/unit/readerbookmark_spec.lua b/spec/unit/readerbookmark_spec.lua
index 0dc22fc4e..2ebb14603 100644
--- a/spec/unit/readerbookmark_spec.lua
+++ b/spec/unit/readerbookmark_spec.lua
@@ -20,7 +20,7 @@ describe("ReaderBookmark module", function()
         readerui.highlight:onHoldPan(nil, { pos = pos1 })
         readerui.highlight:onHoldRelease()
         assert.truthy(readerui.highlight.highlight_dialog)
-        readerui.highlight:onHighlight()
+        readerui.highlight:saveHighlight()
         UIManager:nextTick(function()
             UIManager:close(readerui.highlight.highlight_dialog)
             UIManager:close(readerui)
@@ -67,17 +67,6 @@ describe("ReaderBookmark module", function()
             UIManager:show(readerui)
             readerui.rolling:onGotoPage(10)
         end)
-        it("should compare bookmarks properly", function()
-            assert.truthy(readerui.bookmark:isBookmarkSame(
-                { notes = 'foo', page = 1, pos0 = 0, pos1 = 2, },
-                { notes = 'foo', page = 1, pos0 = 0, pos1 = 2, }))
-            assert.falsy(readerui.bookmark:isBookmarkSame(
-                { notes = 'foo', page = 1, pos0 = 0, pos1 = 2, },
-                { notes = 'bar', page = 1, pos0 = 0, pos1 = 2, }))
-            assert.falsy(readerui.bookmark:isBookmarkSame(
-                { notes = 'foo0', page = 1, pos0 = 0, pos1 = 0, },
-                { notes = 'foo', page = 1, pos0 = 0, pos1 = 2, }))
-        end)
         it("should show dogear after toggling non-bookmarked page", function()
             assert.falsy(readerui.view.dogear_visible)
             toggler_dogear(readerui)
@@ -90,7 +79,7 @@ describe("ReaderBookmark module", function()
             Screen:shot("screenshots/reader_bookmark_nodogear_epub.png")
             assert.falsy(readerui.view.dogear_visible)
         end)
-        it("should sort bookmarks with descending page numbers", function()
+        it("should sort bookmarks with ascending page numbers", function()
             local pages = {1, 20, 5, 30, 10, 40, 15, 25, 35, 45}
             for _, page in ipairs(pages) do
                 readerui.rolling:onGotoPage(page)
@@ -99,11 +88,11 @@ describe("ReaderBookmark module", function()
             readerui.bookmark:onShowBookmark()
             show_bookmark_menu(readerui)
             Screen:shot("screenshots/reader_bookmark_10marks_epub.png")
-            assert.are.same(10, #readerui.bookmark.bookmarks)
+            assert.are.same(10, #readerui.annotation.annotations)
+            assert.are.same(15, readerui.document:getPageFromXPointer(readerui.annotation.annotations[4].page))
         end)
         it("should keep descending page numbers after removing bookmarks", function()
             local pages = {1, 30, 10, 40, 20}
-            readerui.bookmark.bookmarks = {}
             for _, page in ipairs(pages) do
                 readerui.rolling:onGotoPage(page)
                 toggler_dogear(readerui)
@@ -111,7 +100,7 @@ describe("ReaderBookmark module", function()
             readerui.bookmark:onShowBookmark()
             show_bookmark_menu(readerui)
             Screen:shot("screenshots/reader_bookmark_5marks_epub.png")
-            assert.are.same(5, #readerui.bookmark.bookmarks)
+            assert.are.same(5, #readerui.annotation.annotations)
         end)
         it("should add bookmark by highlighting", function()
             highlight_text(readerui,
@@ -120,18 +109,18 @@ describe("ReaderBookmark module", function()
             readerui.bookmark:onShowBookmark()
             show_bookmark_menu(readerui)
             Screen:shot("screenshots/reader_bookmark_6marks_epub.png")
-            assert.are.same(6, #readerui.bookmark.bookmarks)
+            assert.are.same(6, #readerui.annotation.annotations)
         end)
         it("should get previous bookmark for certain page", function()
             local xpointer = readerui.document:getXPointer()
             local bm_xpointer = readerui.bookmark:getPreviousBookmarkedPage(xpointer)
             assert.are.same(6, #readerui.bookmark.bookmarks)
-            assert.are.same(1, readerui.document:getPageFromXPointer(bm_xpointer))
+            assert.are.same(15, readerui.document:getPageFromXPointer(bm_xpointer))
         end)
         it("should get next bookmark for certain page", function()
             local xpointer = readerui.document:getXPointer()
             local bm_xpointer = readerui.bookmark:getNextBookmarkedPage(xpointer)
-            assert.are.same(20, readerui.document:getPageFromXPointer(bm_xpointer))
+            assert.are.same(25, readerui.document:getPageFromXPointer(bm_xpointer))
         end)
     end)
 
@@ -154,34 +143,6 @@ describe("ReaderBookmark module", function()
             UIManager:show(readerui)
             readerui.paging:onGotoPage(10)
         end)
-        it("should does bookmark comparison properly", function()
-            assert.truthy(readerui.bookmark:isBookmarkSame(
-                { notes = 'foo', pos0 = { page = 1 , x = 2, y = 3},
-                  pos1 = { page = 1, x = 20, y = 3 }, },
-                { notes = 'foo', pos0 = { page = 1 , x = 2, y = 3},
-                  pos1 = { page = 1, x = 20, y = 3 }, }))
-            assert.falsy(readerui.bookmark:isBookmarkSame(
-                { notes = 'foo', page = 1, pos0 = 0, pos1 = 2, },
-                { notes = 'foo', page = 1, pos1 = 2, }))
-            assert.falsy(readerui.bookmark:isBookmarkSame(
-                { notes = 'foo', page = 1, pos0 = 0, pos1 = 2, },
-                { notes = 'foo', page = 1, pos0 = 2, }))
-            assert.falsy(readerui.bookmark:isBookmarkSame(
-                { notes = 'foo', pos0 = { page = 1 , x = 2, y = 3},
-                  pos1 = { page = 1, x = 20, y = 3 }, },
-                { notes = 'foo', pos0 = { page = 2 , x = 2, y = 3},
-                  pos1 = { page = 1, x = 20, y = 3 }, }))
-            assert.falsy(readerui.bookmark:isBookmarkSame(
-                { notes = 'foo', pos0 = { page = 1 , x = 1, y = 3},
-                  pos1 = { page = 1, x = 20, y = 3 }, },
-                { notes = 'foo', pos0 = { page = 1 , x = 2, y = 3},
-                  pos1 = { page = 1, x = 20, y = 3 }, }))
-            assert.falsy(readerui.bookmark:isBookmarkSame(
-                { notes = 'foo', pos0 = { page = 1 , x = 1, y = 3},
-                  pos1 = { page = 1, x = 20, y = 3 }, },
-                { notes = 'foo', pos0 = { page = 1 , x = 1, y = 3},
-                  pos1 = { page = 1, x = 20, y = 2 }, }))
-        end)
         it("should show dogear after toggling non-bookmarked page", function()
             toggler_dogear(readerui)
             Screen:shot("screenshots/reader_bookmark_dogear_pdf.png")
@@ -192,7 +153,7 @@ describe("ReaderBookmark module", function()
             Screen:shot("screenshots/reader_bookmark_nodogear_pdf.png")
             assert.truthy(not readerui.view.dogear_visible)
         end)
-        it("should sort bookmarks with descending page numbers", function()
+        it("should sort bookmarks with ascending page numbers", function()
             local pages = {1, 20, 5, 30, 10, 40, 15, 25, 35, 45}
             for _, page in ipairs(pages) do
                 readerui.paging:onGotoPage(page)
@@ -201,7 +162,8 @@ describe("ReaderBookmark module", function()
             readerui.bookmark:onShowBookmark()
             show_bookmark_menu(readerui)
             Screen:shot("screenshots/reader_bookmark_10marks_pdf.png")
-            assert.are.same(10, #readerui.bookmark.bookmarks)
+            assert.are.same(10, #readerui.annotation.annotations)
+            assert.are.same(15, readerui.document:getPageFromXPointer(readerui.annotation.annotations[4].page))
         end)
         it("should keep descending page numbers after removing bookmarks", function()
             local pages = {1, 30, 10, 40, 20}
@@ -212,14 +174,14 @@ describe("ReaderBookmark module", function()
             readerui.bookmark:onShowBookmark()
             show_bookmark_menu(readerui)
             Screen:shot("screenshots/reader_bookmark_5marks_pdf.png")
-            assert.are.same(5, #readerui.bookmark.bookmarks)
+            assert.are.same(5, #readerui.annotation.annotations)
         end)
         it("should add bookmark by highlighting", function()
             highlight_text(readerui, Geom:new{ x = 260, y = 70 }, Geom:new{ x = 260, y = 150 })
             readerui.bookmark:onShowBookmark()
             show_bookmark_menu(readerui)
             Screen:shot("screenshots/reader_bookmark_6marks_pdf.png")
-            assert.are.same(6, #readerui.bookmark.bookmarks)
+            assert.are.same(6, #readerui.annotation.annotations)
         end)
         it("should get previous bookmark for certain page", function()
             assert.are.same(5, readerui.bookmark:getPreviousBookmarkedPage(10))
@@ -227,31 +189,5 @@ describe("ReaderBookmark module", function()
         it("should get next bookmark for certain page", function()
             assert.are.same(15, readerui.bookmark:getNextBookmarkedPage(10))
         end)
-        it("should search/add bookmarks properly", function()
-            -- clear bookmarks created by previous tests
-            readerui.bookmark.bookmarks = {}
-            local p1 = { x = 0, y = 0, page = 100 }
-            local bm1 = { notes = 'foo', page = 10,
-                          pos0 = { x = 0, y = 0, page = 100 }, pos1 = p1, }
-            assert.falsy(readerui.bookmark:isBookmarkAdded(bm1))
-            readerui.bookmark:addBookmark(bm1)
-            assert.are.same(readerui.bookmark.bookmarks, {bm1})
-
-            local bm2 = { notes = 'foo', page = 1,
-                          pos0 = { x = 0, y = 0, page = 1 }, pos1 = p1, }
-            assert.falsy(readerui.bookmark:isBookmarkAdded(bm2))
-            readerui.bookmark:addBookmark(bm2)
-            assert.are.same({bm1, bm2}, readerui.bookmark.bookmarks)
-
-            local bm3 = { notes = 'foo', page = 5,
-                          pos0 = { x = 0, y = 0, page = 5 }, pos1 = p1, }
-            assert.falsy(readerui.bookmark:isBookmarkAdded(bm3))
-            readerui.bookmark:addBookmark(bm3)
-            assert.are.same({bm1, bm3, bm2}, readerui.bookmark.bookmarks)
-
-            assert.truthy(readerui.bookmark:isBookmarkAdded(bm1))
-            assert.truthy(readerui.bookmark:isBookmarkAdded(bm2))
-            assert.truthy(readerui.bookmark:isBookmarkAdded(bm3))
-        end)
     end)
 end)