Merge "Update Close App tests to new DSL format" into sc-dev