Updated models and corresponding tests

this should have the same setup as the other test. Some public, some private. In this way we verify there's no bug in getting a user their private OR public bookmarks.