Extended tests.

These expose the issues I'm seeing with .enumerate.