Updated models count tests for private and non-private bookmarks

Added more tests

Modified model count tests

Fixed errors