Corrected lib and tests are green again
Thinning out current bookmarks