Little bit modified client & server test