A few test fixes.