Improving the package organization for the test cases.