Working tests and correction of structure