Flushed out calls to DM from service for update and delete. Fixed unit tests & refactored.