Don't shadow the builtin 'zip'.

Auditors: pl
Refactor junit test discovery code.

Mostly renaming this to make it clearer what's going on.

Auditors: pl