Testing generators better