Test structure changed to the common way