Rewrite models. Add model tests.