added some string.format tests
Merge remote-tracking branch 'origin/master'