Some more test fixes