Fix base generator tests