Bug 7688: (follow-up) rewrite 'for' loop in unit tests