Improved testing especially related to generators.