Fix test failures due to formatting