Update to new structure (test 1:N to test attrib)
.