Restructuring the tests.