Merge "Update tests to reflect region based assertion changes"