A few test fixes