Merge "Combine server tests into one test target BufferHubServer_test"