Minor naming fixes in test classes