Formatting updates with exhaustive testing