Fix some test problems for bug #8369.