A couple of minor test fixes