fix accidental regressions from test assertion cleanup