removed hard coded dependency on deep-diff, add code coverage, some cleanup