Minor test import cleanup.