Deposit manager has been refactored and tested