(Minor test code cleanup.)