more minor test fixes