Minor test changes