Added client/server tests