A few test changes