Minor test changes....