Restructuring the tests