Adding client request tests
Updating client test
Merge pull request #890 from wpreul/master

Adding client request tests