Minor organizational change in tests.