changes to other generators
changes to tests