Improved the test cases