Added start of Client/Server testing