Merge "Add Extensions client unit tests"