another few test fixes #869