Merge "Add unit tests for extensions_client"