Fix in simulation of macro generated models. Small changes with variables types of the pkg. Small change in test of macro models.