Merge "Combine tests into BufferHub_test"