fix #6368
more test fixes