Change structure of tests.