Some changes to tests