Update regression tests after r21372