test restructured