Modified BookmarkManager and BookmarkManagerTest.