Fixing some of model-common tests.