Initial approach to splitting metadata used for artefact creation from schemas
Fix test suite