Partial refactoring of Unit tests
1. Removed several rarely-used collection-based classes and associated extensions methods
2. Refactored unit tests