Consolidated the test cases into a single package.