Some changes on tests