Fixed generator tests so they are now passing