Clean up a few commented out lines from tests, adds test for
uneven group stages where a group stage would set up the
different matches in a weird way.