Added generator tests