few test fixes