update systests to handle restruct Schema folder. re #10273
Merge branch 'feature/10273_reorganise_schema_folder' into develop