Improved the test case structure.