Some changes on test cases