Some changes in test cases