Fix couple regressions in tests