a few test fixes