Merge changes I08071058,I9a64a7ab into sc-dev

* changes:
  Update app pairs tests to new DSL format
  Create common assertions for new tests