Bookmark loading cleanup and tests