Initial cleanup for generator tests