TEST of new restruct
Revert "TEST of new restruct"

This reverts commit c6463242cc20d94637611858f2906fbb4963cffb.