Restructured tests.