Fix the errors associated with generator tests
Fix the errors associated with generator tests