Submission/unipro custom elements

Pull request to merge additional changes to Concepts tests