Merge "Update shrink scenario tests"