Merge "Add more unit test for bufferhub"