A bit of organization in test code formatting too.