fixing some tests and generator