Factored ConceptContainer back into Source and ConceptCollection; added tests for Source