Last few test fixes