client tests fixed - server classess added