Fix generator tests