Stylistic change/remove redundant sformat
Fix test suite