Restructured testing