Trying to fix broken model tests.