Merge "Adding unit tests for IComposerClient V2_2 VTS tests"