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