Bug 10493: (follow-up) fix test errors