This and the following modifications in the models are mostly all related to making tests easier.