DDF-642: Added unit tests