clean up + added more functionality bookmarks tests feature