Fix include path for tests.
Track string length in StringBuf.  Add StringBuf::combine().