Merge "Add Capabilities Client unit tests"