More test fixes for issue 6130