Generics renamed to generators, bugfixes.

Test reorder