Moved testing code to a better namespace and made it return the set of clips