Separate out the client from the server base class for unit tests

To enable test separation on older systems, separate out the base class for the client tests and the server tests