Minor cleanup in tests, no functional change