Minor test changes

Minor test changes