Added collection and relevant tests as refactored existing.