deleted old Client and updated TestMain