refactored Contrib.CollectionView with new features; more tests