Merge "Add unit tests for rest_client"