Improve organization of tests.