Expanded coverage on the generator; remove unused test block