Updated model methods and tests.