You're right. We could make an issue to clean this up across all tests