Fix collection iteration

More efficient method to calculate Good's U and diversity while sampling collections at random