Some changes of tests