AbstractModel refactoring. More AbstractModel tests.