Test structure reorganised