Improvements in test cases