A few test changes.