Properly merging server & client coverage.