Restructured the test package.