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