A few more test fixes