Simplified RestClientFactory for unit testing
Merged conflicts
Resolved conflicts