Merge "Update tests to include IMS attributes" into sc-dev