Refactor CollectionView and Cursor
Cursor specs refactored
Refactor CollectionView specs
Updating documentation after refactor