Some changes in test