Expand Generator testing