work on test model and model generator