Added tests for Bookmark class
Added tests for Choice class