Some minor test fixes