bookmarks e2e tests code cleanup #17