apply new origin handling to concepts and collections
modify origin test to new origin generation