Breaking client#Delete into more testable pieces (and testing them:))