Updated ClientCommunicator and more JUnits