A few test changes...