more generators and tests