Unitests for the models, fixed