Fix generators

(not enough hyperedges due to duplicates)
I also mangled a bit in tests