fix issue when user hasn't bookmarked anything
splitup the tests because unit takes too long
pull