restructured testing