Fix a few more test regressions