Assorted minor test fixes