Folders - Remove content from folders follow-up

* Remove content item from folder when its deleted
* Compact folder content library to avoid sending null back
* Added more tests