! Generators fixes and tests