Fix bad tests, fix model.