Restructured test