Improvment on RSearchClient and ServerTest