updated test client
resolve test client merge