Merge "Update tests to include IMS attributes"