(#13289) Clean up style violations and fix corresponding tests