Tests depositor methods; refactor model methods