Work w/ new StringBuffer and some test cleanup

BUG=

Review URL: https://chromiumcodereview.appspot.com//11875002