Minor cleanup in tests.