Improve model test coverage

Now we're properly setting the deactivated timestamp.