Restructure tests.