DDF-454: Added junit test