rename collection_types and tests