Bug 9394: (follow-up) modernize test cases