Dogfood test fixes