Fix simulation generator and gt for evaluation