Minor test naming fixes