Fixes in test cases