Merge "Split a server test into two distinct tests"