fix StrFormat unit tests
more StrFormat unit test fixing