Add integration test
Buf fixes