Updated generating changes to the new model.
More unit testing.