Minor cleanup in tests