Restructured testing.