Change the organization of tests