Generation tests improved