Update generator to geenrate test cases according to their types