Unit tests are fixed.
Merge branch 'custom-http-client'